wrap electron applications

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749154018,
+        "lastModified": 1753592768,
-        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750400657,
+        "lastModified": 1755593991,
-        "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
+        "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
+        "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1750506804,
+        "lastModified": 1755615617,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {
@@ -79,7 +79,8 @@
         "musnix": "musnix",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "wrapper-manager": "wrapper-manager"
       }
     },
     "sops-nix": {
@@ -89,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750119275,
+        "lastModified": 1754988908,
-        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -101,6 +102,21 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "wrapper-manager": {
+      "locked": {
+        "lastModified": 1751998186,
+        "narHash": "sha256-np2RxS8tRz/jGfUSYKxzg7cCi4dS8PL8gutLZfPMbIY=",
+        "owner": "viperML",
+        "repo": "wrapper-manager",
+        "rev": "8ad2484b485acad0632cb0af15b5eb704e3c1d0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "viperML",
+        "repo": "wrapper-manager",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -13,6 +13,8 @@
 
     musnix.url = "github:musnix/musnix";
     musnix.inputs.nixpkgs.follows = "nixpkgs";
+
+    wrapper-manager.url = "github:viperML/wrapper-manager";
   };
 
   outputs = {

hosts/MaxNixosLaptop/configuration.nix

@@ -26,7 +26,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    unstable.bambu-studio
+    bambu-studio
     neovim
     wget
     fprintd

modules/home/programs/default.nix

@@ -2,9 +2,11 @@
   lib,
   config,
   pkgs,
+  inputs,
   ...
 }: let
   cfg = config.myConfig.programs;
+  
 in {
   imports = [./foot.nix ./thunderbird.nix ./nextcloud.nix ./udiskie.nix ./wezterm.nix ./rclone.nix];
 
@@ -22,6 +24,18 @@ in {
     };
 
     home.packages = with pkgs; [
+      (inputs.wrapper-manager.lib.wrapWith pkgs {
+        basePackage = element-desktop;
+        prependFlags = ["--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer" "--ozone-platform=wayland"];
+      })
+      (inputs.wrapper-manager.lib.wrapWith pkgs {
+        basePackage = discord;
+        prependFlags = ["--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer" "--ozone-platform=wayland"];
+      })
+      (inputs.wrapper-manager.lib.wrapWith pkgs {
+        basePackage = obsidian;
+        prependFlags = ["--enable-features=UseOzonePlatform" "--ozone-platform=wayland"];
+      })
       unzip
       firefox
       xournalpp
@@ -37,7 +51,6 @@ in {
       sops
       pwvucontrol
       qpwgraph
-      discord
       libreoffice-fresh
       mate.caja
       mate.atril
@@ -47,16 +60,14 @@ in {
       wine
       prusa-slicer
       kicad
-      element-desktop
       chromium
       wl-clipboard
       gimp
       godot_4
       ripgrep-all
-      stm32cubemx
       flatpak
-      obsidian
       marksman
+      alejandra
     ];
   };
 }

modules/home/programs/nextcloud.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }: let
   cfg = config.myConfig.programs.nextcloud;
@@ -11,9 +10,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    services.nextcloud-client = {
+    services.nextcloud-client.enable = true;
-      enable = true;
-      package = pkgs.unstable.nextcloud-client;
-    };
   };
 }

modules/home/sway/default.nix

