Update Sway config

DanNixon · Jun 5, 2024 · 8d04f2c · 8d04f2c
1 parent d2e6c52
commit 8d04f2c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/configurations/akane/home-manager/default.nix b/configurations/akane/home-manager/default.nix
@@ -17,7 +17,7 @@ in
       ../../../modules/home-manager/media.nix
       ../../../modules/home-manager/office.nix
 
-      ({pkgs, ...}: {
+      ({pkgs, ...}: rec {
         home.packages = with pkgs; [
           lightburn
           scrcpy
@@ -48,15 +48,19 @@ in
           storage.encryptionPasscommand = "pass borg/akane/passphrase";
         };
 
-        wayland.windowManager.sway.config = {
-          input."2:7:SynPS/2_Synaptics_TouchPad" = {
-            events = "disabled";
-          };
+        wayland.windowManager.sway = {
+          checkConfig = false; # Does not work with background image paths
+
+          config = {
+            input."2:7:SynPS/2_Synaptics_TouchPad" = {
+              events = "disabled";
+            };
 
-          output = {
-            LVDS-1 = {
-              enable = "";
-              bg = "~/.local/share/wallpaper.png fill";
+            output = {
+              LVDS-1 = {
+                enable = "";
+                bg = "~/${home.file.wallpaper.target} fill";
+              };
             };
           };
         };

diff --git a/configurations/maya/home-manager/default.nix b/configurations/maya/home-manager/default.nix
@@ -17,7 +17,7 @@ in
       ../../../modules/home-manager/media.nix
       ../../../modules/home-manager/office.nix
 
-      ({pkgs, ...}: {
+      ({pkgs, ...}: rec {
         home.packages = with pkgs; [
           nur.repos.DanNixon.metty
           nur.repos.DanNixon.satorictl-unstable
@@ -46,11 +46,15 @@ in
           storage.encryptionPasscommand = "pass borg/maya/passphrase";
         };
 
-        wayland.windowManager.sway.config.output = {
-          DP-1 = {
-            enable = "";
-            bg = "~/.local/share/wallpaper.png fill";
-            scale = "1.5";
+        wayland.windowManager.sway = {
+          checkConfig = false; # Does not work with background image paths
+
+          config.output = {
+            DP-1 = {
+              enable = "";
+              bg = "~/${home.file.wallpaper.target} fill";
+              scale = "1.5";
+            };
           };
         };