691 current 1970-01-01 01:00:00 25.05.20250901.7c815e5 6.12.44 *

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": {
@@ -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": {
@@ -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 = {

modules/home/programs/default.nix

@@ -2,6 +2,7 @@
   lib,
   config,
   pkgs,
+  inputs,
   ...
 }: let
   cfg = config.myConfig.programs;
@@ -22,6 +23,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 +50,6 @@ in {
       sops
       pwvucontrol
       qpwgraph
-      discord
       libreoffice-fresh
       mate.caja
       mate.atril
@@ -47,15 +59,14 @@ in {
       wine
       prusa-slicer
       kicad
-      element-desktop
       chromium
       wl-clipboard
       gimp
       godot_4
       ripgrep-all
       flatpak
-      obsidian
       marksman
+      alejandra
     ];
   };
 }

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/default.nix

@@ -9,20 +9,20 @@
   rotate_lisgd = pkgs.writeShellScriptBin "rotate_lisgd" ''
     # PREV_ORIENTATION and ORIENTATION are given by rot8
 
-    LISGD_INPUT=/dev/input/event14
+    LISGD_INPUT=/dev/input/by-path/platform-AMDI0010:02-event
-    # open nwggrid by swiping up from the bottom edge
+    # open nwggrid by swiping down with 3 fingers
-    LISGD_ACTIONS=("1,DU,B,*,R,${pkgs.sway}/bin/swaymsg exec ${pkgs.nwg-launchers}/bin/nwggrid -client")
+    LISGD_ACTIONS=("3,UD,*,*,R,${pkgs.nwg-launchers}/bin/nwggrid -client")
-    # close window by swiping down with 3 fingers
+    # close window by swiping up with 3 fingers
-    LISGD_ACTIONS+=("3,UD,*,L,R,${pkgs.sway}/bin/swaymsg kill")
+    LISGD_ACTIONS+=("3,DU,*,M,R,${pkgs.sway}/bin/swaymsg kill")
 
     # move window left by swiping left with 2 fingers
-    LISGD_ACTIONS+=("2,UD,*,*,R,${pkgs.sway}/bin/swaymsg move left")
+    LISGD_ACTIONS+=("2,RL,*,*,R,${pkgs.sway}/bin/swaymsg move left")
     # move window down by swiping down with 2 fingers
     LISGD_ACTIONS+=("2,UD,*,*,R,${pkgs.sway}/bin/swaymsg move down")
     # move window up by swiping up with 2 fingers
-    LISGD_ACTIONS+=("2,UD,*,*,R,${pkgs.sway}/bin/swaymsg move up")
+    LISGD_ACTIONS+=("2,DU,*,*,R,${pkgs.sway}/bin/swaymsg move up")
     # move window right by swiping right with 2 fingers
-    LISGD_ACTIONS+=("2,UD,*,*,R,${pkgs.sway}/bin/swaymsg move right")
+    LISGD_ACTIONS+=("2,LR,*,*,R,${pkgs.sway}/bin/swaymsg move right")
 
     LISGD_ACTION_OPTIONS=()
     for str in "''${LISGD_ACTIONS[@]}"; do
@@ -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

@@ -17,32 +17,51 @@ 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 = [
           {
             criteria = "eDP-1";
-              position = if settings.vertical.left then "1080,1080" else "0,1080";
+            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";
+            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";
+            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'"
+          (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 {
@@ -121,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 = [
@@ -136,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")
+              ))
           ];
         }
         {
@@ -155,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")
+              ))
           ];
         }
         {
@@ -175,11 +211,37 @@ 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")
+              ))
+          ];
+        }
+        {
+          profile.outputs = [
+            {
+              criteria = "eDP-1";
+              position = "1920,0";
+            }
+            {
+              criteria = "ASUSTek COMPUTER INC ASUS MB16AH R4LMTF099783";
+              position = "0,0";
+            }
+          ];
+          profile.exec = [
+            (sway_commands (
+              (workspace "obsidian" "eDP-1")
+              ++ (workspace "5" "eDP-1")
+              ++ (workspace "music" "ASUSTek COMPUTER INC ASUS MB16AH R4LMTF099783")
+              ++ (workspace "msg" "ASUSTek COMPUTER INC ASUS MB16AH R4LMTF099783")
+              ++ (workspace "term" "ASUSTek COMPUTER INC ASUS MB16AH R4LMTF099783")
+              ++ (workspace "main" "eDP-1")
+            ))
           ];
         }
       ];

modules/home/sway/waybar.nix

@@ -144,5 +144,9 @@ in {
       };
       style = ./waybar.css;
     };
+    home.packages = with pkgs;
+      lib.mkIf cfg.squeekboard [
+        glib
+      ];
   };
 }