@@ -93,31 +93,11 @@ in {
         output = let
           bgdir = ../../../assets;
           bg1080 = bgdir + "/bg1080.png";
-          bg1080vert = bgdir + "/bg1080vert.png";
-          bg4k = bgdir + "/bg4k.png";
         in
           lib.mkIf cfg.laptop {
             eDP-1 = {
               bg = "'${bg1080}' fit";
             };
-            HDMI-A-1 = {
-              bg = "'${bg4k}' fit";
-            };
-            DP-3 = {
-              bg = "'${bg1080}' fit";
-            };
-            DP-4 = {
-              bg = "'${bg1080}' fit";
-            };
-            DP-5 = {
-              bg = "'${bg1080vert}' fit";
-            };
-            DP-6 = {
-              bg = "'${bg1080}' fit";
-            };
-            DP-7 = {
-              bg = "'${bg1080vert}' fit";
-            };
           };
 
         input = {
@@ -185,6 +165,7 @@ in {
             {app_id = "thunderbird";}
             {app_id = "discord";}
             {app_id = "Element";}
+            {class = "Element";}
           ];
           "music" = [{app_id = "org.rncbc.qpwgraph";}];
           "obsidian" = [{app_id = "obsidian";} {class = "obsidian";}];
@@ -228,27 +209,21 @@ in {
         workspaceOutputAssign = lib.mkIf cfg.laptop [
           {
             workspace = "main";
-            output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
           }
           {
             workspace = "term";
-            output = ["DP-5" "DP-4" "DP-7" "eDP-1"];
           }
           {
             workspace = "msg";
-            output = ["eDP-1"];
           }
           {
             workspace = "music";
-            output = ["eDP-1"];
           }
           {
             workspace = "5";
-            output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
           }
           {
             workspace = "obsidian";
-            output = ["eDP-1"];
           }
         ];
 

modules/home/sway/kanshi.nix

@@ -12,7 +12,49 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    services.kanshi = {
+    services.kanshi = let
+      bgdir = ../../../assets;
+      bg1080 = bgdir + "/bg1080.png";
+      bg1080vert = bgdir + "/bg1080vert.png";
+      bg4k = bgdir + "/bg4k.png";
+      luhbots_workstation = settings: {
+        profile.outputs = [
+          {
+            criteria = "eDP-1";
+            position =
+              if settings.vertical.left
+              then "1080,1080"
+              else "0,1080";
+          }
+          {
+            criteria = settings.horizontal.name;
+            position =
+              if settings.vertical.left
+              then "1080,0"
+              else "0,0";
+          }
+          {
+            criteria = settings.vertical.name;
+            transform = settings.vertical.orientation;
+            position =
+              if settings.vertical.left
+              then "0,0"
+              else "1920,0";
+          }
+        ];
+        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'"
+          "${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'"
+          "${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'"
+          "${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'"
+          "${pkgs.sway}/bin/swaymsg 'output \"eDP-1\" bg ${bg1080} fit'"
+          "${pkgs.sway}/bin/swaymsg 'output \"${settings.horizontal.name}\" bg ${bg4k} fit'"
+          "${pkgs.sway}/bin/swaymsg 'output \"${settings.vertical.name}\" bg ${bg1080vert} fit'"
+          "${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'"
+        ];
+      };
+    in {
       enable = true;
       settings = lib.mkIf cfg.laptop [
         {
@@ -24,199 +66,70 @@ in {
             }
           ];
         }
-        {
+        (luhbots_workstation {
-          profile.outputs = [
+          horizontal.name = "Dell Inc. DELL U2422HE GRCPH83";
-            {
+          vertical = {
-              criteria = "eDP-1";
+            name = "NEC Corporation E243WMi 7X313185NB";
-              position = "0,1080";
+            left = false;
-            }
+            orientation = "90";
-            {
+          };
-              criteria = "Dell Inc. DELL U2422HE GRCPH83";
+        })
-              position = "0,0";
+        (luhbots_workstation {
-            }
+          horizontal.name = "Dell Inc. DELL U2422HE 8YCPH83";
-            {
+          vertical = {
-              criteria = "NEC Corporation E243WMi 7X313185NB";
+            name = "Dell Inc. DELL P2422HE 28XL9M3";
-              transform = "90";
+            left = false;
-              position = "1920,0";
+            orientation = "normal";
-            }
+          };
-          ];
+        })
-          profile.exec = [
+        (luhbots_workstation {
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-4"
+          horizontal.name = "Dell Inc. DELL U2422HE 53DCH83";
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-5"
+          vertical = {
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
+            name = "Dell Inc. DELL U2412M 0FFXD46I4U5S";
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
+            left = false;
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-4"
+            orientation = "90";
-          ];
+          };
-        }
+        })
-        {
+        (luhbots_workstation {
-          profile.outputs = [
+          horizontal.name = "Dell Inc. DELL P2422HE 4BXL9M";
-            {
+          vertical = {
-              criteria = "eDP-1";
+            name = "NEC Corporation E243WMi 75309334NB";
-              position = "0,1080";
+            left = true;
-            }
+            orientation = "90";
-            {
+          };
-              criteria = "Dell Inc. DELL U2422HE 8YCPH83";
+        })
-              transform = "normal";
+        (luhbots_workstation {
-              position = "0,0";
+          horizontal.name = "Dell Inc. DELL P2422HE JLXL9M3";
-            }
+          vertical = {
-            {
+            name = "NEC Corporation E243WMi 59118576NB";
-              criteria = "Dell Inc. DELL P2422HE 28XL9M3";
+            left = true;
-              transform = "normal";
+            orientation = "90";
-              position = "1920,0";
+          };
-            }
+        })
-          ];
+        (luhbots_workstation {
-          profile.exec = [
+          horizontal.name = "Dell Inc. DELL P2422HE 7VWL9M3";
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"Dell Inc. DELL U2422HE 8YCPH83\"'"
+          vertical = {
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to '\"Dell Inc. DELL P2422HE 28XL9M3\"'"
+            name = "ViewSonic Corporation VG2448 V5E201960167";
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
+            left = false;
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
+            orientation = "90";
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"Dell Inc. DELL U2422HE 8YCPH83\"'"
+          };
-          ];
+        })
-        }
+        (luhbots_workstation {
-        {
+          horizontal.name = "Dell Inc. DELL U2422HE 7HCPH83";
-          profile.outputs = [
+          vertical = {
-            {
+            name = "Dell Inc. DELL U2422HE 1XFFH83";
-              criteria = "eDP-1";
+            left = true;
-              position = "0,1080";
+            orientation = "90";
-            }
+          };
-            {
+        })
-              criteria = "Dell Inc. DELL U2422HE 53DCH83";
+        (luhbots_workstation {
-              position = "0,0";
+          horizontal.name = "Dell Inc. DELL U2422HE 5XY5H83";
-            }
+          vertical = {
-            {
+            name = "Dell Inc. DELL U2419H 11B7Y13";
-              criteria = "Dell Inc. DELL U2412M 0FFXD46I4U5S";
+            left = true;
-              transform = "90";
+            orientation = "270";
-              position = "1920,0";
+          };
-            }
+        })
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-6"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-7"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-6"
-          ];
-        }
-        {
-          profile.outputs = [
-            {
-              criteria = "eDP-1";
-              position = "1080,1080";
-            }
-            {
-              criteria = "Dell Inc. DELL P2422HE 4BXL9M3";
-              position = "1080,0";
-            }
-            {
-              criteria = "NEC Corporation E243WMi 75309334NB";
-              transform = "90";
-              position = "0,0";
-            }
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-3"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-4"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-3"
-          ];
-        }
-        {
-          profile.outputs = [
-            {
-              criteria = "eDP-1";
-              position = "1080,1080";
-            }
-            {
-              criteria = "Dell Inc. DELL P2422HE JLXL9M3";
-              position = "1080,0";
-            }
-            {
-              criteria = "NEC Corporation E243WMi 59118576NB";
-              transform = "90";
-              position = "0,0";
-            }
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-3"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-4"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-3"
-          ];
-        }
-        {
-          profile.outputs = [
-            {
-              criteria = "eDP-1";
-              position = "0,1080";
-            }
-            {
-              criteria = "Dell Inc. DELL P2422HE 7VWL9M3";
-              position = "0,0";
-            }
-            {
-              criteria = "ViewSonic Corporation VG2448 V5E201960167";
-              transform = "90";
-              position = "1920,0";
-            }
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to '\"ViewSonic Corporation VG2448 V5E201960167\"'"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'"
-          ];
-        }
-        {
-          profile.outputs = [
-            {
-              criteria = "eDP-1";
-              position = "1080,1080";
-            }
-            {
-              criteria = "Dell Inc. DELL U2422HE 7HCPH83";
-              position = "1080,0";
-            }
-            {
-              criteria = "Dell Inc. DELL U2422HE 1XFFH83";
-              transform = "90";
-              position = "0,0";
-            }
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"Dell Inc. DELL U2422HE 7HCPH83\"'"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to '\"Dell Inc. DELL U2422HE 1XFFH83\"'"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"Dell Inc. DELL U2422HE 7HCPH83\"'"
-          ];
-        }
-        {
-          profile.outputs = [
-            {
-              criteria = "eDP-1";
-              position = "1080,1080";
-            }
-            {
-              criteria = "DP-3";
-              position = "1080,0";
-            }
-            {
-              criteria = "DP-1";
-              transform = "90";
-              position = "0,0";
-            }
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-3"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-3"
-          ];
-        }
         {
           profile.name = "docked-4k";
           profile.outputs = [
@@ -232,11 +145,11 @@ in {
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to HDMI-A-1"
+            "${pkgs.sway}/bin/swaymsg workspace main; move workspace to HDMI-A-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to eDP-1"
+            "${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"
+            "${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to HDMI-A-1"
+            "${pkgs.sway}/bin/swaymsg workspace 5; move workspace to HDMI-A-1; workspace back_and_forth"
           ];
         }
         {
@@ -251,13 +164,12 @@ in {
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth main; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to eDP-1"
+            "${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=msg] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth msg; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth music; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth 5; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=mirror] move workspace to HDMI-A-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"
-            "${pkgs.sway}/bin/swaymsg [workspace=mirror] exec ${pkgs.wl-mirror}/bin/wl-mirror eDP-1"
           ];
         }
         {
@@ -272,11 +184,11 @@ in {
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth main; move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to eDP-1"
+            "${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=msg] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth msg; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg workspace --no-auto-back-and-forth music; move workspace to eDP-1; workspace back_and_forth"
-            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"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"
           ];
         }
       ];

modules/nixos/greetd.nix

@@ -53,5 +53,9 @@ in {
       whitesur-icon-theme
       whitesur-cursors
     ];
+
+    environment.variables = {
+      XKB_DEFAULT_LAYOUT = "de";
+    };
   };
 }

modules/nixos/qemu.nix

@@ -25,11 +25,7 @@ in {
         ovmf = {
           enable = true;
           packages = [
-            (pkgs.OVMF.override {
+            pkgs.OVMFFull.fd
-              secureBoot = true;
-              tpmSupport = true;
-            })
-            .fd
           ];
         };
       };

secrets/rclone.yaml

@@ -1,7 +1,7 @@
 cloud:
     url: ENC[AES256_GCM,data:BoSdQrtLNKYpaHIWUj5Ak8PGMJz3hj/z88XVBgN6AbyT2K/bC412p3oi+X9MmYATR3A=,iv:wez+v5kEN+niZmZXzaJoygHf4mqKVI6CINktAZe8WTs=,tag:20W87Kcn94smiLtX9mMdOw==,type:str]
     user: ENC[AES256_GCM,data:kFza,iv:OrDNF/h+xLuuyq2cpaHnQuRM1lwuXhe8Ue0rm/wRmkY=,tag:9t+hEx38r/yBIzWIFD0GnQ==,type:str]
-    pass: ENC[AES256_GCM,data:aEMTAooaylD3d3xF7KXZsT9JdvwFCn5hWlcZ71fsex3nWQJTyzOJVKSp4J9nU5nQ9xU61i/pS+huIGOJ,iv:FCvaerrCiOFD0aMuipPbq68PfO6y5mdN2iLqX6MFxdY=,tag:gV6blZLe0U4H+/8wLQvb9Q==,type:str]
+    pass: ENC[AES256_GCM,data:Li7KW31pcwL0rq/Ottz+A6fjusX+Msay4dLkM1DAEsRp1cb6nqauD51pWIkGqntZtC6Z3U3sOpY73Wo5,iv:zI3z1dlCBn/s5EquH18ILTUg0YuMBnQKUCgNkTKJY8o=,tag:sKzadnNXwf1kMFlhK56+jA==,type:str]
 luhbots:
     url: ENC[AES256_GCM,data:5hnCSyNcr3un83FaNGYaiZdbxCJe87+hzpoRtWozbn0OW31pxONIEQnSikXh59/OlVJN9TEmv+bd3uO210NPoKUL0D2MWw==,iv:fvY7fLbiAVGq0hh4ifs/LRgixlZsIDczw0hpiUvFSw0=,tag:gXNgNWMDXnRMdyhTjnG6oA==,type:str]
     user: ENC[AES256_GCM,data:ucJ21fRmDKvHtyA=,iv:IYfNwBBWYxVb7ptwhfBiBgXwaoj5oCWg6gCI3WD8sjE=,tag:sB6/PJuquUL/GugpfzNMRw==,type:str]
@@ -17,7 +17,7 @@ sops:
             cVV3dFpNbjY1bkZtUlltanpSNDlPd28KQ4FQrC6KyZEzzkmByh07q1RAGnWnCNtr
             XTDQhlbSq/LdptpqNbUD2g9H9vC2CAC0av39ExvT55JiK4dEWmrwUA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-06-24T14:50:28Z"
+    lastmodified: "2025-08-21T11:59:42Z"
-    mac: ENC[AES256_GCM,data:7H0XrBPPHxt6djyc1sSZpKiLFMAoD4ycIES3StmyMq1WC8TiICajPRJjJpOIDrJMadW7tMikdIj9Xsb2WYp7IffFVP0E4VJhVEdCbW9CfOIKV32pWTLe/kTYNxod6RUfeFk/7iRejwv3xAFLThwWqjYpUDD9JcIyd9lbabTm7BA=,iv:bbt/2Vj1vv8NEjjJHQ/A5jRNPe3XyJPuY4WSG1K88OY=,tag:yLGgeoaiaNyCqenxcHyFpA==,type:str]
+    mac: ENC[AES256_GCM,data:AjDUc3G435FGlZysR+84u+SXeeou9HzTvGnZjEXZbS+AaHEv3CEXPG0qSUbyzudbF3G8oFTgMzlQlZ2ayTJKCNjzn9cgbo1K9iUfphkMD7vrPaIiB7y6GYaA6HRVdUvGNM7kwrH/HpkzgvVP96ey3jb0ZYd4g7sbaGPwDdsd7vk=,iv:u5UrX9QpycSpQ9DKnAtGr3PJ28GEKIagggdZ9ZpWsKw=,tag:911biSbujzMmlTP/5KWw+Q==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2