niri: redo a lot

Signed-off-by: unexplrd <unexplrd@linerds.us>

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751569683,
+        "lastModified": 1751740947,
-        "narHash": "sha256-PoQcCYTiN52PanxgWBN4Tqet1x4PCk6KtjaHNjELH88=",
+        "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "c0c56dde3e471030edb135425a82107cf0057c6f",
+        "rev": "dfc1db15a08c4cd234288f66e1199c653495301f",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1751777244,
+        "lastModified": 1752318841,
-        "narHash": "sha256-/czsZlnHv8Sl/u2syCzucxfVFLBHXWxvgicYmlk5YEE=",
+        "narHash": "sha256-/Vfi3vmpBDaEDCdPYEOgUIUTyt2lOTRWVj3ESBRIChY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "a0d66535286f557ccfb7c7c4c4ddc95cce96fc8b",
+        "rev": "b342f1adfa040963c9b00f4f1755def9f8588a58",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743550720,
+        "lastModified": 1751413152,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
         "type": "github"
       },
       "original": {
@@ -324,7 +324,9 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1731533236,
@@ -367,11 +369,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1751869689,
+        "lastModified": 1752293658,
-        "narHash": "sha256-WRATlWALRFNnhqABLRtLHlL7a838oJhMRMbaTgjvXYk=",
+        "narHash": "sha256-p4I9YxndfMpcHg9EVcy5+BACLp2GBjpVMbXuJ/glYnw=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "292d89dbe2ad246016411cc0f35dd0e3fffa44ca",
+        "rev": "e67a62453d8e75e82b581a340e70896f722a7f0f",
         "type": "github"
       },
       "original": {
@@ -448,11 +450,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751824240,
+        "lastModified": 1752286566,
-        "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
+        "narHash": "sha256-A4nftqiNz2bNihz0bKY94Hq/6ydR6UQOcGioeL7iymY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
+        "rev": "392ddb642abec771d63688c49fa7bcbb9d2a5717",
         "type": "github"
       },
       "original": {
@@ -506,11 +508,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750621377,
+        "lastModified": 1751808145,
-        "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=",
+        "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310",
+        "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f",
         "type": "github"
       },
       "original": {
@@ -539,11 +541,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1751714318,
+        "lastModified": 1752270468,
-        "narHash": "sha256-nkoRnDkRGaCT0JTuHcDXPCMkdmhUFEtI1TMUiQcrxfs=",
+        "narHash": "sha256-SEFxC9q+BMn1FkeaBRCDb0h7hZ2B+MSi8+u85y4rgQY=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "6a5f4f5954a64bac718e3938f062d045256e7aeb",
+        "rev": "6821723b4421bdf163f1a1cc6fd472516d44b1e7",
         "type": "github"
       },
       "original": {
@@ -722,11 +724,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751061882,
+        "lastModified": 1751888065,
-        "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=",
+        "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4",
+        "rev": "a8229739cf36d159001cfc203871917b83fdf917",
         "type": "github"
       },
       "original": {
@@ -747,11 +749,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750371869,
+        "lastModified": 1751881472,
-        "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=",
+        "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd",
+        "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120",
         "type": "github"
       },
       "original": {
@@ -769,11 +771,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751529406,
+        "lastModified": 1752218319,
-        "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=",
+        "narHash": "sha256-fEvLVaVduwVotOib8NqO0e4N3dMsdA04Jlfm2sZQH5Q=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d",
+        "rev": "d5da490d8c2553fc8d589b49f9c036973b9656a1",
         "type": "github"
       },
       "original": {
@@ -869,11 +871,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751774635,
+        "lastModified": 1752305182,
-        "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
+        "narHash": "sha256-6i4Q68G7wzNq1m2+l3lJUYgGZ9PwULvSVJpRSTTC46o=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "85686025ba6d18df31cc651a91d5adef63378978",
+        "rev": "ad29e2961dd0d58372384563bf00d510fc9f2e15",
         "type": "github"
       },
       "original": {
@@ -924,11 +926,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1751792365,
+        "lastModified": 1751984180,
-        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
         "type": "github"
       },
       "original": {
@@ -979,15 +981,14 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ],
+        ]
-        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1748730660,
+        "lastModified": 1751906969,
-        "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
+        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
+        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
         "type": "github"
       },
       "original": {
@@ -1065,7 +1066,7 @@
         "nixpkgs-stable": "nixpkgs-stable_2",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
-        "systems": "systems_2",
+        "systems": "systems",
         "walker": "walker"
       }
     },
