This commit is contained in:
mjallen18
2026-02-02 18:11:45 -06:00
parent 8fa82bce90
commit bd8d1e6485
3 changed files with 10 additions and 12 deletions

View File

@@ -124,10 +124,15 @@ in
cfg.display2.input cfg.display2.input
]; ];
in in
if cfg.hyprpaper.usePerMonitor then # if cfg.hyprpaper.usePerMonitor then
map (n: "${n}, ${cfg.hyprpaper.wallpaperPath}") names # map (n: "${n}, ${cfg.hyprpaper.wallpaperPath}") names
else # else
[ ", ${cfg.hyprpaper.wallpaperPath}" ]; [
{
monitor = "";
path = cfg.hyprpaper.wallpaperPath;
}
];
splash = false; splash = false;
}; };
}; };

View File

@@ -155,7 +155,7 @@ in
]; ];
script = '' script = ''
${wallpaper-command} ${wallpaper-command}
${lib.getExe' pkgs.hyprland "hyprctl"} hyprpaper reload ,${cfg.wallpaper} ${lib.getExe' pkgs.hyprland "hyprctl"} hyprpaper wallpaper ,${cfg.wallpaper},
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";

View File

@@ -39,13 +39,6 @@ in
"sd_mod" "sd_mod"
]; ];
luks.devices = {
cryptroot = {
device = "/dev/disk/by-partlabel/disk-main-matt-nixos-cryptroot";
allowDiscards = true; # Used if primary device is a SSD
preLVM = true;
};
};
}; };
kernelPackages = kernel; kernelPackages = kernel;