From 5d7ab7c4146c02dcaf3f8373b4b71d09d6ef09ac Mon Sep 17 00:00:00 2001 From: iofq Date: Mon, 2 Jun 2025 01:21:31 -0500 Subject: [PATCH] hm cleanup --- flake.lock | 464 ++++++++++++------ flake.nix | 2 + .../shared/programs/shell/default.nix | 22 +- home-manager/shared/programs/shell/fish.nix | 103 ---- .../shared/programs/shell/fish/default.nix | 38 ++ .../shared/programs/shell/fish/functions.nix | 60 +++ home-manager/shared/programs/shell/git.nix | 16 +- home-manager/shared/programs/shell/gpg.nix | 15 - home-manager/shared/wayland/audio/default.nix | 7 - home-manager/shared/wayland/default.nix | 30 +- .../shared/wayland/hyprland/default.nix | 2 +- home-manager/shared/wayland/xdg/default.nix | 29 -- nixos/configuration.nix | 6 +- nixos/consensus/backups.nix | 30 ++ nixos/consensus/configuration.nix | 8 +- nixos/default.nix | 1 + nixos/t14/configuration.nix | 14 - secrets/restic.yaml | 15 +- 18 files changed, 534 insertions(+), 328 deletions(-) delete mode 100644 home-manager/shared/programs/shell/fish.nix create mode 100644 home-manager/shared/programs/shell/fish/default.nix create mode 100644 home-manager/shared/programs/shell/fish/functions.nix delete mode 100644 home-manager/shared/programs/shell/gpg.nix delete mode 100755 home-manager/shared/wayland/audio/default.nix delete mode 100755 home-manager/shared/wayland/xdg/default.nix create mode 100644 nixos/consensus/backups.nix diff --git a/flake.lock b/flake.lock index 65e9ea0..12a3eb9 100755 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,67 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1748911895, + "narHash": "sha256-xXeDMMKuv8A/wlHgq6+4E6fcYJm/Munr764E0wyFEOs=", + "rev": "0bfc40897a765936318cad1076c915308bf33855", + "revCount": 246, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.6.2/01973348-6edf-7091-8b18-54f942b2bf2f/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-qh0zj1z3zc6wd3vuQIZkfisxDIIQE/oC1l3zpEWoWx0=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.2/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.2/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-PVdj96Pxn9pDP0WrYVlJWsymCXNDBAjzyk/b0qMtRRs=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.2/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.2/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-X3gcLv4dHU3bkDgNN5GaY0sfsWrSqIHoKjVNP8+uHHQ=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.2/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.6.2/x86_64-linux" + } + }, "flake-compat": { "flake": false, "locked": { @@ -41,11 +102,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -57,11 +118,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -89,11 +150,11 @@ "flake-compat_5": { "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": { @@ -105,11 +166,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -134,19 +195,36 @@ "type": "github" } }, + "flake-compat_8": { + "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": [ - "neovim-nightly-overlay", + "determinate", + "nix", "nixpkgs" ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -156,6 +234,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -176,7 +275,7 @@ "type": "indirect" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -194,7 +293,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nvim", @@ -216,7 +315,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nvim", @@ -258,7 +357,7 @@ }, "gen-luarc": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks_2", "luvit-meta": "luvit-meta", "nixpkgs": [ @@ -282,7 +381,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly-overlay", @@ -303,9 +402,41 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": [ + "determinate", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-hooks_2": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "gitignore": "gitignore_2", "nixpkgs": [ "nvim", @@ -330,7 +461,7 @@ }, "git-hooks_3": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "gitignore": "gitignore_3", "nixpkgs": [ "nvim", @@ -339,11 +470,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -443,12 +574,35 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" ] }, + "locked": { + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "231726642197817d20310b9d39dd4afb9e899489", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, + "hercules-ci-effects_2": { + "inputs": { + "flake-parts": "flake-parts_6", + "nixpkgs": [ + "nvim", + "neovim-nightly-overlay", + "nixpkgs" + ] + }, "locked": { "lastModified": 1747284884, "narHash": "sha256-lTSKhRrassMcJ1ZsuUVunyl/F04vvCKY80HB/4rvvm4=", @@ -463,29 +617,6 @@ "type": "github" } }, - "hercules-ci-effects_2": { - "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": [ - "nvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744693102, - "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -493,11 +624,11 @@ ] }, "locked": { - "lastModified": 1747439237, - "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -526,11 +657,11 @@ "mini-nvim": { "flake": false, "locked": { - "lastModified": 1746264830, - "narHash": "sha256-A3FIyfy/3VUBMPfWd6PLaqAhOAOA5ava0nc4Z9JCKCI=", + "lastModified": 1747734615, + "narHash": "sha256-Nym+lyfEkAdnEmUT6s8ejd+hTIMvC6tMUzJyZLmp6cg=", "owner": "echasnovski", "repo": "mini.nvim", - "rev": "ee23e1abc206efc6d6cce19ec8c0a3da7a897035", + "rev": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152", "type": "github" }, "original": { @@ -541,20 +672,20 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747475604, - "narHash": "sha256-QQI3EaXwqTiWAz6JCV1rD9g7uJzkhOK8gQpawVznYEs=", + "lastModified": 1748838808, + "narHash": "sha256-mSAJD41472sC55IW+lUQGAjn9gsh7w/ClNvfukMvHEc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "a389c17ddc7b05050c35f9c1cd6b58a5d2ef720c", + "rev": "4fb826468dd110892a4784a0106ef6f3a34f0907", "type": "github" }, "original": { @@ -565,20 +696,20 @@ }, "neovim-nightly-overlay_2": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_5", "git-hooks": "git-hooks_3", "hercules-ci-effects": "hercules-ci-effects_2", "neovim-src": "neovim-src_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1746256223, - "narHash": "sha256-a97mwMJcE0cYGfwB5N5v+Ey+by1poGTc/fsrd47Fom8=", + "lastModified": 1747786187, + "narHash": "sha256-9SSsln1nd3SnECH7I466UzLZ2luJS1phTOYG0ehRAxQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "02ec02529a5d602a9e9d273531d776d160fae182", + "rev": "1709adcc65a1779b6513db3470dad257de7c24ae", "type": "github" }, "original": { @@ -590,11 +721,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1747473845, - "narHash": "sha256-jmjtmuIjIKuGWyNenamx6gaWPSVkD84TxngP6hX8Auc=", + "lastModified": 1748816622, + "narHash": "sha256-KWkPOptegP3DP+Y8tPM9KvtZ20pVusfinMM/brTwIIo=", "owner": "neovim", "repo": "neovim", - "rev": "8e8f4523c687cac4e966cb78856f73706dcec37d", + "rev": "52991d8728c876366cd28f75be29ee579a0a8605", "type": "github" }, "original": { @@ -606,11 +737,11 @@ "neovim-src_2": { "flake": false, "locked": { - "lastModified": 1746214751, - "narHash": "sha256-FlGgG3A9oJwGP0YTWU2Nw9fwdnqPMapjx3twonu0Vkg=", + "lastModified": 1747760768, + "narHash": "sha256-5oDiP8Yn93692CUEH81LJbZxPIprIozLHdkFt5N9Np4=", "owner": "neovim", "repo": "neovim", - "rev": "5a2edc483dff93cc94847b6950713d80a51087c0", + "rev": "cd9d8469b22cedeb5ccad3def6e3cfee2877577f", "type": "github" }, "original": { @@ -619,6 +750,27 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1748909153, + "narHash": "sha256-A/yjYc+vdkjvw3xI7qgfYRI+jzyiW9Ay6JPhGu1gFyo=", + "rev": "a18fd9b131eb713eba11a746beb3d79628016936", + "revCount": 20936, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.6.2/01973342-bafd-782a-bbcf-6606879c0df6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -626,11 +778,11 @@ ] }, "locked": { - "lastModified": 1747470409, - "narHash": "sha256-R9TP2//BDKyjNzuZybplIZm7HQEnwL8khs7EmmTPYP4=", + "lastModified": 1748751003, + "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c1f63a0c3bf1b2fe05124ccb099333163e2184a7", + "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", "type": "github" }, "original": { @@ -641,11 +793,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -656,20 +808,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747426788, - "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1717284937, @@ -682,6 +850,22 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -700,11 +884,11 @@ }, "nixpkgs-uns": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -716,27 +900,25 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", - "type": "github" + "lastModified": 1748217807, + "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", + "rev": "3108eaa516ae22c2360928589731a4f1581526ef", + "revCount": 806109, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.806109%2Brev-3108eaa516ae22c2360928589731a4f1581526ef/01971040-062f-7e68-83d1-5cd2af08d87e/source.tar.gz" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" } }, "nixpkgs_3": { "locked": { - "lastModified": 1746152631, - "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", + "lastModified": 1748662220, + "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", + "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", "type": "github" }, "original": { @@ -748,16 +930,32 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746314326, - "narHash": "sha256-2xqKEdmbFttKUwIxZgQAOG24rNqVvJ7c3LmA+ZnvWlc=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1747728033, + "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0eb56ece14bc2e4301f756c342356ceceb90b6f9", + "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -768,16 +966,17 @@ "gen-luarc": "gen-luarc", "mini-nvim": "mini-nvim", "neovim-nightly-overlay": "neovim-nightly-overlay_2", - "nixpkgs": "nixpkgs_4", - "nixpkgs-uns": "nixpkgs-uns", - "nvim-orgmode": "nvim-orgmode" + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-uns": "nixpkgs-uns" }, "locked": { - "lastModified": 1747518373, - "narHash": "sha256-+D8K0ex5Y6UCFhCNK3cbUM5gIqf/QrwvQXPpXdWV7q0=", + "lastModified": 1748846777, + "narHash": "sha256-tx/SXqbRL6E5pSSBWZgh1e9m85P/lveKTYkb583IEOQ=", "owner": "iofq", "repo": "nvim.nix", - "rev": "f47fc0f76f6b9a520b2b3c059c773a81589f0b0b", + "rev": "ee647f4338a07d5837479050a6b98b170a283dde", "type": "github" }, "original": { @@ -786,25 +985,9 @@ "type": "github" } }, - "nvim-orgmode": { - "flake": false, - "locked": { - "lastModified": 1747057841, - "narHash": "sha256-mLT3XnsRyG+ZldB9NrR9tjmaznRAISBsdVTVPSjhj0A=", - "owner": "nvim-orgmode", - "repo": "orgmode", - "rev": "8ff03c75f3d808e3ea1765b7aba0fb4783a5a83f", - "type": "github" - }, - "original": { - "owner": "nvim-orgmode", - "repo": "orgmode", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "gitignore": "gitignore_4", "nixpkgs": [ "nixpkgs" @@ -827,11 +1010,12 @@ "root": { "inputs": { "deploy-rs": "deploy-rs", + "determinate": "determinate", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "nvim": "nvim", "pre-commit-hooks": "pre-commit-hooks", "sops-nix": "sops-nix", @@ -846,11 +1030,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -911,11 +1095,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { @@ -933,11 +1117,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1747469671, + "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "type": "github" }, "original": { @@ -953,11 +1137,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8e5234c..d31fb8c 100755 --- a/flake.nix +++ b/flake.nix @@ -25,12 +25,14 @@ }; nvim = { url = "github:iofq/nvim.nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; }; outputs = { self, diff --git a/home-manager/shared/programs/shell/default.nix b/home-manager/shared/programs/shell/default.nix index 1a81ab6..cef17da 100755 --- a/home-manager/shared/programs/shell/default.nix +++ b/home-manager/shared/programs/shell/default.nix @@ -5,8 +5,7 @@ imports = [ ./tmux.nix ./git.nix - ./gpg.nix - ./fish.nix + ./fish ]; home = { packages = with pkgs; [ @@ -83,4 +82,23 @@ enableBashIntegration = true; nix-direnv.enable = true; }; + programs.gpg = { + enable = true; + settings = { + pinentry-mode = "loopback"; + }; + }; + services.gpg-agent = { + enable = true; + enableSshSupport = true; + extraConfig = '' + allow-loopback-pinentry + ''; + }; + programs = { + nix-index = { + enableBashIntegration = false; + enableFishIntegration = true; + }; + }; } diff --git a/home-manager/shared/programs/shell/fish.nix b/home-manager/shared/programs/shell/fish.nix deleted file mode 100644 index 2b26238..0000000 --- a/home-manager/shared/programs/shell/fish.nix +++ /dev/null @@ -1,103 +0,0 @@ -{pkgs, host, ...}: { - programs.fish = { - enable = true; - interactiveShellInit = '' - set fish_greeting # Disable greeting - set show_startup_tips false - set -U tide_right_prompt_items status\x1ecmd_duration\x1etime - ''; - shellInit = " - fish_add_path /usr/local/go/bin - fish_add_path ~/go/bin - fish_add_path ~/.local/bin - set -gx MANPAGER 'nvim +Man!' - set -gx EDITOR 'nvim' - set -gx _JAVA_AWT_WM_NONREPARENTING 1 - set -gx NIX_FLAKE '/home/e/dev/nix' - "; - plugins = [ - { - name = "fzf"; - inherit (pkgs.fishPlugins.fzf-fish) src; - } - { - name = "puffer"; - inherit (pkgs.fishPlugins.puffer) src; - } - ]; - functions = { - nix-shell = { - wraps = "nix-shell"; - body = '' - command nix-shell $argv --command "fish" - ''; - }; - nix = { - wraps = "nix"; - body = '' - if status is-interactive - and test (count $argv) = 1 -a "$argv[1]" = develop - nix develop --command (status fish-path) - else - command nix $argv - end - ''; - }; - fish_jj_prompt = { - body = '' - if not command -sq jj - return 1 - end - - if not jj root &>/dev/null - return 1 - end - - # Generate prompt - set -l info "$( - jj log --ignore-working-copy --no-graph --color=always --revisions=@ --template " - separate( - ' ', - self.change_id().shortest(), - bookmarks.join(', '), - if(conflict, label('conflict', '×')), - if(empty, label('empty', '(empty)')), - if(divergent, label('divergent', '(divergent)')), - if(hidden, label('hidden', '(hidden)')), - ) - " - )" - or return 1 - - if test -n $info - printf ' (jj: %s)' $info - else - return 1 - end - ''; - }; - fish_vcs_prompt = { - body = '' - fish_jj_prompt $argv - or fish_git_prompt $argv - or fish_hg_prompt $argv - or fish_fossil_prompt $argv - ''; - }; - }; - shellAbbrs = { - g = "git"; - k = "kubectl"; - }; - shellAliases = { - ":q" = "exit"; - hms = "home-manager switch --flake $NIX_FLAKE#${host.username}"; - rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}"; - mpv = "mpv --no-keepaspect-window"; - cat = "bat -pp"; - tcd = "cd $(mktemp -d)"; - docker = "nerdctl"; - vimdiff = "nvim -d"; - }; - }; -} diff --git a/home-manager/shared/programs/shell/fish/default.nix b/home-manager/shared/programs/shell/fish/default.nix new file mode 100644 index 0000000..c6014d1 --- /dev/null +++ b/home-manager/shared/programs/shell/fish/default.nix @@ -0,0 +1,38 @@ +{pkgs, host, ...}: { + programs.fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting # Disable greeting + set show_startup_tips false + ''; + shellInit = " + fish_add_path /usr/local/go/bin + fish_add_path ~/go/bin + fish_add_path ~/.local/bin + set -gx MANPAGER 'nvim +Man!' + set -gx EDITOR 'nvim' + set -gx _JAVA_AWT_WM_NONREPARENTING 1 + set -gx NIX_FLAKE '/home/e/dev/nix' + "; + plugins = [ + {name = "fzf"; inherit (pkgs.fishPlugins.fzf-fish) src;} + {name = "puffer"; inherit (pkgs.fishPlugins.puffer) src;} + ]; + functions = import ./functions.nix; + shellAbbrs = { + g = "git"; + k = "kubectl"; + }; + shellAliases = { + ":q" = "exit"; + hms = "home-manager switch --flake $NIX_FLAKE#${host.username}"; + rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}"; + mpv = "mpv --no-keepaspect-window"; + cat = "bat -pp"; + tcd = "cd $(mktemp -d)"; + docker = "nerdctl"; + vimdiff = "nvim -d"; + ls = "eza"; + }; + }; +} diff --git a/home-manager/shared/programs/shell/fish/functions.nix b/home-manager/shared/programs/shell/fish/functions.nix new file mode 100644 index 0000000..3c8e00d --- /dev/null +++ b/home-manager/shared/programs/shell/fish/functions.nix @@ -0,0 +1,60 @@ +{ + nix-shell = { + wraps = "nix-shell"; + body = '' + command nix-shell $argv --command "fish" + ''; + }; + nix = { + wraps = "nix"; + body = '' + if status is-interactive + and test (count $argv) = 1 -a "$argv[1]" = develop + nix develop --command (status fish-path) + else + command nix $argv + end + ''; + }; + fish_jj_prompt = { + body = '' + if not command -sq jj + return 1 + end + + if not jj root &>/dev/null + return 1 + end + + # Generate prompt + set -l info "$( + jj log --ignore-working-copy --no-graph --color=always --revisions=@ --template " + separate( + ' ', + self.change_id().shortest(), + bookmarks.join(', '), + if(conflict, label('conflict', '×')), + if(empty, label('empty', '(empty)')), + if(divergent, label('divergent', '(divergent)')), + if(hidden, label('hidden', '(hidden)')), + ) + " + )" + or return 1 + + if test -n $info + printf ' (jj: %s)' $info + else + return 1 + end + ''; + }; + fish_vcs_prompt = { + body = '' + fish_jj_prompt $argv + or fish_git_prompt $argv + or fish_hg_prompt $argv + or fish_fossil_prompt $argv + ''; + }; +} diff --git a/home-manager/shared/programs/shell/git.nix b/home-manager/shared/programs/shell/git.nix index 7341567..bcccefb 100755 --- a/home-manager/shared/programs/shell/git.nix +++ b/home-manager/shared/programs/shell/git.nix @@ -19,9 +19,14 @@ }; extraConfig.pull.rebase = true; }; + + home.packages = [ pkgs.watchman ]; programs.jujutsu = { enable = true; settings = { + core = { + fsmonitor = "watchman"; + }; user = { email = "cjriddz@protonmail.com"; name = "iofq"; @@ -29,12 +34,21 @@ operation = { username = "iofq"; }; + signing = { + behavior = "own"; + backend = "gpg"; + key = "cjriddz@protonmail.com"; + }; ui = { default-command = ["log"]; conflict-marker-style = "git"; merge-editor = "vimdiff"; diff-editor = "diffview"; diff.format = "git"; + paginate = "never"; + movement = { + edit = true; + }; }; merge-tools.vimdiff = { program = "nvim"; @@ -65,8 +79,6 @@ }; aliases = { tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@"]; - ne = ["next" "--edit"]; - be = ["edit" "-r" "@-"]; }; }; }; diff --git a/home-manager/shared/programs/shell/gpg.nix b/home-manager/shared/programs/shell/gpg.nix deleted file mode 100644 index 61bc3a4..0000000 --- a/home-manager/shared/programs/shell/gpg.nix +++ /dev/null @@ -1,15 +0,0 @@ -_: { - programs.gpg = { - enable = true; - settings = { - pinentry-mode = "loopback"; - }; - }; - services.gpg-agent = { - enable = true; - enableSshSupport = true; - extraConfig = '' - allow-loopback-pinentry - ''; - }; -} diff --git a/home-manager/shared/wayland/audio/default.nix b/home-manager/shared/wayland/audio/default.nix deleted file mode 100755 index 1656e75..0000000 --- a/home-manager/shared/wayland/audio/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - pulseaudio - pulsemixer - alsa-utils - ]; -} diff --git a/home-manager/shared/wayland/default.nix b/home-manager/shared/wayland/default.nix index 60e350a..fd1cc19 100644 --- a/home-manager/shared/wayland/default.nix +++ b/home-manager/shared/wayland/default.nix @@ -6,17 +6,19 @@ imports = [ ./alacritty ./hyprland - ./xdg - ./audio ]; home.packages = with pkgs; [ + pulseaudio + pulsemixer + alsa-utils wlogout wf-recorder wdisplays wl-clipboard gammastep sway-contrib.grimshot + xdg-utils ]; home.sessionVariables = { MOZ_DBUS_REMOTE = 1; @@ -66,6 +68,30 @@ } ]; }; + xdg = { + configFile."mimeapps.list".force = true; + mime.enable = true; + mimeApps = { + enable = true; + defaultApplications = { + "x-scheme-handler/http" = "librewolf.desktop"; + "x-scheme-handler/https" = "librewolf.desktop"; + "x-scheme-handler/chrome" = "librewolf.desktop"; + "video/mp4" = "librewolf.desktop"; + "video/mkv" = "librewolf.desktop"; + "image/jpeg" = "librewolf.desktop"; + "image/jpg" = "librewolf.desktop"; + "image/png" = "librewolf.desktop"; + "application/epub" = "librewolf.desktop"; + "application/pdf" = "librewolf.desktop"; + }; + associations.added = { + "x-scheme-handler/http" = "librewolf.desktop"; + "x-scheme-handler/https" = "librewolf.desktop"; + "x-scheme-handler/chrome" = "librewolf.desktop"; + }; + }; + }; services.mako.enable = true; home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/DMZ-Black"; } diff --git a/home-manager/shared/wayland/hyprland/default.nix b/home-manager/shared/wayland/hyprland/default.nix index 6a07fa0..2819904 100644 --- a/home-manager/shared/wayland/hyprland/default.nix +++ b/home-manager/shared/wayland/hyprland/default.nix @@ -33,7 +33,7 @@ "windows, 1, 3, default, popin" "windowsOut, 1, 3, default, popin" "fade, 1, 3, default" - "workspaces, 1, 2, default, fade" + "workspaces, 1, 3, default, fade" ]; }; master = { diff --git a/home-manager/shared/wayland/xdg/default.nix b/home-manager/shared/wayland/xdg/default.nix deleted file mode 100755 index 916bd70..0000000 --- a/home-manager/shared/wayland/xdg/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - xdg-utils - ]; - xdg = { - configFile."mimeapps.list".force = true; - mime.enable = true; - mimeApps = { - enable = true; - defaultApplications = { - "x-scheme-handler/http" = "librewolf.desktop"; - "x-scheme-handler/https" = "librewolf.desktop"; - "x-scheme-handler/chrome" = "librewolf.desktop"; - "video/mp4" = "librewolf.desktop"; - "video/mkv" = "librewolf.desktop"; - "image/jpeg" = "librewolf.desktop"; - "image/jpg" = "librewolf.desktop"; - "image/png" = "librewolf.desktop"; - "application/epub" = "librewolf.desktop"; - "application/pdf" = "librewolf.desktop"; - }; - associations.added = { - "x-scheme-handler/http" = "librewolf.desktop"; - "x-scheme-handler/https" = "librewolf.desktop"; - "x-scheme-handler/chrome" = "librewolf.desktop"; - }; - }; - }; -} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 6ee0a10..5cd7a51 100755 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -30,9 +30,13 @@ host, nix = { settings = { auto-optimise-store = true; - substituters = ["https://nix-community.cachix.org"]; + substituters = [ + "https://nix-community.cachix.org" + "https://install.determinate.systems" + ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM=" ]; trusted-users = [host.username]; experimental-features = ["nix-command" "flakes"]; diff --git a/nixos/consensus/backups.nix b/nixos/consensus/backups.nix new file mode 100644 index 0000000..d65e2dd --- /dev/null +++ b/nixos/consensus/backups.nix @@ -0,0 +1,30 @@ +{config, ...}: { + sops = { + defaultSopsFile = ../../secrets/restic.yaml; + secrets = { + "b2-immich/env" = {}; + "b2-immich/repo" = {}; + "b2-immich/password" = {}; + }; + }; + services.restic.backups = { + b2-immich = { + initialize = true; + environmentFile = config.sops.secrets."b2-immich/env".path; + repositoryFile = config.sops.secrets."b2-immich/repo".path; + passwordFile = config.sops.secrets."b2-immich/password".path; + + paths = [ + "/rice/immich" + ]; + timerConfig = { + OnCalendar = "06:00"; + }; + pruneOpts = [ + "--keep-daily 14" + "--keep-monthly 6" + "--keep-yearly 1" + ]; + }; + }; +} diff --git a/nixos/consensus/configuration.nix b/nixos/consensus/configuration.nix index 404bd3d..2ccfe67 100644 --- a/nixos/consensus/configuration.nix +++ b/nixos/consensus/configuration.nix @@ -1,11 +1,11 @@ {lib, pkgs, config, ...}: { imports = [ ./hardware-configuration.nix + ./backups.nix ]; sops = { - defaultSopsFile = ../../secrets/cf-acme.yaml; secrets = { - "env" = {}; + "env" = { sopsFile = ../../secrets/cf-acme.yaml; }; }; }; documentation = { @@ -91,11 +91,11 @@ 2022 6443 25565 - 30001 + 9001 30303 ]; allowedUDPPorts = [ - 30001 + 9001 30303 ]; logRefusedConnections = true; diff --git a/nixos/default.nix b/nixos/default.nix index 22922a1..6f1beb8 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -8,6 +8,7 @@ defaultModules = [ inputs.sops-nix.nixosModules.sops inputs.nix-index-database.nixosModules.nix-index + inputs.determinate.nixosModules.default ]; in { t14 = inputs.nixpkgs.lib.nixosSystem { diff --git a/nixos/t14/configuration.nix b/nixos/t14/configuration.nix index 20ddc73..27e15fa 100755 --- a/nixos/t14/configuration.nix +++ b/nixos/t14/configuration.nix @@ -120,20 +120,6 @@ in { }; }; ratbagd.enable = true; # Logitech - keyd = { - enable = true; - keyboards = { - default = { - ids = ["*"]; - settings = { - main = { - pause = "timeout(esc, 150, space)"; - scrolllock = "layer(shift)"; - }; - }; - }; - }; - }; udev.packages = [ pkgs.ledger-udev-rules pkgs.trezor-udev-rules diff --git a/secrets/restic.yaml b/secrets/restic.yaml index 5067760..33ed95b 100644 --- a/secrets/restic.yaml +++ b/secrets/restic.yaml @@ -9,11 +9,11 @@ b2-home: env: ENC[AES256_GCM,data:ApCwXSQ1/pJ5C0La995jT50ZAvA0vgNrJ5R90b95IDt2CFSeKxFQiQs3hyrlI+Eor0igT0ZmaSjJ3w1GynNyT47wqjDxh6ZlzS0yhecyCckfUrn0mTK7Z/4k,iv:Bw2CzibZ+LxzkFIPJZH6JWRsd4F1f//C/6/TIsrMJOA=,tag:89jVSsy9JkurPiC3EKZfmA==,type:str] b2-photos-s3: env: ENC[AES256_GCM,data:m25/0USqeg+rmeD9pPQaR2nQGami50CDeQzySyxQeL5Eb+//KbfPdCyzvgOJBXBR7P7wKU4K+kuPqKfk0wrH71rgSzScg7KX0p1yNFqSs26tV+O9ctX9JeFmA9dRXrt/RA==,iv:0SKtOa/bg7Q/GRHPcoxxjdGY/+SITQmKqDG0r5JR4zM=,tag:3O2yikVOyU9OE+sPv9osSg==,type:str] +b2-immich: + password: ENC[AES256_GCM,data:c4mi0hfLnI+QMQibW0feTBo7vK7HgYGWExPWtxFN0uf0TeiN9A+u31yRpCzF0cdiQw==,iv:IbtWLSEZMgaRAMA/nHhFBzfJho8E/kk+EaMtWZHuvuM=,tag:vFdedNL14B3Wl8yFHZ9fZQ==,type:str] + repo: ENC[AES256_GCM,data:fgB/jLZpn8mUotSEhE0=,iv:rcGy9xV9OgQn6Q0zB5UkB49EffY+OL9GtlCvxSgIg8o=,tag:5BSUtw44Z1xZipXCraELBQ==,type:str] + env: ENC[AES256_GCM,data:lwnoWd5pEmhcQcMExDWZ2BCRHEuYBEB9/F5vG9dNUQ9vqNLYDsehk4bwn+gaxQjwnxxucA4I4S+24qjWZaEoGyrf/dkxKVsP17TkjQ5BjQFAWOLn1npvcL3s,iv:ojsCnAMOSDT9Ua+H5O48k9G39BjHC8AFGuQFYCQBPG8=,tag:ojgrh847HLTUOjDoV61wlg==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age14e2d2y8e2avzfrsyxg9dudxd36svm24t7skw6e969n0c42znlp3shffdtg enc: | @@ -33,8 +33,7 @@ sops: MXhYMkl5TTZVcDlNWUs4M3ZieDVRa1kKN3mh6jxui1a8i0VJJQmrAjhAhQkP4VcP IpiYzY9IwIZu6VlC7qEuh3eeVq+v3SYcTmCh6/gwpmeDAjnL6hD5sA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-05T06:23:15Z" - mac: ENC[AES256_GCM,data:9TcJCbjPLNBckIG2krPMI7EUxLwrRpvN0eXVgpjLqUCewO2dFgAR9abvARnxkEC58bJWw/l9zwGKvztfRFl7vBTzLAAEdsrfpcLVA0dF2kP5o7VEsNJwzaEVWr7jobO/OXU/lPo9In2f1hiPulTwwqG/pHZoiDPnzs+l0fsVsvk=,iv:UCYh6SBMidzwHHZPwyWJupBSTVjDg7TQ1LbyaNzn034=,tag:kQFXik8lQmNJ348K/Fyb5A==,type:str] - pgp: [] + lastmodified: "2025-06-03T03:18:04Z" + mac: ENC[AES256_GCM,data:zJSCaqp1m0u3fYUsLRz+asYeCqqZ4os0UdElBYrootGMmFjQ9j+X+As4np6CP44o4sWmcyePc+SKzW316wsFQObnvP+eIc+SFNjvGbw4oZPlRdSr9otbVOhPeEaWWCoONQgZ0FAbhbcsF2V3qvjmfrekd8yu3bcaH6LNZA2gT9A=,iv:Rq733/8bE7iS42C4tecN3JjyIHSY8lbCeuRKQY6TKb8=,tag:lcrVpglZyChUQRJ3jtwwpw==,type:str] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.10.2