From 9103cabb4bd17cfdc463e9fdecf0b0c96b235ff3 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 2 Feb 2024 07:18:17 +0800 Subject: [PATCH] nixos: nix-monitored -> nh --- flake.lock | 40 ------------------- flake.nix | 16 ++++---- home/applications/nix/default.nix | 2 + .../core/nix/{monitor.nix => _monitor.nix} | 0 nixos/profiles/common/core/nix/default.nix | 2 +- 5 files changed, 11 insertions(+), 49 deletions(-) rename nixos/profiles/common/core/nix/{monitor.nix => _monitor.nix} (100%) diff --git a/flake.lock b/flake.lock index 185ee8f..8d26893 100755 --- a/flake.lock +++ b/flake.lock @@ -349,21 +349,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": [ @@ -387,29 +372,6 @@ "type": "github" } }, - "nix-monitored": { - "inputs": { - "nix-filter": [ - "nix-filter" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692605628, - "narHash": "sha256-jBasvDCk9V32JuwtPy1G4KyVAc2eaBSf2X5eRNQgIkY=", - "owner": "ners", - "repo": "nix-monitored", - "rev": "6be92b0c1eca7ef501b4f92735885e7cb4db414b", - "type": "github" - }, - "original": { - "owner": "ners", - "repo": "nix-monitored", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1706182238, @@ -585,9 +547,7 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix-darwin": "nix-darwin", - "nix-filter": "nix-filter", "nix-gaming": "nix-gaming", - "nix-monitored": "nix-monitored", "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", "nixpak-pkgs": "nixpak-pkgs", diff --git a/flake.nix b/flake.nix index ef97ce6..9dbe0d5 100755 --- a/flake.nix +++ b/flake.nix @@ -59,11 +59,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; - nix-monitored = { - url = "github:ners/nix-monitored"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix-filter.follows = "nix-filter"; - }; + #nix-monitored = { + # url = "github:ners/nix-monitored"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nix-filter.follows = "nix-filter"; + #}; nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; @@ -122,9 +122,9 @@ url = "github:hyprwm/hyprlang"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-filter = { - url = "github:numtide/nix-filter"; - }; + #nix-filter = { + # url = "github:numtide/nix-filter"; + #}; nvfetcher = { url = "github:berberman/nvfetcher"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/applications/nix/default.nix b/home/applications/nix/default.nix index 236fe97..a34f6dd 100644 --- a/home/applications/nix/default.nix +++ b/home/applications/nix/default.nix @@ -6,6 +6,8 @@ statix deadnix + # Nix helper + nh # Secret management sops # Additional information while building diff --git a/nixos/profiles/common/core/nix/monitor.nix b/nixos/profiles/common/core/nix/_monitor.nix similarity index 100% rename from nixos/profiles/common/core/nix/monitor.nix rename to nixos/profiles/common/core/nix/_monitor.nix diff --git a/nixos/profiles/common/core/nix/default.nix b/nixos/profiles/common/core/nix/default.nix index 8f303c2..187dcd1 100644 --- a/nixos/profiles/common/core/nix/default.nix +++ b/nixos/profiles/common/core/nix/default.nix @@ -3,6 +3,6 @@ ./flake.nix ./nix.nix ./gc.nix - ./monitor.nix + #./monitor.nix ]; }