diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix index d6fa39d5..68661e4e 100644 --- a/homeManagerModules/desktop/sway/default.nix +++ b/homeManagerModules/desktop/sway/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: { - imports = [./randomWallpaper.nix ./redShift.nix]; + imports = [./randomWallpaper.nix]; config = lib.mkIf config.ar.home.desktop.sway.enable { ar.home.theme.gtk.hideTitleBar = diff --git a/homeManagerModules/desktop/sway/redShift.nix b/homeManagerModules/desktop/sway/redShift.nix deleted file mode 100644 index 29c0a1cd..00000000 --- a/homeManagerModules/desktop/sway/redShift.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - config = lib.mkIf config.ar.home.desktop.sway.redShift { - home.packages = with pkgs; [gammastep]; - - wayland.windowManager.sway.config.startup = [ - {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";} - ]; - }; -} diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix index b56650a9..6cb8a2cb 100644 --- a/homeManagerModules/desktop/sway/settings.nix +++ b/homeManagerModules/desktop/sway/settings.nix @@ -216,22 +216,25 @@ in { }; }; - startup = [ - { - command = - if cfg.desktop.sway.randomWallpaper - then "true" - else "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}"; - } - {command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";} - {command = "${scripts.idleD}";} - {command = lib.getExe pkgs.autotiling;} - {command = lib.getExe' pkgs.blueman "blueman-applet";} - {command = lib.getExe' pkgs.networkmanagerapplet "nm-applet";} - {command = lib.getExe' pkgs.playerctl "playerctld";} - {command = lib.getExe' pkgs.swayosd "swayosd-server";} - {command = lib.getExe pkgs.mako;} - ]; + startup = + [ + { + command = + if cfg.desktop.sway.randomWallpaper + then "true" + else "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}"; + } + {command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";} + {command = "${scripts.idleD}";} + {command = lib.getExe pkgs.autotiling;} + {command = lib.getExe' pkgs.blueman "blueman-applet";} + {command = lib.getExe' pkgs.networkmanagerapplet "nm-applet";} + {command = lib.getExe' pkgs.playerctl "playerctld";} + {command = lib.getExe' pkgs.swayosd "swayosd-server";} + {command = lib.getExe pkgs.mako;} + ] + ++ lib.optional cfg.desktop.sway.redShift + {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";}; output = { "BOE 0x095F Unknown".scale = "1.5"; diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix index b2d3f1e2..83c4b083 100644 --- a/hosts/petalburg/home.nix +++ b/hosts/petalburg/home.nix @@ -21,7 +21,7 @@ touchdevice.output = "eDP-1"; }; }; - + ar.home.desktop.sway.enable = true; ar.home.desktop.hyprland = {