From 421d94be514a01b1efa5048e05a8b7180d5cdc17 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 17 Sep 2024 12:21:19 -0400 Subject: [PATCH] move niri to home --- nix/etcnixos/common.nix | 2 +- nix/etcnixos/flake.lock | 6 +++--- nix/etcnixos/system-mreow.nix | 1 - nix/home-manager/flake.lock | 18 +++++++++--------- nix/home-manager/flake.nix | 5 ++++- nix/home-manager/system-mreow.nix | 1 + 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/nix/etcnixos/common.nix b/nix/etcnixos/common.nix index 9994592..dff03cf 100644 --- a/nix/etcnixos/common.nix +++ b/nix/etcnixos/common.nix @@ -50,7 +50,7 @@ initrd = { compressor = "zstd"; - compressorArgs = [ "-1" ]; + compressorArgs = [ "-19" ]; }; }; diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index a567667..8b3b8d9 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726582987, - "narHash": "sha256-mvlNdlD3myhLleFls5OVqaPcCVEgji0r5CmA4gX+/b4=", + "lastModified": 1726589318, + "narHash": "sha256-qk/Ot2p4LwzNy8Fv1Wnz0dOf0IszEh9NCCtEHo79sAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201ced8aa80b857841f7a1212594e1e62c4d67e", + "rev": "839e56fb7b9facb0286f3a23c26f34c95e623731", "type": "github" }, "original": { diff --git a/nix/etcnixos/system-mreow.nix b/nix/etcnixos/system-mreow.nix index fc52462..6997b09 100644 --- a/nix/etcnixos/system-mreow.nix +++ b/nix/etcnixos/system-mreow.nix @@ -101,7 +101,6 @@ environment.systemPackages = with pkgs; [ distrobox - niri ]; #weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 1f37947..5be1af8 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -153,11 +153,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1726548583, - "narHash": "sha256-jJ0dMdLIyh+4Vrn2S4yvFbhfCAOMDe2kKlQwFoQytEs=", + "lastModified": 1726586848, + "narHash": "sha256-sW5pB0YTcvex8sjVMOffDZsOMp7rwco4MGuVrQk1HL0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "787b96e1294932241a9c05ecdea0ae784b33cea6", + "rev": "c62ad7457b38f4f14aa5e57e9299441976fcc662", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726582987, - "narHash": "sha256-mvlNdlD3myhLleFls5OVqaPcCVEgji0r5CmA4gX+/b4=", + "lastModified": 1726589318, + "narHash": "sha256-qk/Ot2p4LwzNy8Fv1Wnz0dOf0IszEh9NCCtEHo79sAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201ced8aa80b857841f7a1212594e1e62c4d67e", + "rev": "839e56fb7b9facb0286f3a23c26f34c95e623731", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 479e969..a4c3541 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -88,7 +88,10 @@ ( { pkgs, ... }: { - nixpkgs.overlays = [ rust-overlay.overlays.default ]; + nixpkgs.overlays = [ + rust-overlay.overlays.default + niri.overlays.niri + ]; # home-manager stuff home = { diff --git a/nix/home-manager/system-mreow.nix b/nix/home-manager/system-mreow.nix index b68dab0..5430788 100644 --- a/nix/home-manager/system-mreow.nix +++ b/nix/home-manager/system-mreow.nix @@ -28,6 +28,7 @@ #window manager programs.niri = { + package = pkgs.niri-unstable; settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; };