@@ -1077,11 +1078,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751683029,
+        "lastModified": 1752201818,
-        "narHash": "sha256-dYO5X5jK8bpQOeRAo8R5aUt6M/+Ji1cZgstZI7SQ2IA=",
+        "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9e5e62a33a929a67a5427fb7324a6f583dced0b2",
+        "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d",
         "type": "github"
       },
       "original": {
@@ -1175,11 +1176,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1751840923,
+        "lastModified": 1752250117,
-        "narHash": "sha256-4HZxn+PrWytrWVg5c5SEetv3m9/k7rngJq27zKuRIfo=",
+        "narHash": "sha256-zCPV1a8w9hRn5ukOQwaAggA3X5cMmVsZVBYo8wLfLuU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "5259682ce58d935f248297bf1c9793a5cee0787e",
+        "rev": "0da583a359fd911d5cbfd2c789424b888b777a4b",
         "type": "github"
       },
       "original": {
@@ -1203,21 +1204,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1254,11 +1240,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1748180480,
+        "lastModified": 1750770351,
-        "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
         "type": "github"
       },
       "original": {
@@ -1270,11 +1256,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1748740859,
+        "lastModified": 1751159871,
-        "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
         "type": "github"
       },
       "original": {
@@ -1286,11 +1272,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1725758778,
+        "lastModified": 1751158968,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
         "type": "github"
       },
       "original": {
@@ -1299,28 +1285,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "walker": {
       "inputs": {
         "nixpkgs": [
@@ -1331,11 +1295,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751822129,
+        "lastModified": 1752245988,
-        "narHash": "sha256-aI8JTRZHynKKJQpNP5TJuHsFQpKfDVJbW/u99lTpGyg=",
+        "narHash": "sha256-t0Sg3HWhDIIQISLGt2cYnD28RUI3SKKTVE9bFL9M5Ok=",
         "owner": "abenz1267",
         "repo": "walker",
-        "rev": "2f16a48d6fa4f0f16c7b2173a1ff434005c8ed32",
+        "rev": "33c1ee26f675902b4404f64288ad1facb9ecec22",
         "type": "github"
       },
       "original": {
@@ -1372,11 +1336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750372504,
+        "lastModified": 1751300244,
-        "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=",
+        "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92",
+        "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -31,6 +31,7 @@
     ghostty = {
       url = "github:ghostty-org/ghostty";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.inputs.systems.follows = "systems";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -87,7 +88,7 @@
     stylix = {
       url = "github:danth/stylix";
       inputs = {
-        home-manager.follows = "home-manager";
+        # home-manager.follows = "home-manager";
         nixpkgs.follows = "nixpkgs";
         systems.follows = "systems";
       };

hosts/dunamis/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk = "/dev/disk/by-id/nvme-eui.000000000000000100a075244b5d6185";
 in {
   imports = with inputs; [
@@ -10,5 +15,5 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;};
 }

hosts/dunamis/disko/disk-main.nix

@@ -1,4 +1,7 @@
-{disk, ...}: {
+{
+  disk,
+  hostId,
+}: {
   type = "disk";
   device = disk;
   content = {
@@ -25,7 +28,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = let

hosts/eldrid/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk = "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b444a44022ad0";
 in {
   imports = with inputs; [
@@ -10,5 +15,5 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;};
 }

hosts/eldrid/disko/disk-main.nix

@@ -1,4 +1,7 @@
-{disk, ...}: {
+{
+  disk,
+  hostId,
+}: {
   type = "disk";
   device = disk;
   content = {
@@ -25,7 +28,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = {

hosts/eldrid/hardware/laptop/cb-audio-fix.nix

@@ -1,20 +1,47 @@
 {pkgs, ...}: let
-  cb-ucm-conf = pkgs.alsa-ucm-conf.overrideAttrs {
+  cb-ucm-conf = with pkgs;
-    wttsrc = pkgs.fetchFromGitHub {
+    alsa-ucm-conf.overrideAttrs {
-      owner = "WeirdTreeThing";
+      wttsrc = fetchFromGitHub {
-      repo = "chromebook-ucm-conf";
+        owner = "WeirdTreeThing";
-      rev = "b6ce2a7";
+        repo = "alsa-ucm-conf-cros";
-      hash = "sha256-QRUKHd3RQmg1tnZU8KCW0AmDtfw/daOJ/H3XU5qWTCc=";
+        rev = "a4f0ed6cf59163fb571c33a81a6b40b6f53ed57d";
+        hash = "sha256-H0BsRzHSEJ6XCZB/Rvb3w+uGCzr+kAvAwcHWqYEtp6w=";
+      };
+      unpackPhase = ''
+        runHook preUnpack
+        tar xf "$src"
+        runHook postUnpack
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        mkdir -p $out/share/alsa
+        cp -r alsa-ucm*/ucm2 $out/share/alsa
+        runHook postInstall
+      '';
     };
-    postInstall = ''
-      cp -R $wttsrc/common/* $out/share/alsa/ucm2/common
-      cp -R $wttsrc/codecs/* $out/share/alsa/ucm2/codecs
-      cp -R $wttsrc/platforms/* $out/share/alsa/ucm2/platforms
-      cp -R $wttsrc/sof-rt5682 $out/share/alsa/ucm2/conf.d
-      cp -R $wttsrc/sof-cs42l42 $out/share/alsa/ucm2/conf.d
-    '';
-  };
 in {
+  environment = {
+    systemPackages = [pkgs.sof-firmware];
+    sessionVariables.ALSA_CONFIG_UCM2 = "${cb-ucm-conf}/share/alsa/ucm2";
+    etc = {
+      "wireplumber/main.lua.d/51-increase-headroom.lua".text = ''
+          rule = {
+            matches = {
+              {
+                { "node.name", "matches", "alsa_output.*" },
+              },
+            },
+            apply_properties = {
+              ["api.alsa.headroom"] = 4096,
+            },
+          }
+
+        table.insert(alsa_monitor.rules,rule)
+      '';
+    };
+  };
+
   system.replaceDependencies.replacements = [
     {
       original = pkgs.alsa-ucm-conf;
@@ -22,6 +49,10 @@ in {
     }
   ];
 
+  boot.extraModprobeConfig = ''
+    options snd-intel-dspcfg dsp_driver=3
+  '';
+
   services.pipewire.wireplumber.configPackages = [
     (pkgs.writeTextDir "share/wireplumber/main.lua.d/51-increase-headroom.lua" ''
       rule = {
@@ -37,10 +68,19 @@ in {
 
       table.insert(alsa_monitor.rules,rule)
     '')
+    (pkgs.writeTextDir "share/wireplumber/main.lua.d/51-avs-dmic.lua" ''
+      rule = {
+        matches = {
+          {
+            { "node.nick", "equals", "Internal Microphone" },
+          },
+        },
+        apply_properties = {
+          ["audio.format"] = "S16LE",
+        },
+      }
+
+      table.insert(alsa_monitor.rules, rule)
+    '')
   ];
-  boot = {
-    extraModprobeConfig = ''
-      options snd-intel-dspcfg dsp_driver=3
-    '';
-  };
 }

hosts/legion/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk-main = "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_BTHH81460QC2256B";
   disk-second = "/dev/disk/by-id/nvme-WDC_PC_SN730_SDBPNTY-1T00-1101_21114D802446";
 in {
@@ -11,6 +16,6 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk-main;};
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk-main hostId;};
-  disko.devices.disk.second = import ./disk-second.nix {inherit disk-second;};
+  disko.devices.disk.second = import ./disk-second.nix {inherit disk-second hostId;};
 }

hosts/legion/disko/disk-main.nix

@@ -1,4 +1,7 @@
-{disk-main}: {
+{
+  disk-main,
+  hostId,
+}: {
   type = "disk";
   device = disk-main;
   content = {
@@ -25,7 +28,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = {

hosts/legion/disko/disk-second.nix

@@ -1,4 +1,7 @@
-{disk-second}: {
+{
+  disk-second,
+  hostId,
+}: {
   type = "disk";
   device = disk-second;
   content = {
@@ -8,7 +11,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-second";
+          name = "luks-${hostId}-second";
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = {

hosts/morphius/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk = "/dev/nvme0n1";
 in {
   imports = with inputs; [
@@ -10,5 +15,5 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;};
 }

hosts/morphius/disko/disk-main.nix

@@ -1,4 +1,8 @@
-{disk, ...}: {
+{
+  disk,
+  hostId,
+  ...
+}: {
   type = "disk";
   device = disk;
   content = {
@@ -25,7 +29,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = {

hosts/sarien/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk = "/dev/disk/by-id/nvme-eui.0025385911b36714";
 in {
   imports = with inputs; [
@@ -11,5 +16,5 @@ in {
     };
   };
   # same partitioning setup
-  disko.devices.disk.main = import ../../dunamis/disko/disk-main.nix {inherit disk;};
+  disko.devices.disk.main = import ../../dunamis/disko/disk-main.nix {inherit disk hostId;};
 }

modules/home/desktop/niri/default.nix

@@ -1,21 +1,24 @@
 {
-  perSystem,
-  osConfig,
   config,
   inputs,
-  pkgs,
   lib,
+  osConfig,
+  # perSystem,
+  pkgs,
   ...
 }: let
-  # inherit (lib.strings) removeSuffix;
+  inherit (lib) mkIf mkEnableOption mkForce getExe;
-  inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
-  inherit (config.lib.stylix) colors;
-  # inherit (osConfig.module.stylix) theme;
   inherit (osConfig.networking) hostName;
+
   cfg = config.desktop.niri;
+
   ifLaptop = mkIf (hostName != "dunamis");
-  launcher = getExe pkgs.walker;
+
-  lockscreen = getExe pkgs.gtklock;
+  commonArgs = {
+    inherit config inputs lib osConfig pkgs;
+    launcher = getExe pkgs.walker;
+    lockscreen = getExe pkgs.gtklock;
+  };
 in {
   imports = with inputs; [
     walker.homeManagerModules.default
@@ -30,6 +33,24 @@ in {
       wpaperd.enable = true;
       qt.enable = false;
     };
+    stylix.iconTheme = {
+      enable = true;
+      light = "Papirus-Light";
+      dark = "Papirus-Dark";
+      package = let
+        inherit (lib.strings) hasPrefix;
+        inherit (osConfig.module.stylix) theme;
+        color =
+          if (hasPrefix "rose-pine" theme)
+          then "indigo"
+          else if (hasPrefix "nord" theme)
+          then "nordic"
+          else if (hasPrefix "s" theme)
+          then "teal"
+          else null;
+      in
+        pkgs.papirus-icon-theme.override {inherit color;};
+    };
     dconf.settings = {
       "org/gnome/desktop/wm/preferences" = {
         button-layout = "icon:close";
@@ -42,40 +63,14 @@ in {
           else lib.mkDefault "prefer-light";
       };
     };
-    gtk = {
-      enable = true;
-      iconTheme = let
-        name =
-          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
-          then "Gruvbox-Plus-Dark"
-          else if config.stylix.polarity == "dark"
-          then "Papirus-Dark"
-          else "Papirus-Light";
-        package = let
-          inherit (osConfig.module.stylix) theme;
-        in
-          if (lib.strings.hasPrefix "gruvbox" theme)
-          then pkgs.gruvbox-plus-icons
-          else if (lib.strings.hasPrefix "rose-pine" theme)
-          then pkgs.papirus-icon-theme.override {color = "indigo";}
-          else if (lib.strings.hasPrefix "nord" theme)
-          then pkgs.papirus-icon-theme.override {color = "nordic";}
-          else if (lib.strings.hasPrefix "s" theme)
-          then pkgs.papirus-icon-theme.override {color = "teal";}
-          else pkgs.papirus-icon-theme;
-      in {inherit name package;};
-    };
     qt = {
       enable = true;
       platformTheme.name = "gtk3";
     };
 
-    programs = {
+    programs.walker = import ./programs/walker commonArgs;
-      walker = import ./programs/walker {inherit config inputs pkgs;};
+    programs.waybar = import ./programs/waybar commonArgs;
-      waybar = import ./programs/waybar {inherit config colors getExe ifLaptop launcher pkgs;};
+    services = import ./services commonArgs;
-    };
-
-    services = import ./services {inherit pkgs lockscreen getExe perSystem osConfig;};
 
     home.packages = with pkgs;
       [
@@ -85,13 +80,9 @@ in {
         helvum # pipewire patchbay in rust
         junction # app chooser
         loupe # image viewer and editor in rust
-        mission-center # task manager in rust (partly)
         nautilus # file manager
-        overskride # bluetooth gui in rust
         papers # pdf reader in rust
-        pika-backup # borg gui in rust
         pwvucontrol # pipewire gui in rust
-        sonusmix # pipewire routing tool in rust
         wdisplays # wlroots display configurator
       ]
       ++ [
@@ -105,7 +96,7 @@ in {
 
     xdg = {
       configFile = {
-        niri = import ./niri.nix {inherit config hostName launcher lockscreen;};
+        niri = import ./niri.nix commonArgs;
         "mimeapps.list".force = true;
       };
       mime.enable = true;
@@ -136,12 +127,11 @@ in {
     };
     systemd.user = {
       settings.Manager.DefaultEnvironment = {
-        QT_QPA_PLATFORM = "wayland";
         DISPLAY = ":123";
       };
       targets.tray.Unit.Description = "Home Manager System Tray"; # workaround for udiskie
       services = let
-        mkGraphicalService = config: graphicalService // config;
+        mkGraphicalService = config: lib.attrsets.recursiveUpdate graphicalService config;
         graphicalService = {
           Install.WantedBy = ["niri.service"];
           Unit = {
@@ -158,33 +148,25 @@ in {
       in
         lib.mkMerge [
           {
-            udiskie = mkGraphicalService {};
+            copyq = mkGraphicalService {Service.Environment = mkForce "QT_QPA_PLATFORM=wayland";};
-            waybar = mkGraphicalService {};
             network-manager-applet = mkGraphicalService {};
-            copyq = mkGraphicalService {
+            udiskie = mkGraphicalService {};
-              Service =
-                graphicalService.Service
-                // {
-                  Environment = mkForce "QT_QPA_PLATFORM=wayland";
-                };
-            };
-            xwayland-satellite = mkGraphicalService {
-              Service =
-                graphicalService.Service
-                // {
-                  Type = "simple";
-                  ExecStart = getExe pkgs.xwayland-satellite + " :123";
-                };
-            };
-            wpaperd = mkGraphicalService {
-              Service =
-                mkDefault graphicalService.Service;
-            };
             walker = mkGraphicalService {};
+            waybar = mkGraphicalService {};
+            wpaperd =
+              mkGraphicalService {}
+              // {
+                Service.TimeoutStopSec = mkForce "1";
+                Service.Restart = mkForce "always";
+              };
+            xwayland-satellite = mkGraphicalService {
+              Service = {
+                Type = "simple";
+                ExecStart = getExe pkgs.xwayland-satellite + " :123";
+              };
+            };
             # gnome-polkit-agent = mkGraphicalService {
-            #   Service =
+            #   Service = {
-            #     graphicalService.Service
-            #     // {
             #       Type = "simple";
             #       ExecStart = pkgs.polkit_gnome + "/libexec/polkit-gnome-authentication-agent-1";
             #     };
@@ -192,20 +174,18 @@ in {
           }
           (lib.mkIf (hostName == "morphius") {
             lisgd = mkGraphicalService {
-              Service =
+              Service = {
-                graphicalService.Service
+                # Group = "input";
-                // {
+                Type = "simple";
-                  # Group = "input";
+                ExecStart =
-                  Type = "simple";
+                  "${pkgs.lisgd}/bin/lisgd"
-                  ExecStart =
+                  + " -d /dev/input/by-path/pci-0000:00:15.1-platform-i2c_designware.1-event"
-                    "${pkgs.lisgd}/bin/lisgd"
+                  + " -g \"1,DU,TL,*,P,niri msg action toggle-overview\""
-                    + " -d /dev/input/by-path/pci-0000:00:15.1-platform-i2c_designware.1-event"
+                  + " -g \"3,UD,T,*,P,niri msg action focus-workspace-up\""
-                    + " -g \"1,DU,TL,*,P,niri msg action toggle-overview\""
+                  + " -g \"3,DU,B,*,P,niri msg action focus-workspace-down\""
-                    + " -g \"3,UD,T,*,P,niri msg action focus-workspace-up\""
+                  + " -g \"3,LR,L,*,P,niri msg action focus-column-left\""
-                    + " -g \"3,DU,B,*,P,niri msg action focus-workspace-down\""
+                  + " -g \"3,RL,R,*,P,niri msg action focus-column-right\"";
-                    + " -g \"3,LR,L,*,P,niri msg action focus-column-left\""
+              };
-                    + " -g \"3,RL,R,*,P,niri msg action focus-column-right\"";
-                };
             };
           })
         ];

modules/home/desktop/niri/niri.nix

@@ -1,12 +1,14 @@
 {
   config,
-  hostName,
+  osConfig,
   launcher,
   lockscreen,
   ...
 }: let
   inherit (config.lib.stylix) colors;
   inherit (config.stylix) cursor;
+  inherit (osConfig.networking) hostName;
+
   keyboard =
     if hostName == "eldrid"
     then "chromeos"
@@ -91,14 +93,13 @@ in {
   in ''
     environment {
         DISPLAY ":123"
-        QT_QPA_PLATFORMTHEME "gtk3"
+        CLUTTER_BACKEND "wayland"
+        GDK_BACKEND "wayland"
         MOZ_ENABLE_WAYLAND "1"
         MOZ_WEBRENDER "1"
-        GDK_BACKEND "wayland"
         QT_QPA_PLATFORM "wayland"
-        XDG_SESSION_TYPE "wayland"
-        CLUTTER_BACKEND "wayland"
         SDL_VIDEODRIVER "wayland"
+        XDG_SESSION_TYPE "wayland"
     }
 
     input {
@@ -159,20 +160,20 @@ in {
       }
 
       struts {
-        left 43
+        left 36
-        right 43
+        right 36
       }
 
       tab-indicator {
         active-color "#${colors.base04}"
         inactive-color "#${colors.base03}"
-        corner-radius 3
+        corner-radius 6
         gap 3
         gaps-between-tabs 3
         // length total-proportion=0.3
         place-within-column
         position "left"
-        width 3
+        width 6
       }
       focus-ring {
         width 1
@@ -190,7 +191,7 @@ in {
     }
 
     window-rule {
-      geometry-corner-radius 9
+      geometry-corner-radius 12
       clip-to-geometry true
     }
     window-rule {

modules/home/desktop/niri/programs/fuzzel/default.nix

@@ -1,6 +1,6 @@
 {
   config,
-  mkDefault,
+  lib,
 }: {
   enable = true;
   settings = {
@@ -15,7 +15,7 @@
       match-mode = "fuzzy";
       icon-theme = config.dconf.settings."org/gnome/desktop/interface".icon-theme;
     };
-    border = mkDefault {
+    border = lib.mkDefault {
       width = 3;
       radius = 12;
     };

modules/home/desktop/niri/programs/walker/default.nix

@@ -230,7 +230,7 @@
       #window {
         background: @base00;
         color: @base05;
-        border-radius: 9px;
+        border-radius: 12px;
         border: 1px solid @base0D;
       }
 
@@ -240,7 +240,7 @@
 
       #search {
         background: @base01;
-        border-radius: 6px;
+        border-radius: 9px;
         padding: 8px;
       }
 
@@ -249,7 +249,7 @@
       #typeahead {
         background: none;
         box-shadow: none;
-        border-radius: 3px;
+        border-radius: 6px;
       }
 
       #input > *:first-child,
@@ -268,7 +268,7 @@
 
       #list {
         padding: 3px;
-        border-radius: 6px;
+        border-radius: 9px;
         background: @base01;
       }
 
@@ -279,7 +279,7 @@
       child:selected,
       child:hover {
         box-shadow: none;
-        border-radius: 3px;
+        border-radius: 6px;
         background: @base02;
       }
 

modules/home/desktop/niri/programs/waybar/default.nix

@@ -1,45 +1,35 @@
 {
-  colors,
   config,
-  getExe,
+  lib,
-  ifLaptop,
+  osConfig,
-  launcher,
   pkgs,
+  launcher,
   ...
-}: {
+}: let
+  inherit (config.lib.stylix) colors;
+
+  ifLaptop = lib.mkIf (osConfig.networking.hostName != "dunamis");
+in {
   enable = true;
   systemd = {
     enable = true;
     target = "graphical-session.target";
   };
-  settings.bar-0 = {
+  settings.bottom = {
-    # layer = "top";
     position = "bottom";
-    height = 40;
+    height = 33;
     spacing = 0;
-    # margin-left = 3;
+    # margin-left = 36 + 3;
-    # margin-right = 3;
+    # margin-right = 36 + 3;
-    margin-left = 43 + 3;
+    # margin-bottom = 3;
-    margin-right = 43 + 3;
-    margin-bottom = 3;
-    reload_style_on_change = true;
     modules-left = [
       "custom/launcher"
-      "clock"
       "wlr/taskbar"
-      "privacy"
+      # "privacy"
-    ];
-    modules-center = [
-      # "clock"
-      "niri/language"
-      "niri/workspaces"
-      "idle_inhibitor"
     ];
     modules-right = [
-      "wireplumber"
+      "niri/workspaces"
-      (ifLaptop "group/laptop")
+      "niri/language"
-      "tray"
-      "custom/notification"
     ];
     "niri/workspaces" = {
       format = "{index}";
@@ -57,7 +47,7 @@
         "power-profiles-daemon"
       ];
     };
-    "backlight" = {
+    backlight = {
       format = "{percent}% {icon}";
       format-icons = [
         "󰃚"
@@ -69,18 +59,18 @@
         "󰃠"
       ];
     };
-    "idle_inhibitor" = {
+    idle_inhibitor = {
       format = "{icon}";
       format-icons = {
         activated = "󰅶";
         deactivated = "󰾪";
       };
     };
-    "tray" = {
+    tray = {
-      icon-size = 20;
+      icon-size = 16;
       spacing = 6;
     };
-    "clock" = {
+    clock = {
       interval = 1;
       format = "{:%R}";
       tooltip = true;
@@ -99,25 +89,29 @@
       format-alt = "{icon} {time}";
       format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
     };
-    mpris = {
+    memory = {
-      format = "{player_icon} {dynamic}";
+      format = "{used:0.1f}G ";
-      format-paused = "{status_icon} <i>{dynamic}</i>";
+      tooltip-format = ''
-      playing-len = 30;
+        RAM: {used:0.1f}G/{total:0.1f}G ({percentage}%)
-      playing-paused = 30;
+        Swap: {swapUsed:0.1f}G/{swapTotal:0.1f}G ({swapPercentage}%)'';
-      player-icons = {
-        default = "▶";
-        mpv = "🎵";
-      };
-      status-icons = {paused = "⏸";};
     };
-    "upower" = {
+    network = {
+      format = "{bandwidthDownBits} 󰇚 | {bandwidthUpBits} 󰕒";
+      interval = 3;
+      tooltip = false;
+    };
+    cpu = {
+      format = "{usage}% 󰍛";
+      interval = 3;
+    };
+    upower = {
       icon-size = 16;
       format = "{percentage}";
       hide-if-empty = true;
       tooltip = true;
       tooltip-spacing = 20;
     };
-    "power-profiles-daemon" = {
+    power-profiles-daemon = {
       format = "{icon}";
       tooltip-format = "Power profile: {profile}\nDriver: {driver}";
       tooltip = true;
@@ -128,12 +122,12 @@
         power-saver = "";
       };
     };
-    "wireplumber" = {
+    wireplumber = {
       scroll-step = 3;
       format = "{volume}% {icon}";
       format-muted = "󰖁";
       format-icons = ["󰕿" "󰖀" "󰕾"];
-      on-click = getExe pkgs.pwvucontrol;
+      on-click = lib.getExe pkgs.pwvucontrol;
       on-click-right = "wpctl set-mute @DEFAULT_SINK@ toggle";
     };
     "custom/launcher" = {
@@ -159,7 +153,7 @@
     };
     "privacy" = {
       icon-spacing = 0;
-      icon-size = 18;
+      icon-size = 16;
       transition-duration = 250;
       screenshare = {
         type = "screenshare";
@@ -173,195 +167,371 @@
       };
     };
     "wlr/taskbar" = {
+      format = "{icon} {name}";
+      icon-size = 16;
+      icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
+      tooltip-format = "{title}";
+      on-click = "activate";
+    };
+  };
+  settings.top = {
+    position = "top";
+    height = 33;
+    spacing = 0;
+    # margin-left = 36 + 3;
+    # margin-right = 36 + 3;
+    # margin-top = 3;
+    modules-left = [
+      "custom/notification"
+      "tray"
+    ];
+    modules-center = ["clock"];
+    modules-right = [
+      "privacy"
+      "network"
+      "cpu"
+      "memory"
+      "wireplumber"
+      (ifLaptop "group/laptop")
+      # "tray"
+      "idle_inhibitor"
+    ];
+    "niri/workspaces" = {
+      format = "{index}";
+    };
+    "niri/language" = {
+      format = "{}";
+      format-en = "🇺🇸";
+      format-uk = "🇺🇦";
+    };
+    "group/laptop" = {
+      orientation = "inherit";
+      modules = [
+        "backlight"
+        "battery"
+        "power-profiles-daemon"
+      ];
+    };
+    backlight = {
+      format = "{percent}% {icon}";
+      format-icons = [
+        "󰃚"
+        "󰃛"
+        "󰃜"
+        "󰃝"
+        "󰃞"
+        "󰃟"
+        "󰃠"
+      ];
+    };
+    idle_inhibitor = {
       format = "{icon}";
-      icon-size = 20;
+      format-icons = {
+        activated = "󰅶";
+        deactivated = "󰾪";
+      };
+    };
+    tray = {
+      icon-size = 16;
+      spacing = 6;
+    };
+    clock = {
+      interval = 1;
+      format = "{:%R}";
+      tooltip = true;
+      tooltip-format = "{:%B %d, %A}";
+    };
+    battery = {
+      states = {
+        good = 95;
+        warning = 30;
+        critical = 15;
+      };
+      format = "{capacity}% {icon}";
+      format-full = "{capacity}% 󱟢";
+      format-charging = "{capacity}% 󰂄";
+      format-plugged = "{capacity}% 󰚥";
+      format-alt = "{icon} {time}";
+      format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+    };
+    memory = {
+      format = "{used:0.1f}G ";
+      tooltip-format = ''
+        RAM: {used:0.1f}G/{total:0.1f}G ({percentage}%)
+        Swap: {swapUsed:0.1f}G/{swapTotal:0.1f}G ({swapPercentage}%)'';
+    };
+    network = {
+      format = "{bandwidthDownBits} 󰇚 | {bandwidthUpBits} 󰕒";
+      interval = 3;
+      tooltip = false;
+    };
+    cpu = {
+      format = "{usage}% 󰍛";
+      interval = 3;
+    };
+    upower = {
+      icon-size = 16;
+      format = "{percentage}";
+      hide-if-empty = true;
+      tooltip = true;
+      tooltip-spacing = 20;
+    };
+    power-profiles-daemon = {
+      format = "{icon}";
+      tooltip-format = "Power profile: {profile}\nDriver: {driver}";
+      tooltip = true;
+      format-icons = {
+        default = "󱡮";
+        performance = "󱡮";
+        balanced = "";
+        power-saver = "";
+      };
+    };
+    wireplumber = {
+      scroll-step = 3;
+      format = "{volume}% {icon}";
+      format-muted = "󰖁";
+      format-icons = ["󰕿" "󰖀" "󰕾"];
+      on-click = lib.getExe pkgs.pwvucontrol;
+      on-click-right = "wpctl set-mute @DEFAULT_SINK@ toggle";
+    };
+    "custom/launcher" = {
+      format = "";
+      on-click = launcher;
+      tooltip = false;
+    };
+    "custom/notification" = {
+      tooltip = false;
+      format = "{icon}";
+      format-icons = {
+        notification = "󱅫";
+        none = "󰂚";
+        dnd-notification = "󰂛";
+        dnd-none = "󰂛";
+      };
+      return-type = "json";
+      exec-if = "which swaync-client";
+      exec = "swaync-client -swb";
+      on-click = "swaync-client -t -sw";
+      on-click-right = "swaync-client -d -sw";
+      escape = true;
+    };
+    "privacy" = {
+      icon-spacing = 0;
+      icon-size = 16;
+      transition-duration = 250;
+      screenshare = {
+        type = "screenshare";
+        tooltip = true;
+        tooltip-icon-size = 24;
+      };
+      audio-in = {
+        type = "audio-in";
+        tooltip = true;
+        tooltip-icon-size = 24;
+      };
+    };
+    "wlr/taskbar" = {
+      format = "{icon} {name}";
+      icon-size = 18;
       icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
       tooltip-format = "{title}";
       on-click = "activate";
     };
   };
 
-  style = ''
+  # TODO: figure out magic waybar css styling (does it pick up `~/.config/gtk-3.0/gtk.css` ?)
-    @define-color base00 #${colors.base00};
+  style =
-    @define-color base01 #${colors.base01};
+    # css
-    @define-color base02 #${colors.base02};
+    ''
-    @define-color base03 #${colors.base03};
+      @define-color base00 #${colors.base00}; @define-color base08 #${colors.base08};
-    @define-color base04 #${colors.base04};
+      @define-color base01 #${colors.base01}; @define-color base09 #${colors.base09};
-    @define-color base05 #${colors.base05};
+      @define-color base02 #${colors.base02}; @define-color base0A #${colors.base0A};
-    @define-color base06 #${colors.base06};
+      @define-color base03 #${colors.base03}; @define-color base0B #${colors.base0B};
-    @define-color base07 #${colors.base07};
+      @define-color base04 #${colors.base04}; @define-color base0C #${colors.base0C};
-    @define-color base08 #${colors.base08};
+      @define-color base05 #${colors.base05}; @define-color base0D #${colors.base0D};
-    @define-color base09 #${colors.base09};
+      @define-color base06 #${colors.base06}; @define-color base0E #${colors.base0E};
-    @define-color base0A #${colors.base0A};
+      @define-color base07 #${colors.base07}; @define-color base0F #${colors.base0F};
-    @define-color base0B #${colors.base0B};
-    @define-color base0C #${colors.base0C};
-    @define-color base0D #${colors.base0D};
-    @define-color base0E #${colors.base0E};
-    @define-color base0F #${colors.base0F};
 
-    * {
+      * {
-      font-family: ${config.stylix.fonts.sansSerif.name}, FontAwesome;
+        /* all: unset; */
-      font-weight: 500;
+        font-family: Symbols Nerd Font, FontAwesome, ${config.stylix.fonts.sansSerif.name};
-      font-size: 18px;
+        font-weight: 500;
-    }
+        font-size: 16px;
+      }
 
-    window#waybar {
+      .modules-left, .modules-center, .modules-right, window#waybar {
-      background: @base00;
+        background-color: @base00;
-      border-radius: 9px;
+        color: @base05;
-    }
+        border-radius: 12px;
+      }
 
-    .modules-left,
+      window#waybar {
-    .modules-center,
+        border-radius: 0;
-    .modules-right {
+      }
-      background-color: @base00;
-      border-radius: 9px;
-      color: @base05;
-    }
 
-    tooltip {
+      /* for leftmost modules */
-      background: @base01;
+      .modules-left, .modules-center, .modules-right {
-      border: 1px solid @base0D;
+        padding-left: 3px;
-      border-radius: 12px;
+        background-color: @base00;
-    }
+        color: @base05;
+      }
+      window#bottom.modules-center {
+        background-color: transparent
+      }
+      tooltip {
+        background: @base01;
+        border: 1px solid @base0D;
+        border-radius: 16px;
+        padding: 2em;
+      }
 
-    tooltip label {
+      tooltip label {
-      color: @base05;
+        color: @base05;
-    }
+      }
 
-    button {
+      button {
-      box-shadow: inset 0 -3px transparent;
+        box-shadow: inset 0 -3px transparent;
-      border-radius: 3px;
+        border-radius: 6px;
-    }
+      }
 
-    button:hover {
+      button:hover {
-      background: inherit;
+        background: inherit;
-      box-shadow: inset 0 -3px transparent;
+        box-shadow: inset 0 -3px transparent;
-    }
+      }
 
-    #backlight,
+      #backlight,
-    #battery,
+      #battery,
-    #clock,
+      #clock,
-    #custom-launcher,
+      #cpu,
-    #custom-notification,
+      #custom-launcher,
-    #idle_inhibitor,
+      #custom-notification,
-    #language,
+      #idle_inhibitor,
-    #power-profiles-daemon,
+      #language,
-    #privacy,
+      #memory,
-    #privacy-item,
+      #network,
-    #taskbar,
+      #power-profiles-daemon,
-    #tray,
+      #privacy,
-    #wireplumber,
+      #privacy-item,
-    #workspaces button,
+      #taskbar button,
-    #workspaces {
+      #taskbar,
-      border-radius: 6px;
+      #tray button,
-      background-color: @base01;
+      #tray,
-      margin: 3px 3px 3px 0;
+      #wireplumber,
-      padding: 0 6px;
+      #workspaces button,
-    }
+      #workspaces {
+        all: unset;
+        border-radius: 9px;
+        background-color: @base01;
+        margin: 3px 3px 3px 0;
+        padding: 0 0.42em;
+        min-width: 1em;
+      }
 
-    /* #clock, */
+      #backlight,
-    #custom-launcher,
+      #battery,
-    #language,
+      #custom-launcher,
-    #wireplumber {
+      #custom-notification,
-      margin: 3px;
+      #idle_inhibitor,
-    }
+      #power-profiles-daemon,
+      #wireplumber {
+        padding: 0 0.5em;
+      }
+      #custom-notification,
+      #power-profiles-daemon {
+        min-width: 1em;
+      }
 
-    #backlight,
+      #privacy,
-    #battery,
+      #taskbar,
-    #custom-notification,
+      #workspaces {
-    #idle_inhibitor,
+        padding: 0;
-    #wireplumber {
+      }
-      padding: 0 15px 0 10px;
-    }
 
-    #custom-launcher,
+      #workspaces {
-    #power-profiles-daemon {
+        padding-left: 3px;
-      padding: 0 17px 0 8px;
+      }
-    }
 
