diff options
| author | Miran Bastaja <mbastaja@sorre.xyz> | 2025-10-04 17:43:49 +0200 |
|---|---|---|
| committer | Miran Bastaja <mbastaja@sorre.xyz> | 2025-10-04 20:19:39 +0200 |
| commit | 44f11e501d3c99dad3d6a82652bde492aea33cd5 (patch) | |
| tree | 52d47c1f4f95ab3f03705c9728288ad6978d308a | |
| parent | aaca336eeccce7393946cf777a1952b2ca436d53 (diff) | |
fix niri
| -rw-r--r-- | flake.lock | 28 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | hosts/underworld/default.nix | 8 |
3 files changed, 14 insertions, 27 deletions
@@ -179,7 +179,9 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -235,13 +237,13 @@ "locked": { "lastModified": 1759381078, "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -310,26 +312,10 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1759578289, @@ -390,7 +376,7 @@ "futils": "futils", "home-manager": "home-manager", "niri-flake": "niri-flake", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nur": "nur", "sops-nix": "sops-nix", "sorre-website": "sorre-website", @@ -27,7 +27,10 @@ nur.url = "github:nix-community/nur"; # no overrides because I the binary cache to work - niri-flake.url = "github:sodiboo/niri-flake"; + niri-flake = { + url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # development stuff treefmt-nix = { diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix index abc9a82..a3e5477 100644 --- a/hosts/underworld/default.nix +++ b/hosts/underworld/default.nix @@ -53,11 +53,9 @@ services.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; - # Niri, scrollable-tiling window manager - programs.niri = { - enable = true; - package = pkgs.niri-stable; - }; + # raised from default 1024 because niri test was failing + # systemd.extraConfig = "DefaultLimitNOFILE=4096"; + programs.niri.enable = true; # Configure keymap in X11 services.xserver.xkb = { |