Commit 83ec8a9cbaba

Vincent Demeester <vincent@sbr.pm>
2025-12-15 23:11:07
refactor(niri): Migrate from niri-flake to nixpkgs native package
- Simplify dependency chain with fewer external flakes - Leverage nixpkgs niri package now sufficiently up-to-date - Move configuration from home-manager to system-level module Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 017777f
Changed files (6)
home
common
desktop
niri
default.nix
default.nix
systems
common
desktop
niri.nix
default.nix
flake.lock
flake.nix
home/common/desktop/niri/default.nix
@@ -39,9 +39,4 @@
       ];
     };
   };
-  programs.niri = {
-    enable = true;
-    package = pkgs.niri-stable;
-    config = null; # FIXME I will need to migrate this
-  };
 }
home/default.nix
@@ -4,14 +4,12 @@
   lib,
   stateVersion,
   username,
-  inputs,
   globals,
   libx,
   ...
 }:
 {
   imports = [
-    inputs.niri.homeModules.niri
     ./common/shell
   ]
   ++ lib.optional (builtins.isString desktop) ./common/desktop
systems/common/desktop/niri.nix
@@ -32,6 +32,7 @@
     text = "auth include login";
   };
 
+  programs.niri.enable = true;
   # services.greetd.settings = {
   #   default_session = {
   #     # command = "${pkgs.greetd.greetd}/bin/agreety --cmd niri";
systems/default.nix
@@ -29,7 +29,6 @@
 
       # And from other flakes
       inputs.emacs-overlay.overlay
-      inputs.niri.overlays.niri
       inputs.chapeau-rouge.overlays.openshift
       inputs.chick-group.overlays.default
       inputs.go-org-readwise.overlays.default
flake.lock
@@ -535,66 +535,6 @@
         "type": "github"
       }
     },
-    "niri": {
-      "inputs": {
-        "niri-stable": "niri-stable",
-        "niri-unstable": "niri-unstable",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs-25_11"
-        ],
-        "xwayland-satellite-stable": "xwayland-satellite-stable",
-        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
-      },
-      "locked": {
-        "lastModified": 1765786620,
-        "narHash": "sha256-MPgXA3vfeUclJAt1r1LfH6TXmcqDEJm3HVDjr4Y1fIs=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "97440574d71b235b601013edf4749397b1ce99a6",
-        "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": 1765687800,
-        "narHash": "sha256-Erk+ypR8N+rCvjMdUB1N/v4jtm4QRH9k7r/9zh2HyC8=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "7c0898570ca5bd3f10fbf4cf2f8a00edc48d787b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -886,7 +826,6 @@
         "home-manager": "home-manager",
         "home-manager-25_11": "home-manager-25_11",
         "lanzaboote": "lanzaboote",
-        "niri": "niri",
         "nix-github-actions": "nix-github-actions_4",
         "nixos-hardware": "nixos-hardware",
         "nixos-raspberrypi": "nixos-raspberrypi",
@@ -967,39 +906,6 @@
         "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": 1765343581,
-        "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
     }
   },
   "root": "root",
flake.nix
@@ -324,14 +324,6 @@
       inputs.nixpkgs.follows = "nixpkgs-25_11";
     };
 
-    niri = {
-      type = "github";
-      owner = "sodiboo";
-      repo = "niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs-25_11";
-    };
-
     dagger = {
       type = "github";
       owner = "dagger";