-    #privacy,
+      #privacy-item {
-    #taskbar,
+        padding: 0 0.3em;
-    #workspaces {
+      }
-      padding: 0;
-    }
 
-    #privacy-item {
+      #taskbar button {
-      padding: 0 5px;
+        padding-left: 0;
-    }
+      }
+      #taskbar button,
+      #tray button,
+      #workspaces button {
+        border-radius: 6px;
+        min-width: 0.8em;
+      }
 
-    #taskbar button,
+      #battery.critical:not(.charging) {
-    #tray button {
+        background-color: @base09;
-      padding: 0 3px;
+        color: @base00;
-      margin: 3px;
+      }
-    }
 
-    #workspaces button {
+      #power-profiles-daemon.performance {
-      border-radius: 3px;
+        background-color: @base0D;
-      padding: 0 5px;
+        color: @base00;
-      margin: 3px;
+      }
-    }
 
-    #battery.critical:not(.charging) {
+      #power-profiles-daemon.power-saver {
-      background-color: @base09;
+        background-color: @base0A;
-      color: @base00;
+        color: @base00;
-      animation-name: blink;
+      }
-      animation-duration: 0.5s;
-      animation-timing-function: steps(12);
-      animation-iteration-count: infinite;
-      animation-direction: alternate;
-    }
 
