nixos-dots

commit 03594af88b885bf77a835507e502a31bb8e17b34
parent 2fb002e6a018a19333931c1126dc9d0c72d324bf
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Wed, 25 Mar 2026 21:08:29 +0000

minor fixes and updates

Diffstat:
M
flake.lock
 | 
124
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
M
flake.nix
 | 
3
+--
M
machines/frame/configuration.nix
 | 
2
+-
M
modules/niri.nix
 | 
60
++++++++++++++++++++++++++++++++----------------------------
M
users/mika.nix
 | 
2
+-

5 files changed, 158 insertions(+), 33 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -97,6 +97,62 @@
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1774283383,
+        "narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773130184,
+        "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -164,8 +220,40 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1774244481,
+        "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4590696c8693fea477850fe379a01544293ca4e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
+        "lastModified": 1774106199,
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
         "lastModified": 1772773019,
         "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
         "owner": "NixOS",
@@ -199,10 +287,11 @@
         "betterfox": "betterfox",
         "disko": "disko",
         "home-manager": "home-manager",
+        "niri": "niri",
         "nix-darwin": "nix-darwin",
         "nixos-facter-modules": "nixos-facter-modules",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs_stable": "nixpkgs_stable",
         "sops-nix": "sops-nix"
       }
@@ -241,6 +330,39 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773622265,
+        "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "a879e5e0896a326adc79c474bf457b8b99011027",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,7 @@
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
-    niri.url = "github:sobidoo/niri-flake";
+    niri.url = "github:sodiboo/niri-flake";
 
     betterfox.url = "github:HeitorAugustoLN/betterfox-nix";
 
@@ -174,7 +174,6 @@
                 ./machines/server/hardware.nix
                 {
                   home-manager = {
-                    backupFileExtension = true;
                     useGlobalPkgs = true;
                     useUserPackages = true;
                     extraSpecialArgs = {
diff --git a/machines/frame/configuration.nix b/machines/frame/configuration.nix
@@ -17,7 +17,7 @@
   sops.defaultSopsFormat = "yaml";
   sops.age.keyFile = "/home/mika/.config/sops/age/keys.txt";
 
-  system.stateVersion = "25.11";
+  system.stateVersion = "26.05";
 
   # vm
   virtualisation.vmVariant = {
diff --git a/modules/niri.nix b/modules/niri.nix
@@ -1,37 +1,41 @@
-{ inputs, ... }:
+{ inputs, pkgs, ... }:
 {
-  inports = [ inputs.niri.homeModules.niri ];
-  programs.niri.settings = {
+  imports = [ inputs.niri.homeModules.niri ];
+
+  programs.niri = {
     enable = true;
-    prefer-no-csd = false;
-    layout = {
-      focus-ring = {
-        width = 2;
-      };
-    };
-    input = {
-      focus-follows-mouse.enable = true;
-      keyboard = {
-        xkb = {
-          layout = "us,de";
-          model = "pc104";
-          options = "grp:shifts_toggle";
+    package = pkgs.niri;
+    settings = {
+      prefer-no-csd = false;
+      layout = {
+        focus-ring = {
+          width = 2;
         };
-        repeat-rate = 50;
-        repeat-delay = 200;
       };
-      touchpad = {
-        natural-scroll = false;
-        tap = true;
+      input = {
+        focus-follows-mouse.enable = true;
+        keyboard = {
+          xkb = {
+            layout = "us,de";
+            model = "pc104";
+            options = "grp:shifts_toggle";
+          };
+          repeat-rate = 50;
+          repeat-delay = 200;
+        };
+        touchpad = {
+          natural-scroll = false;
+          tap = true;
+        };
+        mouse = {
+          accel-profile = "flat";
+        };
       };
-      mouse = {
-        accel-profile = "flat";
+      binds = {
+        "Mod+Return".action.spawn = "alacritty";
+        "XF86AudioRaiseVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+";
+        "XF86AudioLowerVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-";
       };
     };
-    binds = {
-      "Mod+Return".action.spawn = "alacritty";
-      "XF86AudioRaiseVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+";
-      "XF86AudioLowerVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-";
-    };
   };
 }
diff --git a/users/mika.nix b/users/mika.nix
@@ -27,7 +27,7 @@ in
 
   home = {
     username = "mika";
-    stateVersion = if isDarwin then "25.05" else "25.11";
+    stateVersion = if isDarwin then "25.05" else "26.05";
     packages = lib.flatten (
       with packageSets;
       [