From c5ed2be951635aa666dc03d8b8ad841d79cbbc07 Mon Sep 17 00:00:00 2001 From: twoneis Date: Tue, 27 Feb 2024 22:10:29 +0100 Subject: [PATCH] fixed warnings with niri --- flake.lock | 16 +++++++--------- flake.nix | 6 ------ outputs.nix | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 6a8ab67..3f16d60 100644 --- a/flake.lock +++ b/flake.lock @@ -253,9 +253,7 @@ "inputs": { "crate2nix": "crate2nix", "flake-parts": "flake-parts_2", - "niri-src": [ - "niri-src" - ], + "niri-src": "niri-src", "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": [ @@ -279,15 +277,16 @@ "niri-src": { "flake": false, "locked": { - "lastModified": 1708924475, - "narHash": "sha256-8HWBhv6kACTlJHZATdofz+cksMT3iu9iBYux5ZWTz0Y=", - "owner": "yalter", + "lastModified": 1708141626, + "narHash": "sha256-vO6ak5rT6ntBC20vYC36zcEcHv7Cki9y8A+c7ThfsUg=", + "owner": "YaLTeR", "repo": "niri", - "rev": "494e98c1235133fd5267bfdfb9a5468f1115deff", + "rev": "62892d636112230dc16778b91331fbe97576b005", "type": "github" }, "original": { - "owner": "yalter", + "owner": "YaLTeR", + "ref": "v0.1.2", "repo": "niri", "type": "github" } @@ -473,7 +472,6 @@ "inputs": { "home-manager": "home-manager", "niri": "niri", - "niri-src": "niri-src", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nur": "nur" diff --git a/flake.nix b/flake.nix index b9a72b5..cbc14ef 100644 --- a/flake.nix +++ b/flake.nix @@ -17,15 +17,9 @@ url = "github:nix-community/nur"; }; - niri-src = { - url = "github:yalter/niri"; - flake = false; - }; - niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.niri-src.follows = "niri-src"; }; }; diff --git a/outputs.nix b/outputs.nix index d1da7a3..dbc4949 100644 --- a/outputs.nix +++ b/outputs.nix @@ -2,7 +2,7 @@ nixosConfigurations = let clientModules = [ ./modules/system - niri.nixosModules.default + niri.nixosModules.niri home-manager.nixosModules.home-manager { nixpkgs.overlays = [ nur.overlay