-    #mode {
+      #privacy-item.audio-in {
-      background-color: rgba(0, 0, 0, 0.2);
+        background-color: @base0E;
-      box-shadow: inset 0 -3px @base05;
+        color: @base00;
-    }
+        margin: 3px;
+      }
 
-    #power-profiles-daemon.balanced {
+      #privacy-item.screenshare {
-      color: @base05;
+        background-color: @base0C;
-    }
+        color: @base00;
+        margin: 3px 0 3px 3px;
+      }
 
-    #power-profiles-daemon.performance {
+      #taskbar button,
-      background-color: @base0D;
+      #tray button {
-      color: @base00;
+        padding: 0 0.4em;
-    }
+        margin: 3px;
+      }
 
-    #power-profiles-daemon.power-saver {
+      #workspaces button.active,
-      background-color: @base0A;
+      #taskbar button.active {
-      color: @base00;
+        background-color: @base02;
-    }
+      }
 
-    #privacy-item.audio-in {
+      #workspaces button:hover,
-      background-color: @base0E;
+      #workspaces button.active:hover,
-      color: @base00;
+      #taskbar button.active:hover,
-      margin: 3px;
+      #taskbar button:hover {
-    }
+        background-color: @base0D;
+        color: @base00;
+      }
 
-    #privacy-item.screenshare {
+      #taskbar.empty {
-      background-color: @base0C;
+        background-color: transparent;
-      color: @base00;
+      }
-      margin: 3px 0 3px 3px;
-    }
 
