From e9e193b78926dd4b62c50dd5fdccfae650cb5736 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 6 Mar 2024 21:37:24 +0100 Subject: [PATCH] nix flake update --- flake.lock | 282 ++++++++-------------------------- flake.nix | 4 - modules/default.nix | 3 +- systems/kuraokami/default.nix | 1 - 4 files changed, 64 insertions(+), 226 deletions(-) diff --git a/flake.lock b/flake.lock index 7ee38dc..5c28035 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1707096904, - "narHash": "sha256-fByoY3t8S+Z7cqUBHOPB57x4XGFI/+HIO7YmlqqltZA=", + "lastModified": 1708614921, + "narHash": "sha256-DtIZY8CVYbAwig28tiOxujX3BmmWRcx4dJVroKA5A1c=", "ref": "refs/heads/main", - "rev": "2c00ccaea6714f29f193124dd24dfe7e1f848ff3", - "revCount": 1915, + "rev": "36771f3ecd24963f5459fd0ddde6188e82c96626", + "revCount": 2099, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1708143835, - "narHash": "sha256-SRGi47kleiyNVQlR9mxp9Ux2t2SLy7Nm3L6b3UKjH2c=", + "lastModified": 1709439398, + "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=", "owner": "nix-community", "repo": "disko", - "rev": "4d81082b2c37a6e1e181cc9f589b5b657774bd63", + "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1706491084, - "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", + "lastModified": 1707524024, + "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", "owner": "nix-community", "repo": "disko", - "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", + "rev": "d07de570ba05cec2807d058daaa044f6955720c7", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1708142642, - "narHash": "sha256-r3uORoA0OrObk3le//UFl3V3IBJJ3lcyjTacczI3qrY=", + "lastModified": 1709447189, + "narHash": "sha256-uXro556jQeBydN2zoCgxvoHlwvY8sIVp5j/ycT1el90=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f55c65d55457778a908bb91925ef3e41b7d44231", + "rev": "4a7e0685baf8277ac9b86e7207ed2d9a6a2d157b", "type": "gitlab" }, "original": { @@ -107,22 +107,6 @@ "type": "github" } }, - "flake-compat_2": { - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -132,11 +116,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -167,15 +151,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", "type": "github" }, "original": { @@ -186,25 +167,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -221,28 +184,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "kde2nix", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "prismlauncher", @@ -271,11 +212,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1709445365, + "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "type": "github" }, "original": { @@ -292,11 +233,11 @@ ] }, "locked": { - "lastModified": 1708148641, - "narHash": "sha256-UliMMpx84PPA+0mcyBj2yuKNawOX7L4u/wO8j9QGHVk=", + "lastModified": 1709295149, + "narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f318a856ff3177fdea6044d6c77dd49992330a31", + "rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054", "type": "github" }, "original": { @@ -305,28 +246,6 @@ "type": "github" } }, - "kde2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1707218112, - "narHash": "sha256-GXwhrTyeIj38aBi8t6fxasuJ3h2AhvxDypAxQjKrrTY=", - "owner": "nix-community", - "repo": "kde2nix", - "rev": "285ae35495f7a39aacf91598ecf154035bc5d2e8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "kde2nix", - "type": "github" - } - }, "libnbtplusplus": { "flake": false, "locked": { @@ -351,11 +270,11 @@ ] }, "locked": { - "lastModified": 1707360805, - "narHash": "sha256-uNAVZy/i9i0+o7dTu9JUUCqvuqj5DQBiy117qKF1WUg=", + "lastModified": 1709175178, + "narHash": "sha256-t3soMFueNSuODEksnLn2B2eiXViPyeptiI919t1r7ks=", "owner": "Lassulus", "repo": "nether", - "rev": "582095c991693832d3c90710772f6c67d12bc6da", + "rev": "0fdc0b015615ccc43defc42d0f330796960b9e15", "type": "github" }, "original": { @@ -403,11 +322,11 @@ }, "nixlib_2": { "locked": { - "lastModified": 1707612395, - "narHash": "sha256-iqWiOQY+OwL0Yqdqy1dEWsMMpht+0eSlmtpZ5Rws16Y=", + "lastModified": 1708821942, + "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "240f2ff0ed2aac2b91efa29ba3d325526824205b", + "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b", "type": "github" }, "original": { @@ -426,11 +345,11 @@ ] }, "locked": { - "lastModified": 1706085261, - "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", + "lastModified": 1707405218, + "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", + "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef", "type": "github" }, "original": { @@ -447,11 +366,11 @@ ] }, "locked": { - "lastModified": 1707873059, - "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", + "lastModified": 1709226763, + "narHash": "sha256-GlJ7g2srrtx6s5P2uswZ6Zcpy2u90tomIx+Gstlk97s=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", + "rev": "2c9562e7624fa1b50983fc18d504bf86202bef49", "type": "github" }, "original": { @@ -462,11 +381,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708091350, - "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", + "lastModified": 1709410583, + "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", + "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", "type": "github" }, "original": { @@ -477,11 +396,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -491,58 +410,14 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "kde2nix", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "kde2nix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1706424699, - "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { "inputs": { "flake-compat": [ "prismlauncher", "flake-compat" ], - "flake-utils": "flake-utils_3", - "gitignore": "gitignore_2", + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", "nixpkgs": [ "prismlauncher", "nixpkgs" @@ -568,20 +443,20 @@ }, "prismlauncher": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1708131432, - "narHash": "sha256-S5rEXCaV230Y/HwAzexhmW9rjXMEuOCVPtSvE+Ue7vc=", + "lastModified": 1709452367, + "narHash": "sha256-MxIMSN2BMZZHnT5FvG4eZw+sjDc2RHkm9s4H6kU8LzY=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "599a08d30963b55c08149c5c8808dfa813ee862a", + "rev": "ad8c3ca54bf47b8608e6a2a1cc1621ecece95afb", "type": "github" }, "original": { @@ -596,7 +471,6 @@ "firefox-addons": "firefox-addons", "home-manager": "home-manager", "jovian": "jovian", - "kde2nix": "kde2nix", "nether": "nether", "nixos-generators": "nixos-generators_2", "nixos-hardware": "nixos-hardware", @@ -619,11 +493,11 @@ ] }, "locked": { - "lastModified": 1706410821, - "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", + "lastModified": 1707620614, + "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", + "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", "type": "github" }, "original": { @@ -639,11 +513,11 @@ ] }, "locked": { - "lastModified": 1708003942, - "narHash": "sha256-M0d1ouJUVCDiorvuAXifrR03geHGAf+3ELD7kuayWfI=", + "lastModified": 1709301784, + "narHash": "sha256-Yf7HeS2VZCD8kD/wEgnToyt9YqQhCle/9TazmFYnjsE=", "owner": "nix-community", "repo": "srvos", - "rev": "e19a0dc562b1df371772d90613f91c2a6b1839b3", + "rev": "9501896e0edf01d2cbd5fa6f0dbb3aafc00dae81", "type": "github" }, "original": { @@ -667,44 +541,14 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tela-icon-theme": { "flake": false, "locked": { - "lastModified": 1705509115, - "narHash": "sha256-J9SUKqpr9kZ0h6KJf2j5FYfu+fWEvQhVYUZ2hETAIz4=", + "lastModified": 1708969746, + "narHash": "sha256-V4ZLzWyh7/Jk857Cjg7ZkBNnEtU4PCCxlhVyh0/4ujo=", "owner": "vinceliuice", "repo": "Tela-icon-theme", - "rev": "7a700e563df55ae2b28f15033e8b2ce766c06243", + "rev": "4f62d648a46a45bd94fff7fe1a78f0fa157c26f4", "type": "github" }, "original": { @@ -722,11 +566,11 @@ ] }, "locked": { - "lastModified": 1706462057, - "narHash": "sha256-7dG1D4iqqt0bEbBqUWk6lZiSqqwwAO0Hd1L5opVyhNM=", + "lastModified": 1707300477, + "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6153c2a3ff4c38d231e3ae99af29b87f1df5901", + "rev": "ac599dab59a66304eb511af07b3883114f061b9d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ea2d75..c0a41d8 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,6 @@ }; # Modules - kde2nix = { - url = "github:nix-community/kde2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/default.nix b/modules/default.nix index 4600388..cdf8946 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -26,8 +26,7 @@ ./zerotierone ../upstream self.inputs.home-manager.nixosModules.home-manager - self.inputs.kde2nix.nixosModules.plasma6 - self.inputs.disko.nixosModules.disko + #self.inputs.disko.nixosModules.disko self.inputs.nixos-generators.nixosModules.all-formats ]; } diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 1f73722..aded8e7 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -28,7 +28,6 @@ ssh.enable = true; asf.enable = true; sway.enable = true; - minecraft-server.enable = true; repo-sync.enable = true; zerotierone.enable = true; keyboard = {