diff --git a/flake.lock b/flake.lock index 1c494aa..7691bc0 100644 --- a/flake.lock +++ b/flake.lock @@ -4,16 +4,17 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1724226964, - "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "lastModified": 1725300620, + "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", "owner": "zhaofengli", "repo": "attic", - "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", "type": "github" }, "original": { @@ -142,11 +143,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1722323564, - "narHash": "sha256-6w6/N8walz4Ayc9zu7iySqJRmGFukhkaICLn4dweAcA=", + "lastModified": 1724347376, + "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", "owner": "matrix-org", "repo": "complement", - "rev": "6e4426a9e63233f9821a4d2382bfed145244183f", + "rev": "39733c1b2f8314800776748cc7164f9a34650686", "type": "github" }, "original": { @@ -173,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1725209064, - "narHash": "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=", + "lastModified": 1726444589, + "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8f7ade4c22533a3177bfd8f175e178573ba6c1d4", + "rev": "032b199129f8648a77bde285f755a78e9ec349a7", "type": "github" }, "original": { @@ -230,18 +231,12 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724006180, - "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -369,11 +364,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1726396892, + "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", "type": "github" }, "original": { @@ -413,11 +408,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1724221791, - "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", + "lastModified": 1725690497, + "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", "owner": "nix-community", "repo": "fenix", - "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", + "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", "type": "github" }, "original": { @@ -543,15 +538,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -561,6 +558,26 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -753,11 +770,11 @@ ] }, "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -773,11 +790,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1726031155, - "narHash": "sha256-QUv5cxy40HRC7vJz9JjbVEmlHT+q1VIuikNJUQZHre0=", + "lastModified": 1726115155, + "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "90c68db7d9430bd30e8c5096a0e3dc078b410050", + "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "type": "github" }, "original": { @@ -790,7 +807,7 @@ "inputs": { "crane": "crane_4", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" @@ -812,11 +829,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1724199144, - "narHash": "sha256-MVjnwO6EbKzzSrU51dSseLarZ1fRp+6SagAf/nE/XZU=", + "lastModified": 1725659644, + "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", "owner": "axboe", "repo": "liburing", - "rev": "2d4e799017d64cd2f8304503eef9064931bb3fbd", + "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", "type": "github" }, "original": { @@ -925,11 +942,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -971,11 +988,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1726362065, + "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", "type": "github" }, "original": { @@ -992,11 +1009,11 @@ ] }, "locked": { - "lastModified": 1725843519, - "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", + "lastModified": 1726494069, + "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", + "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", "type": "github" }, "original": { @@ -1007,11 +1024,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -1023,11 +1040,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723827930, - "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", + "lastModified": 1724999960, + "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", + "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", "type": "github" }, "original": { @@ -1054,11 +1071,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1726057121, - "narHash": "sha256-6xBH5ii+WfuU6A4nJ2JMAajl0N+v+OLnt9y6eC+pphw=", + "lastModified": 1726513143, + "narHash": "sha256-z3JL4iYtx2+dcEm4JlHmOM+2/JHWb9YLp0NBWqUihk4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842d84cdcc779f2e3ad1950f19cab533833ba0ea", + "rev": "bff640bbd7eb7ebec2a7a9d99291fbbc7b3177ba", "type": "github" }, "original": { @@ -1101,16 +1118,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1165,11 +1182,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -1245,11 +1262,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -1316,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1725914634, - "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "lastModified": 1726509788, + "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", "type": "github" }, "original": { @@ -1386,16 +1403,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1724285323, - "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=", + "lastModified": 1725811807, + "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67", + "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.5.2", + "ref": "v9.6.1", "repo": "rocksdb", "type": "github" } @@ -1406,7 +1423,7 @@ "catppuccin": "catppuccin", "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", @@ -1443,11 +1460,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1724153119, - "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", + "lastModified": 1725630423, + "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", + "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", "type": "github" }, "original": { @@ -1527,11 +1544,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725922448, - "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", + "lastModified": 1726218807, + "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cede1a08039178ac12957733e97ab1006c6b6892", + "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5428f52..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -227,46 +227,46 @@ ]; }; - ISO = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - {_module.args = {inherit pkgs-edge;};} - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./nixos/hosts/iso/configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # ISO = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # {_module.args = {inherit pkgs-edge;};} + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + # "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + # ./nixos/hosts/iso/configuration.nix + # sops-nix.nixosModules.sops + # home-manager.nixosModules.home-manager + # nix-index-database.nixosModules.nix-index + # catppuccin.nixosModules.catppuccin + # { + # home-manager.sharedModules = [ + # inputs.plasma-manager.homeManagerModules.plasma-manager + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; - iso_server = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - {_module.args = {inherit pkgs-edge;};} - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./nixos/hosts/iso_server/configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # iso_server = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # {_module.args = {inherit pkgs-edge;};} + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + # "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + # ./nixos/hosts/iso_server/configuration.nix + # sops-nix.nixosModules.sops + # home-manager.nixosModules.home-manager + # nix-index-database.nixosModules.nix-index + # catppuccin.nixosModules.catppuccin + # { + # home-manager.sharedModules = [ + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; }; }; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 7c5eae2..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -15,8 +15,6 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default - inputs.lanzaboote.nixosModules.lanzaboote - # Import the shared settings ../../shared ../../desktop/package-configs/firefox