-    #taskbar button:hover {
+      #tray > .needs-attention {
-      background-color: @base0D;
+        -gtk-icon-effect: highlight;
-    }
+        background-color: @base08;
+      }
 
-    #tray > .needs-attention {
+      #tray > .passive {
-      -gtk-icon-effect: highlight;
+        -gtk-icon-effect: dim;
-      background-color: @base08;
+      }
-    }
 
-    #tray > .passive {
+      /* #workspaces button.active {
-      -gtk-icon-effect: dim;
+        color: @base00;
-    }
+        background-color: @base0D;
+      } */
 
-    #workspaces button.active {
+      label:focus {
-      color: @base00;
+        background-color: #000000;
-      background-color: @base0D;
+      }
-    }
+    '';
-
-    label:focus {
-      background-color: #000000;
-    }
-  '';
 }

modules/home/desktop/niri/services/default.nix

@@ -1,27 +1,26 @@
 {
-  getExe,
+  lib,
-  lockscreen,
   osConfig,
-  perSystem,
   pkgs,
+  lockscreen,
   ...
-}: {
+}:
+lib.attrsets.recursiveUpdate {
   blueman-applet.enable = osConfig.services.blueman.enable;
-  swaync = import ./swaync;
+  copyq.enable = true;
+  gammastep.enable = true;
+  gnome-keyring.enable = true;
+  hypridle.enable = true;
   kanshi = import ./kanshi;
   network-manager-applet.enable = true;
   playerctld.enable = true;
+  swaync = import ./swaync;
+  swayosd.enable = true;
+  udiskie.enable = true;
   wpaperd.enable = true;
-  copyq = {
+}
-    enable = true;
+{
-    package = perSystem.nixpkgs-stable.copyq;
-  };
-  gnome-keyring = {
-    enable = true;
-    components = ["secrets"];
-  };
   gammastep = {
-    enable = true;
     provider = "manual";
     latitude = 49.6;
     longitude = 36.1;
@@ -31,34 +30,28 @@
       night = 3000;
     };
   };
