From c9fc98643d9ae5f23722ae84f23538fce2c13097 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 18 Apr 2024 19:19:36 +0200 Subject: [PATCH] Nix helper --- common/default.nix | 6 ++++ flake.lock | 77 +++++++++++++++++++++++++++++++++------------- flake.nix | 2 ++ 3 files changed, 64 insertions(+), 21 deletions(-) diff --git a/common/default.nix b/common/default.nix index 0fb708b..13d7a69 100644 --- a/common/default.nix +++ b/common/default.nix @@ -14,6 +14,12 @@ # xdg-desktop-portal-hyprland # xdg-desktop-portal # ]; + programs.nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/xqtc/nixos-config"; + }; networking.firewall.allowedTCPPorts = [8384 22000]; networking.firewall.allowedUDPPorts = [22000 21027]; nix.settings = { diff --git a/flake.lock b/flake.lock index 3bb423e..2f4877a 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1713167493, - "narHash": "sha256-Atjqvb9WOUyLzEgAVEXzBzPgymf2wT2K4i0XBdatbN0=", + "lastModified": 1713454118, + "narHash": "sha256-DboRJFHCs1DO8KjUTenVGcl65vlmDDB2pZVE5NMUHtg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "26277125de089543b890b70334211c6e1405db30", + "rev": "dcc97056067a707b885707c9a15fb96859da4b8f", "type": "gitlab" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1713453913, + "narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c", "type": "github" }, "original": { @@ -280,6 +280,24 @@ "type": "github" } }, + "nh": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1713422373, + "narHash": "sha256-PuGzau2Wj0T8MC3V8a41rc/sXT0DrNz1Ow/ApR6a87s=", + "owner": "viperML", + "repo": "nh", + "rev": "c9cb03418dc782701ada556a49a9e8de0b415fbc", + "type": "github" + }, + "original": { + "owner": "viperML", + "repo": "nh", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -303,11 +321,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713441075, + "narHash": "sha256-3GGeFsEO8ivD+TcDEqe4s/d0VLvMYGNDGtx0ZnBxkUs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "6f976e53752e5b9ab08f9a3b1b0b9c67815c9754", "type": "github" }, "original": { @@ -335,11 +353,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1713176148, - "narHash": "sha256-4tvZfC2iv7McdRjHvuAoZqmYDsUruTnU1EM2/Rt2OHU=", + "lastModified": 1713459744, + "narHash": "sha256-xdfSUKjXDQSvTLKReRPckLp0DcxVAQKrx4r/BwdA06g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20a3a2181494145baed7ad006727f3e15bc12f15", + "rev": "1b7469ab47f305667f4da1af1e70b2577474d77c", "type": "github" }, "original": { @@ -367,11 +385,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { @@ -381,7 +415,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -410,11 +444,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713167695, - "narHash": "sha256-P+X1SeTYzkZI9VXsuTNkHjHmY77n1lXsjOb3Xs7eMsQ=", + "lastModified": 1713294906, + "narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=", "owner": "nix-community", "repo": "nixvim", - "rev": "99068dab4b6d6dc55fb50cfaf807b156115e8d89", + "rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607", "type": "github" }, "original": { @@ -457,8 +491,9 @@ "firefox-addons": "firefox-addons", "flake-utils": "flake-utils_2", "home-manager": "home-manager", + "nh": "nh", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", "spicetify-nix": "spicetify-nix" @@ -483,7 +518,7 @@ "spicetify-nix": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1704167711, diff --git a/flake.nix b/flake.nix index 6dbdf50..153da3c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; spicetify-nix.url = "github:the-argus/spicetify-nix"; + nh.url = "github:/viperML/nh"; }; #inputs.agenix.url = "github:ryantm/agenix"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; @@ -29,6 +30,7 @@ home-manager, nixos-hardware, nixvim, + nh, ... }: let lib = nixpkgs.lib;