diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index bf7b298..ae21c0b 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -124,10 +124,15 @@ in cfg.display2.input ]; in - if cfg.hyprpaper.usePerMonitor then - map (n: "${n}, ${cfg.hyprpaper.wallpaperPath}") names - else - [ ", ${cfg.hyprpaper.wallpaperPath}" ]; + # if cfg.hyprpaper.usePerMonitor then + # map (n: "${n}, ${cfg.hyprpaper.wallpaperPath}") names + # else + [ + { + monitor = ""; + path = cfg.hyprpaper.wallpaperPath; + } + ]; splash = false; }; }; diff --git a/modules/nixos/desktop/hyprland/wallpapers/default.nix b/modules/nixos/desktop/hyprland/wallpapers/default.nix index 2d2ac7a..851e2d0 100644 --- a/modules/nixos/desktop/hyprland/wallpapers/default.nix +++ b/modules/nixos/desktop/hyprland/wallpapers/default.nix @@ -155,7 +155,7 @@ in ]; script = '' ${wallpaper-command} - ${lib.getExe' pkgs.hyprland "hyprctl"} hyprpaper reload ,${cfg.wallpaper} + ${lib.getExe' pkgs.hyprland "hyprctl"} hyprpaper wallpaper ,${cfg.wallpaper}, ''; serviceConfig = { Type = "oneshot"; diff --git a/systems/x86_64-linux/matt-nixos/boot.nix b/systems/x86_64-linux/matt-nixos/boot.nix index 1870402..bbd454c 100755 --- a/systems/x86_64-linux/matt-nixos/boot.nix +++ b/systems/x86_64-linux/matt-nixos/boot.nix @@ -39,13 +39,6 @@ in "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;