-  swayosd = {
+  gnome-keyring.components = ["secrets"];
-    enable = true;
+  hypridle.settings = {
-    topMargin = 0.8;
+    general = {
+      before_sleep_cmd = "loginctl lock-session";
+      lock_cmd = "pidof ${lockscreen} || ${lockscreen}";
+      # unlock_cmd = "loginctl unlock-session";
+    };
+    listener = [
+      {
+        timeout = 600;
+        on-timeout = "pidof ${lockscreen} || ${lockscreen}";
+      }
+      {
+        timeout = 601;
+        on-timeout = lib.getExe pkgs.niri + " msg action power-off-monitors";
+      }
+    ];
   };
+  swayosd.topMargin = 0.8;
   udiskie = {
-    enable = true;
     automount = false;
     notify = true;
     tray = "auto";
   };
-  hypridle = {
-    enable = true;
-    settings = {
-      general = {
-        before_sleep_cmd = "loginctl lock-session";
-        lock_cmd = "pidof ${lockscreen} || ${lockscreen}";
-        # unlock_cmd = "loginctl unlock-session";
-      };
-      listener = [
-        {
-          timeout = 600;
-          on-timeout = "pidof ${lockscreen} || ${lockscreen}";
-        }
-        {
-          timeout = 601;
-          on-timeout = getExe pkgs.niri + " msg action power-off-monitors";
-        }
-      ];
-    };
-  };
 }

