update flake

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1746171682,
+        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "50eee705bbdbac942074a8c120e8194185633675",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735772949,
-        "narHash": "sha256-lvee0rhKTpJEDl1SC4F3Kvz88snOU8OMTJBsPH1pVBo=",
+        "lastModified": 1741303672,
+        "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=",
         "owner": "musnix",
         "repo": "musnix",
-        "rev": "86ef22cbdd7551ef325bce88143be9f37da64c26",
+        "rev": "d56a15f30329f304151e4e05fa82264d127da934",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740603184,
-        "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
+        "lastModified": 1746557022,
+        "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
+        "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1740560979,
-        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
+        "lastModified": 1746663147,
+        "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
+        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739262228,
-        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+        "lastModified": 1746485181,
+        "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+        "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
         "type": "github"
       },
       "original": {

hosts/MaxNixosLaptop/configuration.nix

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

modules/home/programs/default.nix

@@ -54,6 +54,7 @@ in {
       godot_4
       ripgrep-all
       stm32cubemx
+      flatpak
     ];
   };
 }

modules/home/sway/default.nix

@@ -131,10 +131,12 @@ in {
           };
           # map laptop touchscreen to laptop display
           "1267:11676:ELAN2513:00_04F3:2D9C" = lib.mkIf cfg.laptop {
+            tap = "enable";
             map_to_output = "'AU Optronics 0x4B2D Unknown'";
           };
           # map laptop stylus to laptop display
           "1267:11676:ELAN2513:00_04F3:2D9C_Stylus" = lib.mkIf cfg.laptop {
+            tap = "enable";
             map_to_output = "'AU Optronics 0x4B2D Unknown'";
           };
         };
@@ -255,6 +257,7 @@ in {
       extraConfig = lib.mkIf cfg.laptop ''
         bindswitch --reload --locked lid:on exec "[ $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq '. | length') -gt 1 ] && ${pkgs.sway}/bin/swaymsg output eDP-1 disable"
         bindswitch --reload --locked lid:off output eDP-1 enable
+        bindgesture --input-device=\'1267:11676:ELAN2513:00_04F3:2D9C\' swipe:3:down exec ${pkgs.nwg-launchers}/bin/nwggrid -client
       '';
     };
 

modules/home/sway/kanshi.nix

