vpn, plasma doesn't work, small refactor.

flake.lock

@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773898372,
+        "lastModified": 1774379316,
-        "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=",
+        "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ecf019baf47df009937b5f8c4604cee10f410a76",
+        "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1774228760,
+        "lastModified": 1774400689,
-        "narHash": "sha256-nDoBIe5Y9Rfc1sJT0odFgN502ZNtOrcWoqnDyM8jBAU=",
+        "narHash": "sha256-hHABVYL0rxhVIzc7hZEpvE0eiCKPnevte73Tn6FRolo=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "ded9a992dc4142b8269cebbcdadd56fe3886c899",
+        "rev": "54645978682ff99594a1d1666dde6fac6a8134f2",
         "type": "github"
       },
       "original": {
@@ -178,11 +178,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1774386573,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1773927734,
+        "lastModified": 1774375131,
-        "narHash": "sha256-hjf4JtCVGXO3/1SznMKKC+qFsIxQcVhZvPpoNuBYdFY=",
+        "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "618cbe6aac5e72f1f9dc0d0dde145ee2d452df71",
+        "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d",
         "type": "github"
       },
       "original": {

modules/home.nix

@@ -9,6 +9,7 @@
       useGlobalPkgs = true;
       useUserPackages = true;
       extraSpecialArgs = { inherit inputs self; };
+      backupCommand = "rm";
 
       users.matthew = {
         home.stateVersion = "25.11";

modules/hosts/laptop/configuration.nix

@@ -15,7 +15,9 @@
       self.nixosModules.gaming
       self.nixosModules.home-manager
       self.nixosModules.kitty
-      self.nixosModules.niri
+      self.nixosModules.vpn
+      # self.nixosModules.niri
+      self.nixosModules.plasma
       self.nixosModules.zen-browser
     ];
 

modules/programs/gamedev.nix

@@ -12,8 +12,9 @@
       (pkgs.bottles.override {removeWarningPopup = true; })
       dotnet-sdk
       godot-mono
+      handbrake
       obs-studio
-      winetricks
+      video-trimmer
     ];
   };
 }

modules/programs/kitty.nix

@@ -5,7 +5,7 @@
       programs.kitty = {
         enable = true;
         font = {
-          name = "JetBrainsMonoNerdFont";
+          name = "JetBrainsMonoNerdFontMono";
           size = 13;
         };
         settings = {

modules/programs/vpn.nix

@@ -0,0 +1,10 @@
+{
+  flake.nixosModules.vpn = { pkgs, ... }:
+  {
+    services.tailscale = {
+      enable = true;
+      useRoutingFeatures = "client";
+      extraSetFlags = [ "--operator=matthew" ];
+    };
+  };
+}

modules/programs/waybar.nix

@@ -84,20 +84,20 @@
                 "on-click" = "kitty --hold sh -c 'bluetui'";
             };
             "network" = {
-                "format-wifi" = "  {essid}";
+                "format-wifi" = " {essid}";
                 "format-disconnected" = "󰖪";
                 "on-click" = "kitty --hold sh -c 'nmtui'";
             };
             "wireplumber" = {
-                "format" = "{icon}  {volume}%";
+                "format" = "{icon} {volume}%";
-                "format-muted" = " ";
+                "format-muted" = "󰖁";
                 "format-icons" = {
                     "default" = ["" "" ""];
                 };
                 "on-click" = "kitty --hold sh -c 'wiremix'";
             };
             "custom/power" = {
-                "format"  = "⏻ ";
+                "format"  = "⏻";
                 "on-click" = "systemctl suspend";
                 # "shutdown" = "shutdown";
                 # "reboot" = "reboot";
@@ -112,7 +112,7 @@
 
             * {
                 /* `otf-font-awesome` is required to be installed for icons */
-                font-family: FontAwesome, JetBrainsMonoNerdFont;
+                font-family: FontAwesome, JetBrainsMonoNerdFontPropo;
                 font-size: 13pt;
             }
 

modules/sessions/niri/niri.nix

@@ -9,7 +9,8 @@
     ];
 
     programs.niri.enable = true;
-    services.displayManager.gdm.enable = true;
+    # services.displayManager.gdm.enable = true;
+    services.displayManager.ly.enable = true;
 
     services.udisks2.enable = true; # Removable media.
     services.gvfs.enable = true; # Nautilus mount and trash support.

modules/sessions/plasma.nix

@@ -0,0 +1,59 @@
+{
+  flake.nixosModules.plasma = { pkgs, ... }: {
+    services.desktopManager.plasma6.enable = true;
+    services.displayManager.plasma-login-manager.enable = true;
+    services.power-profiles-daemon.enable = false;
+
+    nixpkgs.overlays = [
+      (final: prev: {
+        kdePackages = prev.kdePackages.overrideScope (
+          kdeFinal: kdePrev: {
+            # https://old.reddit.com/r/NixOS/comments/1pdtc3v/kde_plasma_is_slow_compared_to_any_other_distro/
+            # https://github.com/NixOS/nixpkgs/issues/126590#issuecomment-3194531220
+            plasma-workspace =
+              let
+                # the package we want to override
+                basePkg = kdePrev.plasma-workspace;
+                # a helper package that merges all the XDG_DATA_DIRS into a single directory
+                xdgdataPkg = final.stdenv.mkDerivation {
+                  name = "${basePkg.name}-xdgdata";
+                  buildInputs = [ basePkg ];
+                  dontUnpack = true;
+                  dontFixup = true;
+                  dontWrapQtApps = true;
+                  installPhase = ''
+                    mkdir -p $out/share
+                    ( IFS=:
+                      for DIR in $XDG_DATA_DIRS; do
+                        if [[ -d "$DIR" ]]; then
+                          ${prev.lib.getExe prev.lndir} -silent "$DIR" $out
+                        fi
+                      done
+                    )
+                  '';
+                };
+                # undo the XDG_DATA_DIRS injection that is usually done in the qt wrapper
+                # script and instead inject the path of the above helper package
+                derivedPkg = basePkg.overrideAttrs {
+                  preFixup = ''
+                    for index in "''${!qtWrapperArgs[@]}"; do
+                      if [[ ''${qtWrapperArgs[$((index+0))]} == "--prefix" ]] && [[ ''${qtWrapperArgs[$((index+1))]} == "XDG_DATA_DIRS" ]]; then
+                        unset -v "qtWrapperArgs[$((index+0))]"
+                        unset -v "qtWrapperArgs[$((index+1))]"
+                        unset -v "qtWrapperArgs[$((index+2))]"
+                        unset -v "qtWrapperArgs[$((index+3))]"
+                      fi
+                    done
+                    qtWrapperArgs=("''${qtWrapperArgs[@]}")
+                    qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "${xdgdataPkg}/share")
+                    qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
+                  '';
+                };
+              in
+              derivedPkg;
+          }
+        );
+      })
+    ];
+  };
+}