modules/home/desktop/niri/services/swaync/default.nix

@@ -17,17 +17,17 @@
     control-center-layer = "overlay";
 
     # Notification settings
-    positionX = "right";
+    positionX = "left";
     positionY = "top";
     notification-2fa-action = true;
     notification-inline-replies = false;
-    notification-icon-size = 24;
+    notification-icon-size = 48;
     notification-body-image-height = 100;
     notification-body-image-width = 200;
     notification-window-width = 400;
 
     # Control center settings
-    control-center-positionX = "right";
+    control-center-positionX = "left";
     control-center-positionY = "top";
     control-center-width = 500;
     control-center-exclusive-zone = true;
@@ -74,16 +74,17 @@
     .app-icon,
     .image {
       -gtk-icon-effect: none;
+      padding-right: 0.5rem;
     }
 
     .notification-action {
-      border-radius: 6px;
+      border-radius: 9px;
       margin: 3px;
     }
 
     .close-button {
       margin: 12px;
-      border-radius: 3px;
+      border-radius: 6px;
     }
 
     .notification-group.collapsed
@@ -105,15 +106,15 @@
     .notification.normal,
     .notification.critical,
     .control-center {
-      border-radius: 9px;
+      border-radius: 12px;
       margin: 6px;
     }
 
     .floating-notifications,
     .notification-content {
+      padding: 0.5rem;
       margin: 3px;
-      border-radius: 6px;
+      border-radius: 9px;
-      border: none;
     }
 
     .control-center-list {
@@ -129,7 +130,7 @@
     }
 
     .widget-title > button {
-      border-radius: 6px;
+      border-radius: 9px;
       padding: 0.5rem;
     }
 
@@ -142,23 +143,23 @@
     }
 
     .widget-dnd > switch {
-      border-radius: 6px;
+      border-radius: 9px;
     }
 
     .widget-dnd > switch slider {
       margin: 3px;
-      border-radius: 3px;
+      border-radius: 6px;
-      padding: 6px;
+      padding: 0px;
     }
 
     .widget-mpris .widget-mpris-player {
-      border-radius: 9px;
+      border-radius: 12px;
-      margin: 3px;
+      margin: 0.5rem;
       padding: 0.5rem;
     }
 
     .widget-mpris .widget-mpris-player .widget-mpris-album-art {
-      border-radius: 6px;
+      border-radius: 9px;
     }
 
     .widget-mpris .widget-mpris-player .widget-mpris-title {
@@ -170,7 +171,7 @@
     }
 
     .widget-mpris .widget-mpris-player > box > button {
-      border-radius: 3px;
+      border-radius: 6px;
       padding: 3px;
     }
   '';

