diff --git a/flake.lock b/flake.lock index 47e9b284..3ec18240 100644 --- a/flake.lock +++ b/flake.lock @@ -9,9 +9,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": [ - "systems" - ] + "systems": "systems" }, "locked": { "lastModified": 1754433428, @@ -27,22 +25,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" - } - }, "buildbot-nix": { "inputs": { "flake-parts": [ @@ -55,11 +37,11 @@ "treefmt-nix": [] }, "locked": { - "lastModified": 1758897213, - "narHash": "sha256-pLZgNsmCMhTWd8aRuGkK23ik5nclpIn1flnURKH6QjI=", + "lastModified": 1760038591, + "narHash": "sha256-n5EUuD0t2CUqBTCiwIuoUaXcf7Qmy3m0s6PRf1RFi/A=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "985d069a2a45cf4a571a4346107671adc2bd2a16", + "rev": "fd3cc9d98846603e711dcea483e7f79a1591f9a2", "type": "github" }, "original": { @@ -73,11 +55,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759572023, - "narHash": "sha256-2fzYq/m2PXie5WZO5LhyiZrTIUdUFp1SCLZAwvPL5xo=", + "lastModified": 1760009352, + "narHash": "sha256-VGR+U4hZ1q3RU4rTF9H9mlbN2q0IDkCLLMBoyrovRIA=", "owner": "catppuccin", "repo": "nix", - "rev": "eeada12912d80d04733383d231a9d66172858718", + "rev": "c8d5931c4f69d6a019a3945663f7cb7a7ab484e7", "type": "github" }, "original": { @@ -125,11 +107,11 @@ ] }, "locked": { - "lastModified": 1757699119, - "narHash": "sha256-iOOoVdrkcyk95Xg68TuPeAwpz+v80mgZCqil0jpPZuY=", + "lastModified": 1760032600, + "narHash": "sha256-h/JQLcAfRNAo3QSobPxzTY/KxSwEmwmFJmUd5dGchQw=", "owner": "DeterminateSystems", "repo": "determinate", - "rev": "1e16c8f8a44573bb0648c76b6c98352436f5171e", + "rev": "a3becf5149650592a821daeb2b63d26597506652", "type": "github" }, "original": { @@ -141,37 +123,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-q1tqDvmfjDgLk/wbYf4pRhyHDS94iY85Q79FPBtcv7g=", + "narHash": "sha256-Nug8jpanW4BbUfzq508ZWtCG24YGvyO8AOeTAyDMOKQ=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.3/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.3/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-E1vGfcQ5dqtRG9EDP6eOQWCnCIRB2XFkFBp2C4FgQ8c=", + "narHash": "sha256-kRAuNurPaJBhuOq1SpcCBmDOqCXvGDMKuMAb5vJRqtk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.3/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.3/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-GtxtkI0cOC2A30Xw6gCDTN7JxN1zJGh7/eIXr6AlTSA=", + "narHash": "sha256-7AF8O33I/xlMengDU6tHvmPVvXJZF7XQEdAbjfTPJ6s=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.3/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.3/x86_64-linux" } }, "dix": { @@ -185,41 +167,18 @@ "nixpkgs-regression": [] }, "locked": { - "lastModified": 1757694985, - "narHash": "sha256-3Ia+y7Hbwnzcuf1hyuVnFtbnSR6ErQeFjemHdVxjCNE=", - "rev": "766f43aa6acb1b3578db488c19fbbedf04ed9f24", - "revCount": 22340, + "lastModified": 1760027527, + "narHash": "sha256-1aMQb+eSrGDbTrX7PvtpD142CniIvKFxej9hZxBWeMY=", + "rev": "80d3406e25c753bb5144bef45afe980e6a642c29", + "revCount": 22421, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.2/01993ee9-f8e7-7b80-80df-ec0a20a32514/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.3/0199c9f4-3aa1-723c-a5e0-be7fb957ff9f/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" } }, - "dns": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1759510210, - "narHash": "sha256-rR3BuhcSyQ3bQ0rS14I53O7gWzlPEs15skl1TWx+TeI=", - "owner": "nix-community", - "repo": "dns.nix", - "rev": "f3cb11f642d4fa6224e2b1ddfd2c3ba42e9ffea2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dns.nix", - "type": "github" - } - }, "easy-hosts": { "locked": { "lastModified": 1755470564, @@ -266,9 +225,7 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nixpkgs-lib" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1759362264, @@ -286,9 +243,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "systems" - ] + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -306,7 +261,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_4" }, "locked": { "lastModified": 1694529238, @@ -324,7 +279,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -340,62 +295,12 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "mailserver", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "mailserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "mailserver", - "git-hooks", - "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" - } - }, "golink": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "systems": [ - "systems" - ] + "systems": "systems_3" }, "locked": { "lastModified": 1757610027, @@ -480,11 +385,11 @@ ] }, "locked": { - "lastModified": 1759853171, - "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", + "lastModified": 1760033152, + "narHash": "sha256-e2g07P6SBJrYdRWw5JEJgh8ssccr+jigYR9p4GS0tME=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", + "rev": "5d61767c8dee7f9c66991335795dbca9e801c25a", "type": "github" }, "original": { @@ -592,33 +497,6 @@ "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" } }, - "mailserver": { - "inputs": { - "blobs": "blobs", - "flake-compat": [ - "flake-compat" - ], - "git-hooks": "git-hooks", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-25_05": "nixpkgs-25_05" - }, - "locked": { - "lastModified": 1759489698, - "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "ref": "master", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "my-pkgs": { "inputs": { "nixpkgs": [ @@ -639,29 +517,6 @@ "url": "https://git.pyrox.dev/pyrox/pkgs" } }, - "nix-index": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756113554, - "narHash": "sha256-fFDr5BYisjkEFSgf+dGJTuhMUaH0aVE6Qy3Ql2EOJ2I=", - "owner": "nix-community", - "repo": "nix-index", - "rev": "0fc38040a22a08052103d0fbbafd67ac54165f2b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -682,32 +537,6 @@ "type": "github" } }, - "nix-search": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741306118, - "narHash": "sha256-699XDyrMhx0nSI2z/WRhTsJhiiMt4WqaPx8//cPiBGY=", - "owner": "diamondburned", - "repo": "nix-search", - "rev": "7dcd7b9ae3ec59b7a8ee61371157f83e6bd87b89", - "type": "github" - }, - "original": { - "owner": "diamondburned", - "repo": "nix-search", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1759381078, @@ -724,22 +553,6 @@ "type": "github" } }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1754788789, @@ -774,10 +587,10 @@ "nixpkgs_2": { "locked": { "lastModified": 315532800, - "narHash": "sha256-K9s0wLYHHR9syJV2Ii28kDT65NeT5EI8vH56/CKm924=", - "rev": "8b5c9dd8856f0c0cf46cc91f2c21c106a9d42e25", + "narHash": "sha256-TArz2xcD1fDUu8lJA5xL5pPsTmyBRrU9265ya3WztpI=", + "rev": "2dad7af78a183b6c486702c18af8a9544f298377", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre874129.8b5c9dd8856f/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre874800.2dad7af78a18/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -800,22 +613,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -823,7 +620,6 @@ "ctp": "ctp", "determinate": "determinate", "dix": "dix", - "dns": "dns", "easy-hosts": "easy-hosts", "flake-compat": "flake-compat", "flake-parts": "flake-parts", @@ -832,16 +628,10 @@ "hardware": "hardware", "home-manager": "home-manager", "iceshrimp": "iceshrimp", - "mailserver": "mailserver", "my-pkgs": "my-pkgs", - "nix-index": "nix-index", "nix-index-database": "nix-index-database", - "nix-search": "nix-search", "nixpkgs": "nixpkgs_2", - "nixpkgs-lib": "nixpkgs-lib", "nixpkgs-stalwart-fix": "nixpkgs-stalwart-fix", - "stable": "stable", - "systems": "systems", "tangled": "tangled", "vicinae": "vicinae" } @@ -859,23 +649,22 @@ "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" } }, - "stable": { + "systems": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "systems": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -890,7 +679,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -905,7 +694,22 @@ "type": "github" } }, - "systems_3": { + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -934,11 +738,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1759933847, - "narHash": "sha256-lLyX1f4fSG1IYsjcsUKKCAOHpa3ZTFexJMRc/0K2g3c=", + "lastModified": 1760000456, + "narHash": "sha256-oPLeea0FTpEFwulK2I7uUyVNqDQGlB4t4rHSSinSXE4=", "ref": "refs/heads/master", - "rev": "eaa11ecb2112c90113a8ee49a8aa05be327b13ad", - "revCount": 1508, + "rev": "62a3b4738a45190cf00b3cdbfdd5bead6ec31588", + "revCount": 1510, "type": "git", "url": "https://tangled.org/@tangled.org/core" }, @@ -950,14 +754,16 @@ "vicinae": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1759965448, - "narHash": "sha256-A6P8tBlWhUo6lJA/9ku9hjhzs1NlPDs4f8V/qlqf1dQ=", + "lastModified": 1760025216, + "narHash": "sha256-gyRU+Xv8ABhiSTHFFllwMC7lLzINBiESDFlhZuQoIY0=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "b1f24c7c077b7f55fea25547267ea0489ca1dbb5", + "rev": "7757b8fc6ee8488a8cb27aca3260317132676540", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ce6fe518..677279be 100644 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,11 @@ "https://cache.nixos.org" "https://nix-community.cachix.org" "https://install.determinate.systems" - "https://vicinae.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM=" - "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; cores = 0; max-jobs = 2; @@ -23,26 +21,20 @@ inputs = { flake-parts = { url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs-lib.follows = "nixpkgs-lib"; }; nixpkgs.url = "https://nixpkgs.dev/channel/nixpkgs-unstable"; nixpkgs-stalwart-fix.url = "github:pyrox0/nixpkgs/fix/stalwart-module"; - stable.url = "github:nixos/nixpkgs/nixos-24.05"; # Overrides flake-compat.url = "github:edolstra/flake-compat"; - systems.url = "github:nix-systems/default"; flake-utils = { url = "github:numtide/flake-utils"; - inputs.systems.follows = "systems"; }; - nixpkgs-lib.url = "github:nix-community/nixpkgs.lib"; # Inputs agenix = { url = "github:ryantm/agenix"; inputs = { nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; home-manager.follows = "home-manager"; }; }; @@ -73,15 +65,9 @@ nix.follows = "dix"; }; }; - dns = { - url = "github:nix-community/dns.nix"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; easy-hosts.url = "github:tgirlcloud/easy-hosts"; golink = { url = "github:tailscale/golink"; - inputs.systems.follows = "systems"; inputs.nixpkgs.follows = "nixpkgs"; }; hardware = { @@ -95,24 +81,6 @@ url = "git+https://iceshrimp.dev/pyrox/packaging"; inputs.nixpkgs.follows = "nixpkgs"; }; - mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; - inputs = { - flake-compat.follows = "flake-compat"; - nixpkgs.follows = "nixpkgs"; - }; - }; - nix-search = { - url = "github:diamondburned/nix-search"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.flake-compat.follows = "flake-compat"; - }; - nix-index = { - url = "github:nix-community/nix-index"; - inputs.flake-compat.follows = "flake-compat"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -123,6 +91,7 @@ }; vicinae = { url = "github:vicinaehq/vicinae"; + inputs.nixpkgs.follows = "nixpkgs"; }; tangled = { url = "git+https://tangled.org/@tangled.org/core"; diff --git a/hosts/default.nix b/hosts/default.nix index ecd11ce2..bc815d1a 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -41,9 +41,6 @@ "server" "vps" ]; - modules = [ - inputs.mailserver.nixosModule - ]; }; thought = { deployable = true; diff --git a/hosts/prefect/default.nix b/hosts/prefect/default.nix index b9c13130..8e45d632 100644 --- a/hosts/prefect/default.nix +++ b/hosts/prefect/default.nix @@ -27,7 +27,7 @@ # ./services/dn42-peerfinder.nix ./services/fail2ban.nix # ./services/headscale.nix - ./services/mailserver + # ./services/mailserver ./services/mailserver/stalwart # ./services/netdata.nix # ./services/nginx diff --git a/overlays/nix-index/default.nix b/overlays/nix-index/default.nix deleted file mode 100644 index f57d9ebc..00000000 --- a/overlays/nix-index/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# deadnix: skip -{ inputs, ... }: final: prev: { inherit (inputs.nix-index.packages.${prev.system}) nix-index; }