@@ -52,24 +52,25 @@ in {
           profile.outputs = [
             {
               criteria = "eDP-1";
-              position = "1080,1080";
+              position = "0,1080";
             }
             {
               criteria = "Dell Inc. DELL U2422HE 8YCPH83";
-              position = "1080,0";
+              transform = "normal";
+              position = "0,0";
             }
             {
-              criteria = "NEC Corporation E243WMi 59118576NB";
-              transform = "90";
-              position = "0,0";
+              criteria = "Dell Inc. DELL P2422HE 28XL9M3";
+              transform = "normal";
+              position = "1920,0";
             }
           ];
           profile.exec = [
-            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-4"
-            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-5"
+            "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"Dell Inc. DELL U2422HE 8YCPH83\"'"
+            "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to '\"Dell Inc. DELL P2422HE 28XL9M3\"'"
             "${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-4"
+            "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"Dell Inc. DELL U2422HE 8YCPH83\"'"
           ];
         }
         {
@@ -168,6 +169,30 @@ in {
             "${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 = [
             {

modules/nixos/default.nix

@@ -64,5 +64,7 @@ in {
     programs.steam.enable = true;
 
     security.polkit.enable = true;
+
+    services.upower.enable = true;
   };
 }

modules/nixos/update.nix

@@ -12,7 +12,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     system.autoUpgrade = {
-      enable = true;
+      enable = false;
       flake = inputs.self.outPath;
       flags = [
         "--recreate-lock-file"

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:V+I4N5bDSDeTaubUKWK5sWQnTojqg3Afahgvd02LbkjpW/7VMjtLOyxtR5g3vzswcUFFZzOe4P1Y/MdH,iv:TEHPa1mbj6ODtDSnMvKdUUeyd+WcX5CIT+x7V9+FgNU=,tag:z5d95/hy9YFYrhaTG7r+Yw==,type:str]
+    pass: ENC[AES256_GCM,data:Jp0Zpzw6NZzvE+N5cehvgW7nV5F1WQteZcPFB8FGZMyvX+uhVfUDvp8/UHU/2Vd/zT+A+NVp/EQDd8Wv,iv:O5rdJ+lgqXF+JqZc9yJVUM7Sy4yGRGLKGuFLxfD5Jpc=,tag:UT/AeIYQDqck2Y+wLTmNUw==,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]
@@ -21,8 +21,8 @@ sops:
             cVV3dFpNbjY1bkZtUlltanpSNDlPd28KQ4FQrC6KyZEzzkmByh07q1RAGnWnCNtr
             XTDQhlbSq/LdptpqNbUD2g9H9vC2CAC0av39ExvT55JiK4dEWmrwUA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-02-28T13:54:09Z"
-    mac: ENC[AES256_GCM,data:1KKWA9F1kfwcvvbTNwFH/Cp0QGFGAJZOWCZX16Qi8g9ncBeX8xY8ZXq9jWtgOXO1wDeB7gPQj2nanZSzFvvjaq44h/gJRDu72L9H5KOrhJbJTG2K8yLWKnvzuLet8dPlaMkZKermCRcN31W9cQBLj7+31lUznTSLvd0B9uJxdu8=,iv:KImOEnxVrRnDtM7w3Xa23L6j495WQlSvqJgmRii4WSQ=,tag:Ck6u78WVnjkUDUCJnKyUhQ==,type:str]
+    lastmodified: "2025-04-14T10:40:29Z"
+    mac: ENC[AES256_GCM,data:PM6xAylhbEoG17McCCxT9k1cf0rIrORhndSAe8jqiwnezj2rRVkwTsCCWrf678GZpaBwdvYc1sauK0GRxLsk9qoMaeMh0knDMKOYjIxacrlJdYJkOZq8Ze1UWxyAd6PLtR9EQEsbJEnup+AcKGwvjJ5iySD8dWB2kcBnCVeaHdE=,iv:7DhkICFMJ4iRs1BHCGpZo8ZvJwpF5EolgP0egyMUyPY=,tag:SST1xwIwyOfLhfH5oasnjQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.4

secrets/wifi.yaml

@@ -1,6 +1,6 @@
 home:
-    ssid: ENC[AES256_GCM,data:i76d33GIysjSY2k=,iv:34g02nNL5xYXx0PpN49u4xVHzfraTMtAqC4w4oxLBao=,tag:Y3g8kzhPF5LJuaxFq7jd3w==,type:str]
-    psk: ENC[AES256_GCM,data:bb25mbWgCBvwEvKr4sRRXg==,iv:+oNkqdk0bEP1l1e+HpSveRrxJI8OfQtBVcQ5476kMLU=,tag:vdWSVd5pIRGab+lzP4oFHg==,type:str]
+    ssid: ENC[AES256_GCM,data:NXV/fyH9brOD,iv:fwdot2Zotoxnng55p/bDT1KmO1oGozj8UadZYKgcF8k=,tag:fPF2N7TPq2TGjlfSLfryLQ==,type:str]
+    psk: ENC[AES256_GCM,data:wrKsVQ/Ra8ruWPXLXolyHLyQul/7lFrBA72Cj14=,iv:BkGX4xxyqDdFXAw1Ur3YI4CAYJIW1dRjL8KYOgoxFVc=,tag:aP8wWk6UGEeZOVWhkiGT0g==,type:str]
 parents:
     ssid: ENC[AES256_GCM,data:NZEKQ2N1sC0=,iv:vvsnsH3lYbtXwSnQuInhceiE19Z+ZNszB20TL9BF40g=,tag:5YOljSW9Hht+MCNKhss/Sw==,type:str]
     psk: ENC[AES256_GCM,data:gjpdj21uLDiY,iv:k1RH2ybRkJccEqjkdv1Tz+qLS2EdGWdn+jRkUcTDLtY=,tag:IuwgoHt//GvyWVvDI2C/2g==,type:str]
@@ -26,8 +26,8 @@ sops:
             d0FZc0x5UVhPQ09xUE5Qa1A0QkExVmcKkcy1i+nME0uHlLy8vCu8vgqSuR+0NqaD
             D+zKRKNdfJn1TLsoyDb4iDSeqp8nB9fZzQqIJshGRhlnqxuzIiYqqA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-20T19:10:46Z"
-    mac: ENC[AES256_GCM,data:CAkdbGguJ/W1C0bZY7EE7IU9b6+4sspFbP5SpnybUULqJnR98MK55UT/2cfc6HYsN0RQCz7EtgZ06cjCELPn7AYFFYRbLSptrgBciIpMlDCX/22qlZ+Y6ehRr+j5scCifJITKwe9BfpLqVy27xPA1zFdbuiJkFHW0XKzSNk/hDQ=,iv:FdQlJH6LtksqloAz3+HKmERrTDntKs/lVTKJ1bTP0bM=,tag:aCY6u1ARccyuQix/wb1cfg==,type:str]
+    lastmodified: "2025-05-05T13:46:43Z"
+    mac: ENC[AES256_GCM,data:5V6dtgz6xDFXUqkTxAZ2mdNovMcz4rf64UJHp/oTY0Veqjesyx88etSz6y15E3CsKa4LQImBGtwfowVXa5eto5eBdO8fg07zzfSMT4lUmxPg/kTUJluLNpwph4HxP2mLo5h0o+4PDILuBrwS9ozOHOAzEj/iCKUmmmNFN598xkA=,iv:4MKHWixtku5pCSHfTgNmCIm5NHm5K6nVK1v589BFA9s=,tag:95ud48Qu1q016SCNFzciig==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.4