modules/nixos/system/stylix/default.nix

@@ -125,13 +125,13 @@
       wallpaper = wallpapers.abstract.waves;
 
       serif = {
-        package = iosevkaPackage;
+        package = geistPackage;
-        name = "Iosevka Nerd Font";
+        name = "Geist";
       };
 
       monospace = {
-        package = iosevkaTermPackage;
+        package = geistMonoPackage;
-        name = "IosevkaTerm Nerd Font Mono";
+        name = "GeistMono NFM";
       };
 
       cursor = {
@@ -351,6 +351,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    fonts.packages = [pkgs.nerd-fonts.symbols-only];
     stylix =
       {
         enable = true;

modules/shared/user/flatpak.nix

@@ -69,7 +69,7 @@
         "com.obsproject.Studio"
         "com.usebottles.bottles" # wine containers
         "de.capypara.FieldMonitor" # libvirt
-        "de.haeckerfelix.Fragments" # torrents
+        "org.qbittorrent.qBittorrent" # torrents
         "io.github.amit9838.mousam" # weather
         "io.github.finefindus.Hieroglyphic" # find latex symbols (in rust)
         "io.github.lainsce.Khronos" # log time for tasks
@@ -129,6 +129,7 @@
       "org.gimp.GIMP" = {inherit (homeNoNetwork) Context;};
       "org.kde.kdenlive" = {inherit (homeNoNetwork) Context;};
       "org.signal.Signal".Environment.SIGNAL_PASSWORD_STORE = "gnome-libsecret";
+      "org.qbittorrent.qBittorrent".Context.filesystems = ["host"]; # evil
     };
   };
 }

modules/shared/user/programs.nix

@@ -1,10 +1,13 @@
 {
   config,
   lib,
+  osConfig,
   pkgs,
   ...
 }: let
   inherit (lib) mkIf;
+  inherit (osConfig.virtualisation) libvirtd;
+  inherit (osConfig.hardware) bluetooth;
 in {
   console.yazi.enable = true;
   editor.helix.enable = true;
@@ -20,46 +23,46 @@ in {
   };
 
   services = {
-    pueue.enable = true; # process queue in rust
+    # pueue.enable = true; # process queue in rust
     ssh-agent.enable = true;
   };
 
-  programs = {
+  programs =
-    bat.enable = true; # cat in rust
+    lib.attrsets.recursiveUpdate
-    btop = {
+    {
-      enable = true;
+      bat.enable = true; # cat in rust
-      settings.update_ms = 200;
+      btop.enable = true;
-    };
+      # direnv.enable = true;
-    # direnv.enable = true;
+      eza.enable = true; # ls in rust
-    # direnv.silent = true;
+      fd.enable = true; # find in rust
-    eza.enable = true; # ls in rust
+      fzf.enable = true; # fuzzy finder in rust
-    fd.enable = true; # find in rust
+      git.enable = true;
-    fzf.enable = true; # fuzzy finder in rust
+      gitui.enable = true; # git ui in rust
-    git = {
+      jujutsu.enable = true; # vcs in rust
-      enable = true;
+      keychain.enable = true;
-      delta.enable = true; # diff in rust
+      nix-index-database.comma.enable = true;
-      signing.format = "ssh";
+      nix-index.enable = true;
-      aliases = {
+      nix-your-shell.enable = true;
-        cl = "clone";
+      pay-respects.enable = true; # thefuck in rust
-        co = "checkout";
+      ripgrep.enable = true; # grep in rust
-        pom = "push origin main";
+      zellij.enable = true;
+      zk.enable = true;
+      zoxide.enable = true; # fuzzy cd in rust
+    }
+    {
+      btop.settings.update_ms = 200;
+      # direnv.silent = true;
+      git = {
+        delta.enable = true; # diff in rust
+        signing.format = "ssh";
+        aliases = {
+          cl = "clone";
+          co = "checkout";
+          pom = "push origin main";
+        };
       };
+      keychain.keys = ["id_ed25519"];
     };
-    gitui.enable = true; # git ui in rust
-    jujutsu.enable = true; # vcs in rust
-    keychain = {
-      enable = true;
-      keys = ["id_ed25519"];
-    };
-    nix-index-database.comma.enable = true;
-    nix-index.enable = true;
-    nix-your-shell.enable = true;
-    pay-respects.enable = true; # thefuck in rust
-    ripgrep.enable = true; # grep in rust
-    zk.enable = true;
-    zoxide.enable = true; # fuzzy cd in rust
-    zellij.enable = true;
-  };
 
   home.packages = with pkgs;
     [
@@ -76,20 +79,21 @@ in {
       dua # disk space usage in rust
       duf # better df in go
       fend # calculator in rust
-      mprocs # process runner in rust
+      # mprocs # process runner in rust
       ouch # archive manager in rust
       # procs # ps in rust
       rbw # bitwarden cli in rust
       sd # sed in rust
       systemctl-tui # systemctl tui in rust
       trashy # trash cli in rust
+      up # ultimate plumber in go
     ]
     ++ [
       # misc apps
       adwaita-icon-theme
       # vial # qmk keyboard configuring app
       pinentry-qt # pinentry for rbw
-      virt-manager # libvirt gui
+      (mkIf libvirtd.enable virt-manager) # libvirt gui
       # waycheck # check wayland protocols
       gpu-screen-recorder-gtk
     ]
@@ -99,28 +103,22 @@ in {
       # gnome-text-editor
       helvum # pipewire patchbay in rust
       junction # app chooser
-      # loupe # image viewer and editor in rust
       mission-center # task manager in rust (partly)
-      # nautilus # file manager
+      (mkIf bluetooth.enable overskride) # bluetooth gui in rust
-      overskride # bluetooth gui in rust
-      papers # pdf reader in rust
       pika-backup # borg gui in rust
       pwvucontrol # pipewire gui in rust
       sonusmix # pipewire routing tool in rust
-      # wdisplays # wlroots display configurator
     ];
 
-  xdg.desktopEntries = {
+  # xdg.desktopEntries.uni = {
-    uni = {
+  #   actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\"";
-      actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\"";
+  #   categories = ["Utility" "X-Launch" "Network"];
-      categories = ["Utility" "X-Launch" "Network"];
+  #   comment = "Select and open or copy URLs from a list.";
-      comment = "Select and open or copy URLs from a list.";
+  #   exec = "fish -c \"~/.local/bin/uni\"";
-      exec = "fish -c \"~/.local/bin/uni\"";
+  #   icon = "web-browser";
-      icon = "web-browser";
+  #   name = "Uni URL Handler";
-      name = "Uni URL Handler";
+  #   startupNotify = true;
-      startupNotify = true;
+  #   terminal = false;
-      terminal = false;
+  #   type = "Application";
-      type = "Application";
+  # };
-    };
-  };
 }