simplify kanshi config

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753592768,
+        "lastModified": 1756679287,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741303672,
+        "lastModified": 1756852730,
-        "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=",
+        "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=",
         "owner": "musnix",
         "repo": "musnix",
-        "rev": "d56a15f30329f304151e4e05fa82264d127da934",
+        "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755593991,
+        "lastModified": 1756754095,
-        "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=",
+        "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03",
+        "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1755615617,
+        "lastModified": 1756787288,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {

modules/home/programs/default.nix

@@ -6,7 +6,6 @@
   ...
 }: let
   cfg = config.myConfig.programs;
-  
 in {
   imports = [./foot.nix ./thunderbird.nix ./nextcloud.nix ./udiskie.nix ./wezterm.nix ./rclone.nix];
 

modules/home/shell/nvim-lua/plugins/astrocore.lua

@@ -23,7 +23,6 @@ return {
 							cargo = {
 								buildScripts = { enable = true },
 								allFeatures = false,
-								extraArgs = { "--release" },
 							},
 							installCargo = false,
 							installRustc = false,

modules/home/sway/kanshi.nix

@@ -17,6 +17,12 @@ in {
       bg1080 = bgdir + "/bg1080.png";
       bg1080vert = bgdir + "/bg1080vert.png";
       bg4k = bgdir + "/bg4k.png";
+      sway_commands = commands: "${pkgs.sway}/bin/swaymsg '${lib.strings.concatStringsSep ", " commands}'";
+      workspace = workspace: monitor: [
+        ''workspace "${workspace}" output "${monitor}"''
+        ''workspace --no-auto-back-and-forth ${workspace}''
+        ''move workspace to "${monitor}"''
+      ];
       luhbots_workstation = settings: {
         profile.outputs = [
           {
@@ -43,15 +49,19 @@ in {
           }
         ];
         profile.exec = [
-          "${pkgs.sway}/bin/swaymsg 'workspace \"main\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth main, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
+          (sway_commands (
-          "${pkgs.sway}/bin/swaymsg 'workspace \"term\" output \"${settings.vertical.name}\", workspace --no-auto-back-and-forth term, move workspace to \"${settings.vertical.name}\", workspace back_and_forth'"
+            [
-          "${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth msg, move workspace to eDP-1, workspace back_and_forth'"
+              "output eDP-1 bg ${bg1080} fit"
-          "${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth music, move workspace to eDP-1, workspace back_and_forth'"
+              "output \"${settings.horizontal.name}\" bg ${bg4k} fit"
-          "${pkgs.sway}/bin/swaymsg 'workspace \"5\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth 5, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
+              "output \"${settings.vertical.name}\" bg ${bg1080vert} fit"
-          "${pkgs.sway}/bin/swaymsg 'output \"eDP-1\" bg ${bg1080} fit'"
+            ]
-          "${pkgs.sway}/bin/swaymsg 'output \"${settings.horizontal.name}\" bg ${bg4k} fit'"
+            ++ (workspace "obsidian" settings.horizontal.name)
-          "${pkgs.sway}/bin/swaymsg 'output \"${settings.vertical.name}\" bg ${bg1080vert} fit'"
+            ++ (workspace "5" settings.horizontal.name)
-          "${pkgs.sway}/bin/swaymsg 'workspace --no-auto-back-and-forth msg, workspace --no-auto-back-and-forth term, workspace --no-auto-back-and-forth main'"
+            ++ (workspace "music" "eDP-1")
+            ++ (workspace "msg" "eDP-1")
+            ++ (workspace "term" settings.vertical.name)
+            ++ (workspace "main" settings.horizontal.name)
+          ))
         ];
       };
     in {
@@ -130,6 +140,14 @@ in {
             orientation = "270";
           };
         })
+        (luhbots_workstation {
+          horizontal.name = "Dell Inc. DELL P2422HE 4BXL9M3";
+          vertical = {
+            name = "NEC Corporation E243WMi 75309334NB";
+            left = true;
+            orientation = "90";
+          };
+        })
         {
           profile.name = "docked-4k";
           profile.outputs = [
@@ -145,11 +163,15 @@ in {
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg workspace main; move workspace to HDMI-A-1; workspace back_and_forth"
+            (sway_commands
-            "${pkgs.sway}/bin/swaymsg workspace term; move workspace to eDP-1; workspace back_and_forth"
+              (
-            "${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
+                (workspace "obsidian" "HDMI-A-1")
-            "${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
+                ++ (workspace "5" "HDMI-A-1")
-            "${pkgs.sway}/bin/swaymsg workspace 5; move workspace to HDMI-A-1; workspace back_and_forth"
+                ++ (workspace "music" "eDP-1")
+                ++ (workspace "msg" "eDP-1")
+                ++ (workspace "term" "eDP-1")
+                ++ (workspace "main" "HDMI-A-1")
+              ))
           ];
         }
         {
@@ -164,12 +186,17 @@ in {
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth main; move workspace to eDP-1; workspace back_and_forth"
+            (sway_commands
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth term; move workspace to eDP-1; workspace back_and_forth"
+              (
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth msg; move workspace to eDP-1; workspace back_and_forth"
+                (workspace "mirror" "HDMI-A-1")
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth music; move workspace to eDP-1; workspace back_and_forth"
+                ++ ["exec ${pkgs.wl-mirror}/bin/wl-present mirror eDP-1 --fullscreen-output HDMI-A-1 --fullscreen"]
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth 5; move workspace to eDP-1; workspace back_and_forth"
+                ++ (workspace "obsidian" "eDP-1")
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth mirror; move workspace to HDMI-A-1; exec ${pkgs.wl-mirror}/bin/wl-mirror eDP-1; workspace back_and_forth"
+                ++ (workspace "5" "eDP-1")
+                ++ (workspace "music" "eDP-1")
+                ++ (workspace "msg" "eDP-1")
+                ++ (workspace "term" "eDP-1")
+                ++ (workspace "main" "eDP-1")
+              ))
           ];
         }
         {
@@ -184,11 +211,15 @@ in {
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth main; move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'; workspace back_and_forth"
+            (sway_commands
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth term; move workspace to eDP-1; workspace back_and_forth"
+              (
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth msg; move workspace to eDP-1; workspace back_and_forth"
+                (workspace "obsidian" "ViewSonic Corporation VG2448 V5E201864188")
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth music; move workspace to eDP-1; workspace back_and_forth"
+                ++ (workspace "5" "ViewSonic Corporation VG2448 V5E201864188")
-            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth 5; move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'; workspace back_and_forth"
+                ++ (workspace "music" "eDP-1")
+                ++ (workspace "msg" "eDP-1")
+                ++ (workspace "term" "eDP-1")
+                ++ (workspace "main" "ViewSonic Corporation VG2448 V5E201864188")
+              ))
           ];
         }
       ];