diff --git a/flake.lock b/flake.lock index bb563d3..11182ab 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1721416846, - "narHash": "sha256-dY7YoNln1wUBM83SRPYoAIzndSnp+YaqE5GdR+wr+wg=", + "lastModified": 1723660424, + "narHash": "sha256-kWxk7fEucP7ft9qMEi877vCSO0IUv/jo4Fxopi+fBFg=", "ref": "refs/heads/main", - "rev": "f2cfa79c615f3fbec09b67550329ca9840a65f4b", - "revCount": 223, + "rev": "f0a8400f3db6f3f852ec73d74485625ffcd12dd9", + "revCount": 228, "type": "git", "url": "https://git.lix.systems/nrabulinski/attic.git" }, @@ -77,11 +77,11 @@ "conduit-src": { "flake": false, "locked": { - "lastModified": 1720600594, - "narHash": "sha256-OxpQzsfIhpSUi1MSBJTHInY1MlXu8DoD1ZSuvPVztSc=", + "lastModified": 1721379485, + "narHash": "sha256-Pcfv3IB4yGiSC4N5BqD6T9u+YYBiwjJ+VGzg0WGCjK8=", "owner": "famedly", "repo": "conduit", - "rev": "8abab8c8a0e3ef406f8a107936f07031d964ac5f", + "rev": "44dd21f432a22c82adab77c25469c336976f4081", "type": "gitlab" }, "original": { @@ -98,11 +98,11 @@ ] }, "locked": { - "lastModified": 1721058578, - "narHash": "sha256-fs/PVa3H5dS1//4BjecWi3nitXm5fRObx0JxXIAo+JA=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "17e5109bb1d9fb393d70fba80988f7d70d1ded1a", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1721086468, - "narHash": "sha256-OF642LVDj5Icr0tXlY9P54vna4OP10IMhIhhiKwIRpw=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7522a30d328f885d20c2815bd05eb711bc69644c", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1721007199, - "narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=", + "lastModified": 1723426710, + "narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=", "owner": "nix-community", "repo": "disko", - "rev": "bad376945de7033c7adc424c02054ea3736cf7c4", + "rev": "0d510fe40b56ed74907a021d7e1ffd0042592914", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1721111394, - "narHash": "sha256-hCN0NCmqPdosiyGt2thVRqg9ltctTROzGAoMq57QXPs=", + "lastModified": 1723616992, + "narHash": "sha256-jDHYfEECzFwZm4huz7AbPjlH3jJ4/2ns9PddtFA5XMY=", "owner": "nix-community", "repo": "fenix", - "rev": "e63599e3186cfb3284933bc815d33a509addd00e", + "rev": "7bad6c7ff73b784a9c7de9147626c8d5d5072809", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1721090973, - "narHash": "sha256-ddaFNBXAe0uGZ1wJcPL8hq7VzxteoT0DnMk90sT4Jnk=", + "lastModified": 1723596655, + "narHash": "sha256-VX7obsWR/e94Nw38FnOC1EkpnLv4dIvKcf9SMIvVouw=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "2e2a65ea0c945350d91bce459f408e0bf0638126", + "rev": "1fae8244c32f95e245c0c08e38656186ae6dca37", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -285,11 +285,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -299,12 +299,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -315,7 +318,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1709126324, @@ -333,7 +336,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -351,7 +354,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -413,11 +416,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721100689, - "narHash": "sha256-ALcANRhsPzmY8CNvXWWxI5yc72cH9v6t49N7S+spBqs=", + "lastModified": 1723657484, + "narHash": "sha256-oSxczvhDKCc/ilTPiMz46RmTLhyBoVxhGWhp7Ee54eA=", "owner": "helix-editor", "repo": "helix", - "rev": "22a051408a467ff8b3e43457961d5497903dc7d0", + "rev": "ff33b07756548935577aefc15cf48a1beb27b162", "type": "github" }, "original": { @@ -452,11 +455,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -468,11 +471,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1721091462, - "narHash": "sha256-0cmEeoOiB91BviTJHzIyxkY+Gxv3O8ZnnExVAoXEFGI=", + "lastModified": 1723577950, + "narHash": "sha256-kOpGI9WPmte1L4QWHviuXsr8jxmGn27zwi82jtzYObM=", "ref": "refs/heads/main", - "rev": "6b4d46e9e0e1dd80e0977684ab20d14bcd1a6bc3", - "revCount": 15967, + "rev": "b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf", + "revCount": 16134, "type": "git", "url": "https://git.lix.systems/lix-project/lix.git" }, @@ -493,11 +496,11 @@ ] }, "locked": { - "lastModified": 1720695775, - "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=", + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", "ref": "refs/heads/main", - "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a", - "revCount": 94, + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", + "revCount": 106, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module.git" }, @@ -516,11 +519,11 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1718697807, - "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", + "lastModified": 1722877200, + "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", + "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "type": "gitlab" }, "original": { @@ -535,11 +538,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690830552, - "narHash": "sha256-8n8PipmWZnnE56QlhcGQCKG5cMU8v+NTaFkJzBM6k4w=", + "lastModified": 1723663703, + "narHash": "sha256-ubPcnvjRQCzZgaYTWOKd82xXwJKmOaPjStUOUkyRTSs=", "owner": "nrabulinski", "repo": "nur-packages", - "rev": "b19fe09dd3f325ff2731b83f230e2573b67db4aa", + "rev": "567fd42dc54f71ce1705180ad7f35f786f00ed9a", "type": "github" }, "original": { @@ -596,29 +599,23 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1690753480, - "narHash": "sha256-GQgPs8fCh/LsyQoYMUZgT2p7jFVWyHu9p+1Nl/dp8GY=", + "lastModified": 1723603349, + "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e06dd56947c1dc3dc837c3149bfe02c71a6edd7", + "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb", "type": "github" }, "original": { @@ -630,11 +627,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1721080040, - "narHash": "sha256-USDsS90/88RJibP3gEcH1AaVt+JpnX4XCUD9bAJP5I4=", + "lastModified": 1723603349, + "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2", + "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb", "type": "github" }, "original": { @@ -653,11 +650,11 @@ "nvidia-patch-src": "nvidia-patch-src" }, "locked": { - "lastModified": 1720255638, - "narHash": "sha256-yRsjlfnRryyKpfAqWSlZikQ6dcEbmeRrzwwt5+EoElI=", + "lastModified": 1723366036, + "narHash": "sha256-WaVgIqCk+RsQAWkAmI58qsZqLziXHGqg/I+oKIAhlyk=", "owner": "arcnmx", "repo": "nvidia-patch.nix", - "rev": "f711e566f4799e4c76c1efc71f3f148bb5c0bddb", + "rev": "1a4df2b62c28edd6795781d834df20ade010785c", "type": "github" }, "original": { @@ -669,11 +666,11 @@ "nvidia-patch-src": { "flake": false, "locked": { - "lastModified": 1720169578, - "narHash": "sha256-cPrl/kXXgnIMDm5Phesj+eDXGIsjlhoA1dPOivqSnoM=", + "lastModified": 1723286515, + "narHash": "sha256-sjrNf8ZUm5HF9UVmBmD2uJUWDtZJOF4brfnVt1FTXHY=", "owner": "keylase", "repo": "nvidia-patch", - "rev": "87fe7b874b3db1489d7313c667130ef22c445bd7", + "rev": "fc299168b83bacd317ceeaf3a850ecf2f1b9d66f", "type": "github" }, "original": { @@ -731,11 +728,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1721048109, - "narHash": "sha256-X3tDuTPGKrAzTeQ9mkaGZL6srpsVEbZGW9PVdOLgfJo=", + "lastModified": 1723561310, + "narHash": "sha256-a3KMMsIDvdo+ClLabh5wfJoa17YTSvy2wDLb8yZCXvc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0c95aaa08e5f870d269f0ca13010eda9a4dc3402", + "rev": "78c2bdce860dbd996a8083224d01a96660dd6a15", "type": "github" }, "original": { @@ -778,11 +775,11 @@ ] }, "locked": { - "lastModified": 1721010111, - "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", "type": "github" }, "original": { @@ -869,6 +866,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wrapper-manager": { "inputs": { "nixpkgs": [ @@ -928,11 +940,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1721054167, - "narHash": "sha256-0ZplHtEXoqytnDExvNoDWoTt1KjcobKVGXv5zmY3jrk=", + "lastModified": 1723031177, + "narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=", "owner": "dj95", "repo": "zjstatus", - "rev": "924f821cf1a1800baa90a443a7150ca795ad93c7", + "rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46", "type": "github" }, "original": { diff --git a/hosts/kazuki/vault.nix b/hosts/kazuki/vault.nix index aeb1a57..6e8a3af 100644 --- a/hosts/kazuki/vault.nix +++ b/hosts/kazuki/vault.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: { age.secrets.rabulinski-com-cf = { file = ../../secrets/rabulinski-com-cf.age; @@ -7,8 +7,6 @@ services.vaultwarden = { enable = true; - # TODO: Remove with next version bump - webVaultPackage = pkgs.vaultwarden.webvault.override { python3 = pkgs.python311; }; config = { ROCKET_PORT = 60001; }; diff --git a/modules/system/common/incus.nix b/modules/system/common/incus.nix index d2a5d6a..e43d967 100644 --- a/modules/system/common/incus.nix +++ b/modules/system/common/incus.nix @@ -26,9 +26,6 @@ let linuxConfig = lib.optionalAttrs isLinux ( lib.mkIf (!cfg.clientOnly) { - # TODO: Remove after update - systemd.services.incus.serviceConfig.Environment = lib.strings.toJSON "INCUS_OVMF_PATH=${config.systemd.services.incus.environment.INCUS_EDK2_PATH}"; - virtualisation.incus = { enable = true; inherit (cfg) package clientPackage;