refactor: make sshd module and some code refactor

This commit is contained in:
matt1432 2023-12-27 11:39:38 -05:00
commit ed92a42266
15 changed files with 89 additions and 97 deletions
modules

View file

@ -3,9 +3,8 @@
pkgs,
config,
...
}: let
}: with lib; let
# Nix stuff
optionals = lib.lists.optionals;
isNvidia = config.hardware.nvidia.modesetting.enable;
isTouchscreen = config.hardware.sensor.iio.enable;
@ -20,7 +19,7 @@
.finalPackage;
# Executables' paths
hyprBin = "${hyprland}/bin";
regreetBin = "${lib.getExe config.programs.regreet.package}";
regreetBin = "${getExe config.programs.regreet.package}";
# Show Regreet on all monitors
dupeMonitors = pkgs.writeShellScriptBin "dupeMonitors" ''
@ -49,7 +48,7 @@
else "${dupeMonitors}/bin/dupeMonitors";
# Get css for regreet
style = pkgs.writeText "style.css" ''${builtins.readFile ./style.css}'';
style = pkgs.writeText "style.css" ''${readFile ./style.css}'';
# Setup Hyprland as regreet's compositor
hyprConf =
@ -66,7 +65,7 @@
" sleep 1; swww init --no-cache &&"
" swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png\n"
"${builtins.readFile ./hyprland.conf}\n"
"${readFile ./hyprland.conf}\n"
"exec-once = ${regreetBin} -s ${style};"
" ${hyprBin}/hyprctl dispatch exit"

View file

@ -82,22 +82,22 @@ in {
xwayland.force_zero_scaling = true;
monitor = [
(builtins.concatStringsSep "," [
(concatStringsSep "," [
"desc:Acer Technologies Acer K212HQL T3EAA0014201"
"1920x1080@60"
"840x1000, 1, transform, 3"
])
(builtins.concatStringsSep "," [
(concatStringsSep "," [
"desc:BOE 0x0964"
"1920x1200@60"
"0x2920, 1"
])
(builtins.concatStringsSep "," [
(concatStringsSep "," [
"desc:Samsung Electric Company C27JG5x HTOM100586"
"2560x1440@60"
"1920x120, 1"
])
(builtins.concatStringsSep "," [
(concatStringsSep "," [
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. G27QC 0x00000B1D"
"2560x1440@165"
"1920x1560, 1"

11
modules/sshd.nix Normal file
View file

@ -0,0 +1,11 @@
{...}: {
services = {
openssh = {
enable = true;
settings = {
PasswordAuthentication = false;
PermitRootLogin = "no";
};
};
};
}