diff --git a/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix index e2313c3c..e24c16d3 100644 --- a/profiles/sway/home/sway.nix +++ b/profiles/sway/home/sway.nix @@ -47,7 +47,7 @@ config = let dmenu = "${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i"; - lockCommand = "swaylock -i ${./wallpapers/main.png} -s fill"; + lockCommand = "swaylock -i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${../../../private/files/wallpapers/left.jpg} -i DVI-D-1:${../../../private/files/wallpapers/right.jpg} -s fill"; in { bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; @@ -56,22 +56,22 @@ left = { res = "1920x1080"; pos = "0 0"; - bg = "${./wallpapers/left.jpg} fill"; + bg = "${../../../private/files/wallpapers/left.jpg} fill"; }; middle = { res = "1920x1080"; pos = "1920 0"; - bg = "${./wallpapers/main.png} fill"; + bg = "${../../../private/files/wallpapers/main.png} fill"; }; right = { res = "1920x1080"; pos = "3840 0"; - bg = "${./wallpapers/right.jpg} fill"; + bg = "${../../../private/files/wallpapers/right.jpg} fill"; }; laptop = { res = "1920x1080"; pos = "0 0"; - bg = "${./wallpapers/main.png} fill"; + bg = "${../../../private/files/wallpapers/main.png} fill"; }; in { "DP-1" = left; diff --git a/profiles/sway/home/swayidle.nix b/profiles/sway/home/swayidle.nix index d58609a8..d68e298c 100644 --- a/profiles/sway/home/swayidle.nix +++ b/profiles/sway/home/swayidle.nix @@ -11,7 +11,7 @@ Service = { Type = "simple"; ExecStart = '' - ${pkgs.swayidle}/bin/swayidle -w \ + ${pkgs.swayidle}/bin/swayidle --i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${../../../private/files/wallpapers/left.jpg} -i DVI-D-1:${../../../private/files/wallpapers/right.jpg} -s fill w \ timeout 300 '${pkgs.swaylock}/bin/swaylock' \ timeout 600 'swaymsg "output * dpms off"' \ resume 'swaymsg "output * dpms on"' \ diff --git a/profiles/sway/home/wallpapers/left.jpg b/profiles/sway/home/wallpapers/left.jpg deleted file mode 100644 index f519c4d4..00000000 Binary files a/profiles/sway/home/wallpapers/left.jpg and /dev/null differ diff --git a/profiles/sway/home/wallpapers/main.png b/profiles/sway/home/wallpapers/main.png deleted file mode 100644 index a8f36209..00000000 Binary files a/profiles/sway/home/wallpapers/main.png and /dev/null differ diff --git a/profiles/sway/home/wallpapers/right.jpg b/profiles/sway/home/wallpapers/right.jpg deleted file mode 100644 index 9ab53754..00000000 Binary files a/profiles/sway/home/wallpapers/right.jpg and /dev/null differ diff --git a/profiles/sway/home/waybar/default.nix b/profiles/sway/home/waybar/default.nix index a3385e00..5a3d90a3 100644 --- a/profiles/sway/home/waybar/default.nix +++ b/profiles/sway/home/waybar/default.nix @@ -18,12 +18,12 @@ "temperature" "backlight" "battery" - "idle_inhibitor" #"mpd" "network" "custom/gpg-status" "custom/weather" "clock" + "idle_inhibitor" "tray" ];