From 510f6c7ae7538fb7b3e2cdfa5501c8ec5c9f23ae Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 6 May 2025 14:58:30 +0200 Subject: [PATCH] update/clean flake inputs --- flake.lock | 462 ++++++----------------------------------------------- flake.nix | 76 +++------ 2 files changed, 70 insertions(+), 468 deletions(-) diff --git a/flake.lock b/flake.lock index 3c49832..d7d44dd 100644 --- a/flake.lock +++ b/flake.lock @@ -214,22 +214,6 @@ "type": "github" } }, - "blobs": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, "crane": { "locked": { "lastModified": 1741481578, @@ -276,21 +260,6 @@ } }, "crane_4": { - "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", - "owner": "ipetkov", - "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_5": { "locked": { "lastModified": 1741396358, "narHash": "sha256-js4c6tqxluo4Fysn8gloLnlZ6ZjQkuWMgGjHN8+WssE=", @@ -502,11 +471,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -516,38 +485,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -561,7 +498,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_6": { + "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -595,28 +532,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "lazy", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -732,24 +647,6 @@ } }, "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { "inputs": { "systems": [ "stylix", @@ -770,9 +667,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -850,7 +747,7 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "stylix", "nixpkgs" @@ -871,29 +768,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "lazy", - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "stylix", @@ -990,27 +864,6 @@ } }, "home-manager_3": { - "inputs": { - "nixpkgs": [ - "lazy", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744400600, - "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_4": { "inputs": { "nixpkgs": [ "stylix", @@ -1031,56 +884,9 @@ "type": "github" } }, - "lanzaboote": { - "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lanzaboote", - "type": "github" - } - }, - "lazy": { - "inputs": { - "flake-utils": "flake-utils_5", - "home-manager": "home-manager_3", - "lanzaboote": "lanzaboote", - "nix-index-database": "nix-index-database", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744542701, - "narHash": "sha256-h2MO0ppIqdZpW9b00HNZuBNkyMwDcm6VUqCnoMdzqJw=", - "owner": "bobvanderlinden", - "repo": "nixos-config", - "rev": "c8d58ceb0c6fad525598914caa133395ee040e3b", - "type": "github" - }, - "original": { - "owner": "bobvanderlinden", - "repo": "nixos-config", - "type": "github" - } - }, "lix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nix2container": "nix2container", "nixpkgs": [ "nixpkgs" @@ -1104,7 +910,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -1127,29 +933,6 @@ "url": "https://git.lix.systems/lix-project/nixos-module.git" } }, - "mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_4", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-24_11": "nixpkgs-24_11" - }, - "locked": { - "lastModified": 1746220417, - "narHash": "sha256-cN2Vf/d9KKy3V6eJIoxYHD7X0HQHfgP+lMnj3AdbsEc=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "95e2de368fe76ec0675b3d380168c5ca1c1b955d", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "napalm": { "inputs": { "flake-utils": [ @@ -1179,8 +962,8 @@ "niri": { "inputs": { "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_7", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1746124654, @@ -1233,24 +1016,6 @@ "type": "github" } }, - "nix-index-database": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1743911143, - "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, "nix2container": { "flake": false, "locked": { @@ -1269,9 +1034,9 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_8", - "systems": "systems_8", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_6", + "systems": "systems_7", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -1304,21 +1069,6 @@ "type": "github" } }, - "nixpkgs-24_11": { - "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1743296961, @@ -1350,22 +1100,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1745391562, @@ -1415,38 +1149,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1741241576, - "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1742707865, "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=", @@ -1462,7 +1164,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -1478,7 +1180,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1746437784, "narHash": "sha256-3OL4t/JQhiXMvon7mSpLwETohOjk8Y/fuyppXmurJqU=", @@ -1494,9 +1196,25 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "stylix", "nixpkgs" @@ -1517,26 +1235,6 @@ "type": "github" } }, - "oxalica": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746412651, - "narHash": "sha256-wwyhceL2urIUIhHtTS8QmRtxAigPBBnTWalxYf5h1uI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ce79bb52eb023f71a03e88cb36c66f35c6668a95", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -1584,34 +1282,6 @@ "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "lazy", - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "lazy", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -1622,41 +1292,16 @@ "flurry": "flurry", "hardware": "hardware", "home-manager": "home-manager_2", - "lazy": "lazy", "lix": "lix", "lix-module": "lix-module", - "mailserver": "mailserver", "niri": "niri", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_9", - "oxalica": "oxalica", + "nixpkgs": "nixpkgs_7", "stylix": "stylix", "tsunami": "tsunami_2" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "lazy", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "niri", @@ -1684,14 +1329,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_6", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_10", + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_8", "nur": "nur", - "systems": "systems_9", + "systems": "systems_8", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1727,21 +1372,6 @@ "type": "github" } }, - "systems_10": { - "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": 1689347949, @@ -1827,9 +1457,8 @@ "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "id": "systems", + "type": "indirect" } }, "systems_8": { @@ -1842,8 +1471,9 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, "systems_9": { @@ -2033,9 +1663,9 @@ "tsunami_2": { "inputs": { "advisory-db": "advisory-db_4", - "crane": "crane_5", + "crane": "crane_4", "fenix": "fenix_4", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index f389767..23d41aa 100644 --- a/flake.nix +++ b/flake.nix @@ -5,84 +5,58 @@ nixpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs.url = "/home/noa/Documents/programming/nixpkgs"; - authentik = { - url = "github:nix-community/authentik-nix"; - }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + # for secret management + agenix.url = "github:ryantm/agenix"; + # SSO thingy + authentik.url = "github:nix-community/authentik-nix"; + # Wallpaper automapaper = { url = "github:itepastra/automapaper"; inputs.nixpkgs.follows = "nixpkgs"; }; - + # declarative disk partitioning disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - - lazy = { - url = "github:bobvanderlinden/nixos-config"; - inputs.nixpkgs.follows = "nixpkgs"; + # discord bot for libqalculate + disqalculate = { + url = "github:itepastra/disqalculate"; }; - - mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - hardware = { - url = "github:NixOS/nixos-hardware/master"; - }; - - agenix = { - url = "github:ryantm/agenix"; - }; - - oxalica = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + # various hardware configurations + hardware.url = "github:NixOS/nixos-hardware/master"; + # pixelflut stress test tool tsunami = { url = "github:itepastra/tsunami"; inputs.nixpkgs.follows = "nixpkgs"; }; - + # pixelflut server flurry = { url = "github:itepastra/flurry"; inputs.nixpkgs.follows = "nixpkgs"; }; - - niri = { - url = "github:YaLTeR/niri"; + # scrolling window manager + niri.url = "github:YaLTeR/niri"; + # alternative nix implementation + lix = { + url = "git+https://git.lix.systems/lix-project/lix.git"; + inputs.nixpkgs.follows = "nixpkgs"; }; - + # module for lix lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module.git"; inputs.nixpkgs.follows = "nixpkgs"; inputs.lix.follows = "lix"; }; - - lix = { - url = "git+https://git.lix.systems/lix-project/lix.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nixcord = { - url = "github:kaylorben/nixcord"; - }; - - disqalculate = { - url = "github:itepastra/disqalculate"; - }; - - stylix = { - url = "github:danth/stylix"; - }; + # declarative vencord client + nixcord.url = "github:kaylorben/nixcord"; + # for styling apps etc in a consistent theme + stylix.url = "github:danth/stylix"; }; outputs = @@ -112,8 +86,6 @@ }; modules = [ disko.nixosModules.disko - inputs.mailserver.nixosModules.default - # TODO: find out how I can remove this inputs.stylix.nixosModules.stylix ./hosts/nuos/configuration.nix inputs.home-manager.nixosModules.default