From 4cb6de6563661d2111a10834132d4931283ee926 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 11 Nov 2024 17:24:14 +0100 Subject: [PATCH] update template flake --- flake.lock | 127 +++++++++++++++++++++++++++++++++++------------------ flake.nix | 8 ---- 2 files changed, 84 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 50c1e1e..fb0235d 100644 --- a/flake.lock +++ b/flake.lock @@ -28,9 +28,7 @@ "agenix-rekey": { "inputs": { "devshell": "devshell", - "flake-utils": [ - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -261,7 +259,7 @@ "nixos-extra-modules", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_7" }, "locked": { "lastModified": 1701787589, @@ -543,9 +541,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "systems" - ] + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -563,7 +559,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -581,7 +577,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -601,24 +597,6 @@ "inputs": { "systems": "systems_6" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_7" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -633,10 +611,28 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_8" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_9" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -652,6 +648,24 @@ } }, "flake-utils_7": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { "inputs": { "systems": [ "stylix", @@ -1000,7 +1014,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { @@ -1032,9 +1046,7 @@ }, "microvm": { "inputs": { - "flake-utils": [ - "flake-utils" - ], + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -1141,7 +1153,7 @@ "nix-topology": { "inputs": { "devshell": "devshell_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks_2" }, @@ -1177,7 +1189,7 @@ "nixos-extra-modules": { "inputs": { "devshell": "devshell_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "lib-net": "lib-net", "nixpkgs": [ "nixpkgs" @@ -1479,7 +1491,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1644,7 +1656,6 @@ "devshell": "devshell_2", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", @@ -1662,7 +1673,7 @@ "pre-commit-hooks": "pre-commit-hooks_4", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems_10", + "systems": "systems_12", "templates": "templates" } }, @@ -1735,11 +1746,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_4", - "systems": "systems_9", + "systems": "systems_11", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1789,6 +1800,36 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1911,11 +1952,11 @@ }, "templates": { "locked": { - "lastModified": 1714155401, - "narHash": "sha256-8TjVrDOGIsq7Oc7Slh+GR7PSzdGcbVr1ZDrN/2hB1Xg=", + "lastModified": 1731342153, + "narHash": "sha256-AzxI/lvVJcdoGouGxX7xr1y+u9tPrtSprI1UwdgV00g=", "ref": "refs/heads/main", - "rev": "50d70e8c4197adaea6d71edb7c6ee657e230d98c", - "revCount": 12, + "rev": "675917283e8cd12207a42cc2009ed591f98dc469", + "revCount": 15, "type": "git", "url": "https://forge.lel.lol/patrick/nix-templates.git" }, diff --git a/flake.nix b/flake.nix index 103cbba..d0c7293 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-octoprint.url = "github:patrickdag/nixpkgs/octoprint-update"; - nixpkgs-wayland = { url = "github:nix-community/nixpkgs-wayland"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,7 +17,6 @@ microvm = { url = "github:astro/microvm.nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; # to prevent multiple instances of systems @@ -52,12 +50,6 @@ agenix-rekey = { url = "github:oddlama/agenix-rekey"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - flake-utils = { - url = "github:numtide/flake-utils"; - inputs.systems.follows = "systems"; }; pre-commit-hooks = {