add sj-bm-hostkey0, bump steveej-t14, rework NIX_PATH and zsh

2023-11-23 17:14:15 +01:00 · 2023-11-23 17:14:15 +01:00 · 47173396fe
commit 47173396fe
parent ceda614fcd
13 changed files with 156 additions and 575 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -3,6 +3,7 @@
 # Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml
 # for a more complex example.

+# use `ssh-keyscan <IP> | ssh-to-age` to get the age key for a remote machine
 keys:
  - &steveej 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B
  - &steveej-t14 age17jxphuql70wjkd84azn62ltx9ky69hyvkac23lm8f2j92lznf9hseqq0vl
@ -13,6 +14,8 @@ keys:
  - &srv0-dmz0 age13cyvxrd28j68f97q2dwsn62q5dy8tdxtq86ql2dxv2ncwfrf63dsmkj7n3
  # - &router0-dmz0 age1jetxwpmd9hc4crkjtrdle2qxn9dlq7vcmqhfslv0vlxctrk4u3xq8hcvkz
  - &router0-dmz0 age1k7cejd9tqz6a3expd63wkn7kmeawhhrp9vy5vevhjn6eavhdwywqeh7j86
+  - &sj-bm-hostkey0 age19dh6zurkx4xv6dx9lvjw0hychjjqvpcf6aq2s2y8srdk6g82qctqqkmu3v
+
 creation_rules:
  - path_regex: ^(.+/|)secrets/[^/]+$
    key_groups:
@ -27,6 +30,7 @@ creation_rules:
      - *router0-dmz0

      - *sj-vps-htz0
+      - *sj-bm-hostkey0
  - path_regex: ^secrets/steveej-t14/.+$
    key_groups:
    - pgp:
@ -63,3 +67,9 @@ creation_rules:
      - *steveej
      age:
      - *sj-vps-htz0
+  - path_regex: ^secrets/sj-bm-hostkey0/.+$
+    key_groups:
+    - pgp:
+      - *steveej
+      age:
+      - *sj-bm-hostkey0
--- a/flake.nix
+++ b/flake.nix
@ -108,6 +108,7 @@
          "router0-dmz0"

          "sj-vps-htz0"
+          "sj-bm-hostkey0"
        ]);

      # this makes nixos-anywhere work
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@ -300,7 +300,8 @@ in {
      # shotcut
      # openshot-qt
      # introduces python: screenkey
-      avidemux
+      
+      # avidemux # broken
      handbrake

      pkgsUnstableSmall.ledger-live-desktop
--- a/nix/home-manager/configuration/text-minimal.nix
+++ b/nix/home-manager/configuration/text-minimal.nix
@ -2,6 +2,7 @@
  imports = [
    ../profiles/common.nix
    ../programs/neovim.nix
+    # ../programs/zsh.nix
  ];
  
  home.packages = with pkgs; [
--- a/nix/home-manager/profiles/sway-desktop.nix
+++ b/nix/home-manager/profiles/sway-desktop.nix
@ -40,19 +40,19 @@ in {

  nixpkgs.overlays = [
    (final: prev: {
-      xdg-desktop-portal-wlr' = repoFlakeInputs'.nixpkgs-wayland.packages.xdg-desktop-portal-wlr;
-      xdg-desktop-portal-wlr-gtk' = repoFlakeInputs'.nixpkgs-wayland.packages.xdg-desktop-portal-wlr-gtk;
-      sway-unwrapped = let
-        fixed_wlroots = prev.wlroots_0_16.overrideAttrs (old: {
-          patches = [
-            (builtins.fetchurl {
-              sha256 = "05h9xzicz3fccskg2hbqnw2qh4bm7mwi70c4m00y87w5yhj9gxps";
-              url = "https://gist.githubusercontent.com/steveej/1d8c96ed2fdb3d9ddd0344ca5136073f/raw/d6a097a452b950865b554587db606e718d99c572/fix-wlroots.patch";
-            })
-          ];
-        });
-      in
-        prev.sway-unwrapped.override {wlroots_0_16 = fixed_wlroots;};
+      # xdg-desktop-portal-wlr' = repoFlakeInputs'.nixpkgs-wayland.packages.xdg-desktop-portal-wlr;
+      # xdg-desktop-portal-wlr-gtk' = repoFlakeInputs'.nixpkgs-wayland.packages.xdg-desktop-portal-wlr-gtk;
+      # sway-unwrapped = let
+      #   fixed_wlroots = prev.wlroots_0_16.overrideAttrs (old: {
+      #     patches = [
+      #       (builtins.fetchurl {
+      #         sha256 = "05h9xzicz3fccskg2hbqnw2qh4bm7mwi70c4m00y87w5yhj9gxps";
+      #         url = "https://gist.githubusercontent.com/steveej/1d8c96ed2fdb3d9ddd0344ca5136073f/raw/d6a097a452b950865b554587db606e718d99c572/fix-wlroots.patch";
+      #       })
+      #     ];
+      #   });
+      # in
+      #   prev.sway-unwrapped.override {wlroots_0_16 = fixed_wlroots;};
    })
  ];

--- a/nix/home-manager/programs/vscode/default.nix
+++ b/nix/home-manager/programs/vscode/default.nix
@ -1,482 +1,24 @@
 {pkgs, ...}: let
-  packagedExtensions = with pkgs.vscode-extensions; [
-    # bbenoist.Nix
-    ms-vscode-remote.remote-ssh
-
-    vscodevim.vim
-  ];
-
-  marketPlaceExtensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-    # {
-    #   name = "vim";
-    #   publisher = "vscodevim";
-    #   version = "1.17.1";
-    #   sha256 = "10f8jz52gr6k2553awa66m006wszj9z2rnshsic6h2aawxiz3zq1";
-    # }
-    # {
-    #   name = "remote-ssh-edit";
-    #   publisher = "ms-vscode-remote";
-    #   version = "0.56.0";
-    #   sha256 = "1gy03ff2xqg7q3y4j47z2l94x5gbw0mjd5h4cl3n0q3iaswk1c1r";
-    # }
-    {
-      name = "Theme-NaturalContrast-With-HC";
-      publisher = "74th";
-      version = "1.0.0";
-      sha256 = "1wxwk059znkflip0c8hyqdfq0h15n4idmff4bnnfdggiqjwhr5rm";
-    }
-    {
-      name = "markdown-toc";
-      publisher = "AlanWalk";
-      version = "1.5.6";
-      sha256 = "0hh38i2dpmrm2akcd4jkxchp6b374m5jzcqm1jqqmkqjmlig7qm5";
-    }
-    {
-      name = "Paper-tmTheme";
-      publisher = "DiryoX";
-      version = "0.4.0";
-      sha256 = "0l8hgbwwg87ysfb22rvwgmkk91i4vjd0kgi30c1bn26bm2pd1gw0";
-    }
-    {
-      name = "Monokai-Polished";
-      publisher = "Mit";
-      version = "0.3.1";
-      sha256 = "11h7sfwp9ikwc8z6bkyxk1678ymfpff8i2p876b208yrq8dy2kr1";
-    }
-    {
-      name = "dot";
-      publisher = "Stephanvs";
-      version = "0.0.1";
-      sha256 = "0rq0wvnbcggg4zb4swxym77knfjma0v9lwf3x45p22qsqx2crvgf";
-    }
-    {
-      name = "rust-snippets";
-      publisher = "ZakCodes";
-      version = "0.0.1";
-      sha256 = "152i23mh8j2l26zpwid3hllxc2abkhr3g939rvxk8bry137vryy2";
-    }
-    {
-      name = "better-comments";
-      publisher = "aaron-bond";
-      version = "2.1.0";
-      sha256 = "0kmmk6bpsdrvbb7dqf0d3annpg41n9g6ljzc1dh0akjzpbchdcwp";
-    }
-    {
-      name = "vscode-icalendar";
-      publisher = "af4jm";
-      version = "1.0.1";
-      sha256 = "0g15f2595ayy9ch4f2ccd8prc51q1mwslilk8sk2ldsmdksaya79";
-    }
-    {
-      name = "hugofy";
-      publisher = "akmittal";
-      version = "0.1.1";
-      sha256 = "02rjwmy7z4qfxws8lgdki53q4b2hjklxn2nlxx3w04kahr759dlg";
-    }
-    {
-      name = "asciidoctor-vscode";
-      publisher = "asciidoctor";
-      version = "2.8.4";
-      sha256 = "0j019vwmd83mbc75kfcqzmpvqzsp3s595cgh6n9978k9q0zjrqad";
-    }
-    {
-      name = "markdown-preview-github-styles";
-      publisher = "bierner";
-      version = "0.1.6";
-      sha256 = "1plj6a1hgbhb740zbw4pbnk7919cx1s6agf5xiiqbb9485x2pqiw";
-    }
-    {
-      name = "made-of-code";
-      publisher = "brian-yu";
-      version = "0.0.5";
-      sha256 = "1cmw63vrpzxv8vkgq674xa2wqqag0a8spr623ngi87925f17p965";
-    }
-    {
-      name = "better-toml";
-      publisher = "bungcip";
-      version = "0.3.2";
-      sha256 = "08lhzhrn6p0xwi0hcyp6lj9bvpfj87vr99klzsiy8ji7621dzql3";
-    }
-    {
-      name = "tabulous";
-      publisher = "bwildeman";
-      version = "1.2.0";
-      sha256 = "0hbp345i19ncvn1v792nr257gmw0nz09nhjniiypnzvz9wszw2j9";
-    }
-    {
-      name = "bracket-pair-colorizer";
-      publisher = "CoenraadS";
-      version = "1.0.61";
-      sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652";
-    }
-    {
-      name = "mustache";
-      publisher = "dawhite";
-      version = "1.1.1";
-      sha256 = "1j8qn5grg8v3n3v66d8c77slwpdr130xzpv06z1wp2bmxhqsck1y";
-    }
-    {
-      name = "vscode-nomnoml";
-      publisher = "doctorrustynelson";
-      version = "0.3.0";
-      sha256 = "07nr6n5ai8m6rap8av47mqi3vv6zchymiqfw8jlbl4hsryszyr43";
-    }
-    {
-      name = "gitlens";
-      publisher = "eamodio";
-      version = "11.0.5";
-      sha256 = "1fi8j5r6cd82a50hv2lwzqnvyvhxf9waamkviyh0wyqi5i1k4q88";
-    }
-    {
-      name = "monokai-light";
-      publisher = "ethansugar";
-      version = "0.2.1";
-      sha256 = "1xn74arpv58hwdywaxvv9xhljl23wsqdpyfrgn9nvd29gsiz71w0";
-    }
-    {
-      name = "Theme-Monokai-Contrast";
-      publisher = "gerane";
-      version = "0.0.5";
-      sha256 = "1m1n1izdjgng0q3yljccwjxj0s60p5nfw3hlw7hb467a1wz479pm";
-    }
-    {
-      name = "Theme-snappy-light";
-      publisher = "gerane";
-      version = "0.0.5";
-      sha256 = "0syrm921l4lka6dmg258c2zi0a758acvcs8y0qm0kjim7h7xxf0w";
-    }
-    {
-      name = "vscode-pull-request-github";
-      publisher = "GitHub";
-      version = "0.21.3";
-      sha256 = "0p03v6y1gh62jby74vkhi897mzj8dg9xb561v0b99x81r9zhwqw0";
-    }
-    {
-      name = "go";
-      publisher = "golang";
-      version = "0.19.0";
-      sha256 = "1xr2c4xn0w68fdcbm8d2wqfb9dxf03w38367ghycrzmz2p4syr98";
-    }
-    {
-      name = "terraform";
-      publisher = "hashicorp";
-      version = "2.3.0";
-      sha256 = "0696q8nr6kb5q08295zvbqwj7lr98z18gz1chf0adgrh476zm6qq";
-    }
-    {
-      name = "bonsai";
-      publisher = "hawkeyegold";
-      version = "1.4.0";
-      sha256 = "0r7bxx1lgbg6p97xwd2wr8j7slz720a1v6vzpd0fhcq83vqzkl89";
-    }
-    {
-      name = "live-html-previewer";
-      publisher = "hdg";
-      version = "0.3.0";
-      sha256 = "0hv5plh44q97355j5la83r8hjsxpv9d173mba34xr4p82a3pcq5p";
-    }
-    {
-      name = "yuml";
-      publisher = "JaimeOlivares";
-      version = "3.5.1";
-      sha256 = "01phwj8kn2zmzpjk97wacnc8iiby0szv40b1030fkcm3szafnya0";
-    }
-    {
-      name = "latex-workshop";
-      publisher = "James-Yu";
-      version = "8.14.0";
-      sha256 = "12bh2gpmak7vgzhjnvk2hw0yqm6wkd7vsm4ki4zbqa6lpriscjyi";
-    }
-    {
-      name = "plantuml";
-      publisher = "jebbs";
-      version = "2.13.16";
-      sha256 = "0672x0a1c9yk0g4vka40f4amgxir2bs25zg6qsims9plj0x2s4si";
-    }
-    {
-      name = "tasks-chooser";
-      publisher = "jeremyfa";
-      version = "0.3.0";
-      sha256 = "0bq80wv7zf94cgn94ll3jj68z35p13r0zw5by62dnlnj1sv7dghi";
-    }
-    {
-      name = "asciidoctor-vscode";
-      publisher = "joaompinto";
-      version = "2.8.0";
-      sha256 = "06nx627fik3c3x4gsq01rj0v59ckd4byvxffwmmigy3q2ljzsp0x";
-    }
-    {
-      name = "contrast-theme";
-      publisher = "johndugan";
-      version = "1.1.10";
-      sha256 = "0hib85318940ajfbzqrpgqh4jr39w18aq6babargbf64yxg94mbw";
-    }
-    {
-      name = "theme-dark-plus-contrast";
-      publisher = "k3a";
-      version = "0.1.101";
-      sha256 = "137kq6i6xn394msjrhj7v6c8shrvw9yf8i01mf4yl4aan2bw3419";
-    }
-    {
-      name = "vscode-gist";
-      publisher = "kenhowardpdx";
-      version = "3.0.3";
-      sha256 = "033iry115hbd5jbdr04frbrcgfpfnsc2z551nlfsaczbg4j9dydw";
-    }
-    {
-      name = "quick-open";
-      publisher = "leizongmin";
-      version = "1.1.0";
-      sha256 = "03avjgkvl2w51f0lvvfksa6lxqb4i9jgz2c74hw686yaydj8mfsp";
-    }
-    {
-      name = "rainbow-csv";
-      publisher = "mechatroner";
-      version = "1.7.1";
-      sha256 = "0w5mijs4ll5qjkpyw7qpn1k40pq8spm0b3q72x150ydbcini5hxw";
-    }
-    {
-      name = "openapi-lint";
-      publisher = "mermade";
-      version = "1.2.0";
-      sha256 = "0q81ifgr211apymbs21y0l3x8n324k6mh7p8kykz2xz38cslyq49";
-    }
-    {
-      name = "swagger-doc-viewer";
-      publisher = "mimarec";
-      version = "1.0.4";
-      sha256 = "1vvqwmfav6c2r1xkyfczm564bi2cpa9nklj35w3h3hrp4f6dnvpx";
-    }
-    {
-      name = "vscode-clang";
-      publisher = "mitaki28";
-      version = "0.2.3";
-      sha256 = "0xbg2frb4dxv7zl43gi25w2mkkh4xq2aidcf5i8b4imys9h720yr";
-    }
-    {
-      name = "prettify-json";
-      publisher = "mohsen1";
-      version = "0.0.3";
-      sha256 = "1spj01dpfggfchwly3iyfm2ak618q2wqd90qx5ndvkj3a7x6rxwn";
-    }
-    {
-      name = "vscode-docker";
-      publisher = "ms-azuretools";
-      version = "1.8.1";
-      sha256 = "08691mwb3kgmk5fnjpw1g3a5i7qwalw1yrv2skm519wh62w6nmw8";
-    }
-    {
-      name = "python";
-      publisher = "ms-python";
-      version = "2020.11.371526539";
-      sha256 = "0iavy4c209k53jkqsbhsvibzjj3fjxa500rv72fywgb2vxsi9fc3";
-    }
-    {
-      name = "jupyter";
-      publisher = "ms-toolsai";
-      version = "2020.11.372831992";
-      sha256 = "0r39xqrbkzcfkz6rca039s87ibx79a983y8lbiglhkmw3bp4p658";
-    }
-    # fails to download C/C++ tools
-    # {
-    #   name = "cpptools";
-    #   publisher = "ms-vscode";
-    #   version = "1.1.2";
-    #   sha256 = "09z1vrshvwimdrpsnfs4lyzca2qixp3h85xib8jf2fpxdjl3r5vg";
-    # }
-    {
-      name = "vscode-quick-open-create";
-      publisher = "nocksock";
-      version = "0.6.0";
-      sha256 = "0ipkjm74xpx44h130rmbnkjwsi63kcvq6fr0b0nxqqc9aa9jk22j";
-    }
-    {
-      name = "indent-rainbow";
-      publisher = "oderwat";
-      version = "7.4.0";
-      sha256 = "1xnsdwrcx24vlbpd2igjaqlk3ck5d6jzcfmxaisrgk7sac1aa81p";
-    }
-    {
-      name = "phantypist";
-      publisher = "paulofallon";
-      version = "1.0.3";
-      sha256 = "0rsaklwsd9i25p9j82ivblkbsk5cwjm22afzc2cq5klkbz9vxg62";
-    }
-    {
-      name = "swaggitor";
-      publisher = "qnsolutions";
-      version = "0.1.1";
-      sha256 = "0dhygxawxjhm0q1nmxwwcyhnk4hm1yzadnhc5ha7amdg7gddlrc1";
-    }
-    {
-      name = "vscode-yaml";
-      publisher = "redhat";
-      version = "0.13.0";
-      sha256 = "046kdk73a5xbrwq16ff0l64271c6q6ygjvxaph58z29gyiszfkig";
-    }
-    {
-      name = "papercolor-vscode";
-      publisher = "rozbo";
-      version = "0.4.0";
-      sha256 = "0fla4dfxm6ppqgfvp9rc2izhnv0909yk3r38xmh15ald84i1jhzm";
-    }
-    {
-      name = "iferrblocks";
-      publisher = "rstuven";
-      version = "1.1.1";
-      sha256 = "0ncj1g2dqa1wwqmj27w1356f4b9nlk2narvgyjn208axfwifz1lw";
-    }
-    {
-      name = "rust";
-      publisher = "rust-lang";
-      version = "0.7.8";
-      sha256 = "039ns854v1k4jb9xqknrjkj8lf62nfcpfn0716ancmjc4f0xlzb3";
-    }
-    {
-      name = "bracket-jumper";
-      publisher = "sashaweiss";
-      version = "1.1.8";
-      sha256 = "11sj7h13yjcpd94x07wlmck7cmidk1kla00kjq7wfw2xc1143rqs";
-    }
-    {
-      name = "just";
-      publisher = "skellock";
-      version = "2.0.0";
-      sha256 = "1ph869zl757a11f8iq643f79h8gry7650a9i03mlxyxlqmspzshl";
-    }
-    {
-      name = "line-endings";
-      publisher = "steditor";
-      version = "1.0.3";
-      sha256 = "1mdybbhs771w8r9xqy1n7x2is2vhh6axkssarb2yy7gps3v81ik7";
-    }
-    {
-      name = "code-spell-checker";
-      publisher = "streetsidesoftware";
-      version = "1.10.0";
-      sha256 = "1172wcw1a1mbx8nrlnh1hyizs9abzvqmhwgc6bmp8wvxk8hk4x3i";
-    }
-    {
-      name = "code-spell-checker-german";
-      publisher = "streetsidesoftware";
-      version = "0.1.8";
-      sha256 = "117ba1m427d7nqh2p4djjswbksz1nvy2zkgdnm2iis17gzxscbmz";
-    }
-    {
-      name = "code-spell-checker-german";
-      publisher = "streetsidesoftware";
-      version = "0.1.8";
-      sha256 = "117ba1m427d7nqh2p4djjswbksz1nvy2zkgdnm2iis17gzxscbmz";
-    }
-    {
-      name = "code-spell-checker";
-      publisher = "streetsidesoftware";
-      version = "1.10.0";
-      sha256 = "1172wcw1a1mbx8nrlnh1hyizs9abzvqmhwgc6bmp8wvxk8hk4x3i";
-    }
-    {
-      name = "vscode-open-in-github";
-      publisher = "sysoev";
-      version = "1.14.0";
-      sha256 = "1whyrsckx0gikgjj1812dlsykck7cs696wz9fn4fhcishp9479hp";
-    }
-    {
-      name = "html-preview-vscode";
-      publisher = "tht13";
-      version = "0.2.5";
-      sha256 = "0k75ivigzjfq8y4xwwrgs2iy913plkwp2a68f0i4bkz9kx39wq6v";
-    }
-    {
-      name = "scrolloff";
-      publisher = "tickleforce";
-      version = "0.0.4";
-      sha256 = "1n5xcbcwdj54c9dlscd5igdbga6v9wv5j1qbhjb7p2mf7sbps3cq";
-    }
-    {
-      name = "shellcheck";
-      publisher = "timonwong";
-      version = "0.12.1";
-      sha256 = "0apvbs90mdjk5y6vy2v4azwxhdjqfypqp5d5hh9rlgxyq4m0azz2";
-    }
-    {
-      name = "sort-lines";
-      publisher = "Tyriar";
-      version = "1.9.0";
-      sha256 = "0l4wibsjnlbzbrl1wcj18vnm1q4ygvxmh347jvzziv8f1l790qjl";
-    }
-    # slow and currently not needed
-    # {
-    #   name = "vscode-lldb";
-    #   publisher = "vadimcn";
-    #   version = "1.6.0";
-    #   sha256 = "15m0idk75bvbzfxipdxwz2vpdklr15zv92h4mxxpr8db9jjr32vi";
-    # }
-    # {
-    #   name = "vim";
-    #   publisher = "vscodevim";
-    #   version = "1.17.1";
-    #   sha256 = "10f8jz52gr6k2553awa66m006wszj9z2rnshsic6h2aawxiz3zq1";
-    # }
-    {
-      name = "prettify-selected-json";
-      publisher = "vthiery";
-      version = "1.0.3";
-      sha256 = "0g2svrls7x4w75fj6rr839mrwd3sn912vn6ysiy0sasnnc55rpgb";
-    }
-    {
-      name = "debug";
-      publisher = "webfreak";
-      version = "0.25.0";
-      sha256 = "0qm2jgkj17a0ca5z21xbqzfjpi0hzxw4h8y2hm8c4kk2bnw02sh1";
-    }
-    {
-      name = "clang-format";
-      publisher = "xaver";
-      version = "1.9.0";
-      sha256 = "0bwc4lpcjq1x73kwd6kxr674v3rb0d2cjj65g3r69y7gfs8yzl5b";
-    }
-    {
-      name = "vscode-capnp";
-      publisher = "xmonader";
-      version = "1.0.0";
-      sha256 = "0z2shl6qvr3y3m5y63v69x94rzyb2cmf5046afx2yswnll6j52fc";
-    }
-    {
-      name = "plsql-language";
-      publisher = "xyz";
-      version = "1.8.2";
-      sha256 = "16xxa6w03wzd95v1cycmjvw9hfg3chvpclrn28v0qsa3lir1mxrr";
-    }
-    {
-      name = "markdown-pdf";
-      publisher = "yzane";
-      version = "1.4.4";
-      sha256 = "00cjwjwzsv3wx2qy0faqxryirr2hp60yhkrlzsk0avmvb0bm9paf";
-    }
-    {
-      name = "vscode-proto3";
-      publisher = "zxh404";
-      version = "0.5.2";
-      sha256 = "1jmmbz3i0hxq5ka4rsk07mynxh3pkh5g736d9ryv1czhnrb06lwf";
-    }
-  ];
+  marketPlaceExtensions =
+    pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+    ];
 in {
  programs.vscode = {
    enable = true;
-    package = pkgs.vscodium;
-    extensions =
-      [] ++ packagedExtensions
-      #  ++ marketPlaceExtensions
-      ;
+    # package = pkgs.vscodium;
+    extensions = with pkgs.vscode-extensions;
+      [
+        bbenoist.nix
+        vscodevim.vim
+        ms-vscode-remote.remote-ssh
+      ]
+      ++ marketPlaceExtensions;
+    mutableExtensionsDir = false;
  };

  home.packages = [pkgs.nixpkgs-fmt pkgs.alejandra];
 }
 # TODO: automate
-# rustup install stable
-# rustup component add rust-analysis --toolchain stable
-# rustup component add rust-src --toolchain stable
-# rustup component add rls --toolchain stable
 ### original list:
 # 74th.Theme-NaturalContrast-With-HC
 # AlanWalk.markdown-toc
--- a/nix/home-manager/programs/zsh.nix
+++ b/nix/home-manager/programs/zsh.nix
@ -74,8 +74,6 @@ in {
      # don't cd into directories when executed
      unsetopt AUTO_CD

-      export NIX_PATH="nixpkgs=${pkgs.path}"
-
      # print lines without termination
      setopt PROMPT_CR
      setopt PROMPT_SP
@ -92,14 +90,8 @@ in {

    plugins = [
      {
-        # will source zsh-autosuggestions.plugin.zsh
        name = "zsh-autosuggestions";
-        src = pkgs.fetchFromGitHub {
-          owner = "zsh-users";
-          repo = "zsh-autosuggestions";
-          rev = "v0.6.3";
-          sha256 = "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c";
-        };
+        src = pkgs.zsh-autosuggestions;
      }
      {
        name = "enhancd";
@ -107,8 +99,8 @@ in {
        src = pkgs.fetchFromGitHub {
          owner = "b4b4r07";
          repo = "enhancd";
-          rev = "v2.2.4";
-          sha256 = "1smskx9vkx78yhwspjq2c5r5swh9fc5xxa40ib4753f00wk4dwpp";
+          rev = "v2.5.1";
+          sha256 = "sha256-kaintLXSfLH7zdLtcoZfVNobCJCap0S/Ldq85wd3krI=";
        };
      }
      {
--- a/nix/os/devices/sj-bm-hostkey0/configuration.nix
+++ b/nix/os/devices/sj-bm-hostkey0/configuration.nix
@ -31,11 +31,23 @@ in {
      users.commonUsers = {
        enable = true;
        enableNonRoot = true;
-        # rootPasswordFile = config.sops.secrets.passwords-root.path;
      };
    }
  ];
  
+  nix.nixPath = [
+    "nixpkgs=${pkgs.path}"
+  ];
+  
+  nix.registry = {
+    nixpkgs.to = {
+      type = "path";
+      path = pkgs.path;
+    };
+  };
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
  boot = {
    kernel = {
      sysctl = {
@ -104,7 +116,7 @@ in {
    };
  };

-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";

  boot.kernelPackages = pkgs.linuxPackages_latest;
  boot.initrd.includeDefaultModules = true;
@ -119,4 +131,17 @@ in {
  environment.systemPackages = [
    pkgs.hdparm
  ];
+  
+  
+  # home-manager.users.steveej = _: {
+  #   imports = [
+  #     ../../../home-manager/configuration/text-minimal.nix
+  #   ];
+
+  #   home.sessionVariables = {
+  #   };
+
+  #   home.packages = with pkgs; [
+  #   ];
+  # };
 }
--- a/nix/os/devices/sj-bm-hostkey0/flake.lock
+++ b/nix/os/devices/sj-bm-hostkey0/flake.lock
@ -74,16 +74,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1700390070,
-        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
+        "lastModified": 1700671922,
+        "narHash": "sha256-XPh/AHD14O+oaztjSb53c3Gh9K1JQHNBOTdn0dvtJpM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
+        "rev": "4784a12198f7434971d5bb8aa6f111acef662ff4",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/nix/os/devices/sj-bm-hostkey0/flake.nix
+++ b/nix/os/devices/sj-bm-hostkey0/flake.nix
@ -1,6 +1,6 @@
 {
  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";

    get-flake.url = "github:ursi/get-flake";

--- a/secrets/servers/dyndns.yaml
+++ b/secrets/servers/dyndns.yaml
@ -9,28 +9,28 @@ sops:
        - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNNmZIR2lydktlUGtmcVg0
-            c1hHRlFKMWxCT2I2QityYlk2NnU3VnpPWTFjClNwN3loZVp2VldIcHZJN3h6aDVB
-            K2Q2SmZ4bmZlcjFwM1cyWkl1Nk12dmsKLS0tIHhYQWhuNkdwRDc4ay8zeUtUYzF2
-            QjBpY29FZXZQZDJHZGx5Z1N4K1p4TGMKpHkuzC8DR7swxE+KlWLJY8TcgCzJIc6w
-            b30w0rvAXJ8l3eVMbiUVLEkNmG8kl7hoEfj95OAT7+ZKfzPZ+tcriA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWFR1cWJkWFl3SHphNVlt
+            NmI0eDFJanVLVlFKeWcydDNaclp0VlQveVJnCnRBc0JTUzZkV0l6cWdaNko3YUNM
+            bWZRaGpYMHZWWkRPMjY4SEF3S200YlUKLS0tIExrWGhjM01YdS85U000Q2o1TjUw
+            VFpZb0dEL2w5NWErR245MUplZE9xN28KiGaqrH9wYZ2goHKYygLgPZIZmUCosHc0
+            RNaMVrIv7I9dPMiqlKdSl1Xp/ePa9gxUhVCpsFIZmlrlhHxv0TLtkQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-07-14T20:50:30Z"
    mac: ENC[AES256_GCM,data:09EAhiFSNroQKelSHF0YdJl8INdYVcjK4BfiOktY+Nx1GK2BA6T8grvIHGB1UZaDvS/AzjcSIq+5ZnyfBU13Ks8zH5oQ11La48FheE3bL38KS+JNgqw3F53w/NUVFkYFp2YRuCqkg8/OBmT3OONLggF7ziuQEByW5NlOUdLejkA=,iv:qe4kBBxxpFdKNszbvZlIXjA2Ybc+NAU2GkMcSviZczE=,tag:98ABbbVh5qPnAzo0xkZ81w==,type:str]
    pgp:
-        - created_at: "2023-11-23T11:43:30Z"
+        - created_at: "2023-11-23T12:05:35Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcBMA0SHG/zF3227AQf/f7cZvIbDELJ1f8xMFDTDNdBGbRKMAhgxj1Id4eQThQ5R
-            djFYEwzeOxYrDyUYwMFaydiW7dHWf7hv2foCVdHqdVoVLF1LyVSlLYWI7R7M4t/Z
-            hdYwsukAH1f6Pu/49XW30t0fa17gBrJDy7x+fnXqlOW/xkTatiEPqRKeoEx1sWil
-            uBD+pIsAcctPF0hyaOEOKNshR/nlWXUU91dPu3FzwlBGtDM7TglqsDUCtSb4ebKt
-            sm3lcersxsefUPsr2wRg3WOY1cwGpLcvQZA86vWNgrYi6ChfUxv2zmR2WXadZ62u
-            1rktKclRDNg3fM6E2elzlVrlzxq/8yGcCDVpH1M4pdJRAZdYa0oSRCkhlY4CzzJi
-            Mgo/bpRhHHwHPyqPMCTIO8UD2L86uC17RByLL5/5LXfHd3QDP0GhXV7sXs+jwcJ3
-            nj6Z860TuKdVhWp0FAfM5Bn9
-            =oyeE
+            wcBMA0SHG/zF3227AQgAjfBO/8RSFW5aIhchSLLvhNzhIF+p2f4KZTAiT0uhB5u6
+            T10j8i0q5IV9XVDdRXxYZwBn6LDFOJ6WJ7hIv61Ri+jCGZ8N8Mr6OA7HyB+6zQmg
+            3PON+5qJC8FHFHiW+bB7NEULdlILS5Q6E3atjGmgOHKYq2O5L+IZgxp5Udt/oXuF
+            CqIW22M/9ftEipgG2b2Txgq1PTNFWI8gYRVacuSU5UD687EacH4fTDyIdXk01FMW
+            LmIh9h64kA5b6VALma1C2ztP0uvCUOSfVsvKJEILOb/kTb0qCdSkEM44onXTCHM+
+            fBo140l54Cy1aIxFPsU8J/KkVbQ9Q6dOxIxrpaEQP9JRAUrBpLwbVLpWww2WFwG3
+            nTplRw3DzGTGoV7CgdzRRhjv7fkb+h5eWLpFqSj6r2MG5PnEjnnDiBaa611sDN//
+            ijdeSDMnCT93t6BEeNKvmTPS
+            =60WW
            -----END PGP MESSAGE-----
          fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B
    unencrypted_suffix: _unencrypted
--- a/secrets/shared-users.yaml
+++ b/secrets/shared-users.yaml
@ -16,73 +16,82 @@ sops:
        - recipient: age17jxphuql70wjkd84azn62ltx9ky69hyvkac23lm8f2j92lznf9hseqq0vl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMVEs2NzlqWnExV28vOG9j
-            Zjc0QXgrc2M3SkkvS3dyL3QrSHFYa0JSRmhZCmZFd3EzcURSWmRvK3VIakQyNFhR
-            dWN0c1FqR09XSkFUV3pEOFpsRlZhVlUKLS0tIDVDb25JMUh3TkJYa0pTdDUrYnpl
-            R3RVdkdvVnhIc2ZKUldGYjlnMzdicHcKL0Bcw6N93/v32cqFuoalcdmTv8/MLs7f
-            9EgegS0+/xOriZmrwel6kNZlcoBR1JbC9qZO6s0D1B5nA1QLHnwvRw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyYi85VUFBRUJCYVN2ZXlS
+            bGV0Y0JacVdvZy9ybDIyQWJCcmVuL2tsRkJ3CnRqZUZzS2JpbXJnVkFFUXdrZHhX
+            cU5LOGdsZGE2bXZWMWRVVURISytRSWsKLS0tIDl5WGkzeEEvMEFTVDVDM0k3cmRz
+            VnV5V3B4aUxyMlR2eU9XK0R3TDdNUG8KlYfhYcUK4R1MJj3IaivsxBrUJUMkkosC
+            dUSewl/N47us5UhVPUxYQBgYs9332nZxDN8FopOkruBMPpPLwrJdAg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1pmznn2tjpelpmxjxqef48rse5ujggf9kcr8x5vewuadqcw03aavqwy54zm
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0MFg3TkhOY3hNZE9Uc1pF
-            OWJGWHh2cHJDUlhJUmVSMlFGR0lxSG1pcVRjCjZqMTdOTkJyT2N1QWdBOC9sbVo2
-            NnIvRUtqUTZkbFI3WGZJaHg5M01DUnMKLS0tIGY1eG44NHlSY2RPeVFWWlpaQ2w5
-            dGNsUHhEYjhkTVY1bFdpQmJMSzh5aVkKK6t7EUzhCUNjxl5dFXPezX53EVCworvn
-            NMaDqS5RgwQhILl04/eGyb5KcQksGQBdN5MacXX872BlOUeuWOez2g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKQjcvdUQvNVl1R2Jkb0pK
+            WEhMRWh4NTRZQlY5aFk5bkFiUDdNQUdodDJBCmd4S3Z0cFlWSUFTZWVMUVJWNnZW
+            ZUNLTjFGSm1idktlbmJUNlJvZGVOR00KLS0tIDVlZGpyREJvT0wveFp4MEFia2FX
+            MHRDUmdKc21LZ0hIV1RjM0Q2VndobVEKK7C4tLmM3Hd8Telyf3zOUXv8LjftOahd
+            aQkPG4rEhF/WBchqZsSviXm9E78Hvvmtgn4rKtVkSH8rzjpgvXo3Qg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1ye4fa0v37shz8q4e5uf9cp2avygcp9jtetmnj2sv9y9mqc7gjyksq2cjy8
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkdXA0SllGSjZRMDhXajFK
-            REp4RzBjQ3pqYnRZLzRMb0NGQVJyeDJYa2dRCk4ydjFmU0pEazJaUTNDV2pKQUUr
-            cExrU09iTHFWdXB1UGJBcnRsd3VraGcKLS0tIHVid2dhUWpSN09uU0IwUVFBcmdM
-            OGxuOTZJR3JnVUFGbjczYzQwSGc1Sm8KhzJ0+4No3Z8sAshkEIj5/4Sz3rJxC7Ki
-            0VTPwftdnPcnOAhZ3z8xrZILeOPjzHwCC4N45vAvYbiNOXCr8VF5NA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyK3BCdHNjRUFDblg1VEdK
+            aUs4SlZOMjl0THE4OGpwZ3VkU2t0NFkxU0FrCnlKYTMwU1RHVHVjYlI3TGQ4VGU5
+            bytSWHBOQXY5ZXNEVXNZNjQ2RFdmU2cKLS0tIERvazdiSGVkN2JaM0pZRTNRd2t5
+            aTE4eEN1UW5CdGFqajJteFRybHIreVkKsVHK+eFx3ElSV/YCZ/E6xM8P21dd++BB
+            ifitWuHXifFXGY/peJti4SII5msn/f9ICbSzoJhpBplHOWaldqYcGw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age13cyvxrd28j68f97q2dwsn62q5dy8tdxtq86ql2dxv2ncwfrf63dsmkj7n3
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiZEFoTWFWMHl0dkoycXU5
-            TmhYU3hCWENGMzRqdnZNckVhODhzUUFlcWpFCldBYkkveTBPSGkvSEVrUXRXcE5E
-            UnFkNnB4TjZBN2Z1ODZVOHlacHZkc0EKLS0tIEI3Vjhzb2FXU05aSTNpT2pzWndV
-            NEdsK2xDaEkwekR2SS9DUmxzc2pKdTQKq/blmeAXpmo9Gmh8Ws1kLuio+sJUZXaC
-            BOBc0m4Dp5y+lTpqvyA9jA9sAZngPo502B+M9tY5rdIxkAR+aCbVUQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzazlmT0RNazJhc0F1aExH
+            MHo4cUFvdnFzY3NidXk0b2pPM3dhNjZyMURZCmNNOVlBcTdNbklMcjZXUkFzU2hS
+            SHU0YTJqc0VPUksxSlUweDlJdUI4OUUKLS0tIGdONkNzb3p6eUd6aHorNzQrLzI4
+            ZkNiNG45OGI2dDgyUUhHV1BMZWJ6VzgKTgrpzF6L2ZTiwmgc8xFrkg4yJwzCR3Ik
+            8pCH8vSHzobEHly5haV7wxcgdhC6HX3YbXiLCClsRsDemNXTdXAtrg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1k7cejd9tqz6a3expd63wkn7kmeawhhrp9vy5vevhjn6eavhdwywqeh7j86
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjUGorR0ZIa3hNRWJvc0Zl
-            a1pPRExtbWc3a0VRS2duamZKTVBvL2FtaTFFCkpyTzdoRTh1bHJTclNFQXJBdDlw
-            M3RSQk9jMWh5ODdxY3FRamw1eWYwcFEKLS0tIHRIVk1ESk4yNkZ0MGxBTmtUVTJB
-            czlMQml3R1FlNEh6cnNoaGxXQk5jSk0KWuhdW4hVOTHaLwmmlnUazb5XLQdRcZRz
-            aN2qDOsAnSOqPgE/iXp4+88Y3iu05dWHgbMuWpS1lAFN+bv4s0zxCg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDTUMwOStKMVc5bGJvY1po
+            NUs4Sk54anFlRGtGeW9ZSTUxTkV4bEdpMHhnCmtUemE1TkZSZUhPRTdRZU1HL04x
+            djJINTBoVEgvMkxCSFVxVzcxSUNxWDAKLS0tIEN5L2lBVnBuYnJKdm5kVzh5VVlW
+            RmJmUXdldnlaTWNFMUtvaHVnRFJEYm8KjZ4WNll1U899AAtuc4B6koiU1r7wBUcR
+            eEdwOK11BaqfQo+qorkN3TW85MsOWZHEhsG81ukkYlZ/uq/ewNb0uA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5VG5odWxKdkN5NFRUcnA3
-            ZFZpWDl3MGlzUmVrWVBEaWhrczVDdDgrM0FVCk5pOFJYSlcyclE1V3lUT1JWY01a
-            czVHcnlMcVZISFprdEZvRGxKditsVlUKLS0tIGJmZVVnTngyZWZaSkoyZ0doa0VD
-            bkIzU1ZCV20wRHhNaWtFcTMrNlQvSUEKrd4c5oMU+UqxbDM4sc2JVmlK+Qmoj/zp
-            2Qc29mNIxP98cjfiPKe3IHidXIbzH0OluYfeFTfBCclbsn3mLpvltg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEY0JqdXRyRnRieHNtK0J1
+            Y1lTbENNZVVjRENwejd3MmVNQnpaeUZOcm1BCkVYZWdSaE9VUGVmWWpVTWFBdjFo
+            WmUyQU9rZVBQVkFjaDdTaFJsN2ZYQUEKLS0tIFBZOU5pZE0yV0VBa0dXVUIvZ0hQ
+            NWM1aEJMeUpvQ25pMWJiWEhrR083b28KlXIkNJMl3R6OUQ6934h1ACtkzvWDsoxs
+            Jl/x29gSl62i2PwFlJWOw6GtnrO2xYJPyUPovS+oLqaxol2t/zVvZw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age19dh6zurkx4xv6dx9lvjw0hychjjqvpcf6aq2s2y8srdk6g82qctqqkmu3v
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2dXFTZ2FyYlVTZWNsbUp1
+            c0pOZ0lFYjQrZkg4U0dxd3V4UEpGcEFYdFJZCldUTWNnYzlvOUJVY2x5ZkJhNENj
+            dzJrMGFvWkNMazB0dElrMmcvcG5uaGcKLS0tIE10NkxpL0haeTBMb2cvbm00eUw5
+            T0hFMk1xclpveUlhVFNqYmphUDNkVUEKBCwyqIOLWbqdU1qVhxnYr0EsEz8gn0s/
+            HAnLDED0abRZ4jwKZ1DfACKuBcC8NnIdxFmQ7z+YzheObxznXlYAcA==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-07-06T20:14:22Z"
    mac: ENC[AES256_GCM,data:GPWu5DjjJ1ki+HRuedGdDCt+2V0RPbOsD/yWJxPIkgu5923vnF8y9y4V6e6+ZsTqHv4hsKeCjKtUnh2Ldn+xadwJmqrIxyJ8NzH5TOvcBxAab9cJCp/yKENw0O1WMUTlDPelvQKMDwbgiebaVVfxbQPUEfJGOgkHkyXrgqN94FU=,iv:h9YALYahUl7mRJmZKjArEfaMrfW9YZkVYd2CEooF13Q=,tag:wotqxup/ouG/bEVOZCs19w==,type:str]
    pgp:
-        - created_at: "2023-08-11T16:15:15Z"
+        - created_at: "2023-11-23T12:05:36Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcBMA0SHG/zF3227AQf/aAO5OvMbhN/6/U9b1gj415csZ/PYBB8GJuQ+disXV/Tp
-            mTMdzmsQVcfefdVoBhd2HUfLv/OlcM2eF4751eu6NP7MBDad5XHZpYON0SCRjiJv
-            vG0xl+KwI/AQYUWQjBhyMcECqjRLJL6EyyW37ykSGMLNMjbdDCISkVniNYFt9pRE
-            XkuWQNnDF++vDSZtVxDZvuCIXNZC7isSh5UNjtFdGpc9nMcAra/ALuWx2NjOTKpG
-            QJ4Ilic2mrE4PIQuf60MnC5lfOJWWbKgR832Sik+ZY/2Nocp2KYsrDyrKRglUu2S
-            AGdmQrPl3nq0yp1zCGujYFQIQmCQKLPTcoz99x5xR9JRAeK6e/xKJcCM5UgRk6IK
-            ULdIYK3EGv432KHj6DJFhW6lYWJBnZwkcNsVhxS3qbuccP7CJr51UDZ4ipfoQQtV
-            irHq+0IfShQpgoPu8YJ+A1T1
-            =qLIi
+            wcBMA0SHG/zF3227AQf+LBa7dBh5AErdSgvKq/SjOR/eV/gQonPtct5Z5J6tz3bV
+            8AD9WG9kOpV2TPQ1iNLC46vXsMEsIWBNcCI/qzMLZOfY9I6dQbxlTYBPOj7aBjTa
+            cWdYvBEmu7GTEaUVMrqqnT9+I8HL/haBegCx8vvOOksuj+IZnVp9/cW/zxRJrdxv
+            Lbf/3X21ePXlxNXtuqX1pyvwa3eZsHywq8C61JKRSOuX1m8WxK4Jblvl25x5l2pW
+            YxQpSAHHozQuRulg/dSF9GASOKpaFZU6lG3yg2AQl4FLS5wz7xA1USh6SQq8qX1n
+            Za28CrxSmxr/os8gnavPP6/Jx1ZDnQlVWYcYT0v9aNJRAVMHPULNlWD+zZZBj6Kl
+            vbNvcBlDoez8irriROfbcYV3q8yN3InaIdhu03tqoogUfL2DJAyDlzp3W3k92j/C
+            PWblzIzIIeqL3M0wGr7FCu3O
+            =tmkx
            -----END PGP MESSAGE-----
          fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B
    unencrypted_suffix: _unencrypted
--- a/secrets/sj-bm-hostkey0/secrets.yaml
+++ b/secrets/sj-bm-hostkey0/secrets.yaml
@ -5,31 +5,31 @@ sops:
    azure_kv: []
    hc_vault: []
    age:
-        - recipient: age1k7cejd9tqz6a3expd63wkn7kmeawhhrp9vy5vevhjn6eavhdwywqeh7j86
+        - recipient: age19dh6zurkx4xv6dx9lvjw0hychjjqvpcf6aq2s2y8srdk6g82qctqqkmu3v
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6NDRCejdyRzY4Q3RwY3Nk
-            REV5RklTUWluQzVZZ3V0VUdKTnF3TFRzTUVFCnZxUXRaRlJXSWRqVWZwNG55OW5P
-            T1RHT0xXaDc0bkFCNHZQdW53aWpZMHcKLS0tIDVIWTM4VjN0UXdxK3ptOEtMWG1r
-            THRNR0tEUzhPdFFhWWxvZlpKYmZKM2MKxc5s1jsci8jPOrvZAoofVNvHT4o9P6yv
-            J8rALQQXgql6obK51Q/Doyzvo1RJ0T7epiWEAZm5B3vDrf6KqbWBYw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2WGw5L3JxMk9xL1BMSEVj
+            cmV1YUhRNDgxRnArdCtOTGhwdFJ0YjlSQVVnCmlHejd4b3g0U0pVeEtxc0hGYzNC
+            eTUvQklBUTgrVkc2ZmZ4Z3VQejlEMTgKLS0tIFFsZ25zRnFTMWVGTDNQNERWT2k2
+            cnJyV0ZObnR6Z0xjTk9yRXdEdVNFQXMKyRkyqkRida6fw6aFcLw9ecPWSrShMu8+
+            H5WNqM1aNuajMFasRxofKvmakKoWpo4utRb8xqtorPLe/7sm6WMFJg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-11-23T11:45:17Z"
    mac: ENC[AES256_GCM,data:VFEtWuEoqlU3wW8SwgWjlnnuv8aJw5Az9j82gc9YfexwR6lNyyQHY5EdZfqPdO4ZRNLen60Xq98kotTYiY7GJ9x3ZR8KPW3puRvqeD8qZf1NMwvkzQliZ+078HCBHmBTeoouWLuvWdP9uv3XOQWdR7/ZfMB/eC4bWS+Acq+tVZ4=,iv:5CRupDm9jNslcn96kUrhQdT5zadEqyKtrKbv+BtcYW0=,tag:ukHLjRdZCTRliB+LXGBHWQ==,type:str]
    pgp:
-        - created_at: "2023-08-11T16:15:11Z"
+        - created_at: "2023-11-23T12:05:37Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            wcBMA0SHG/zF3227AQf+LuGZY70bnoWRAzpxCJnxtf0UfoYkIQoVGeHdnjJ5DTx+
-            NXtGN+gYTfuCUIf1lQRnd8FdQbDUSuHFmaDKFFts3SJR24ZO3N761Ye429FycMp3
-            pyx5RYs1qXYMilN/RLSnEqrsjOpnO21VpxuAxbe9HY5Wp0jLDGdUvpdk2mQqqhx8
-            ZYFbEs9ZZHq568k9ELpJcudlNnvkZPoecMsFiAWP1oh7V0cSacfSUJiqXA2/Ug1a
-            8vweej2pwJ6kaoLIFqjD6qI2rKNtSC+woHD517kldLr6BMetNNc/gEiyat2zOGRB
-            596SIBBf3eCvXCHSMJDtOWsT977CUO2pz+DPTmdqMtJRAbbz9Ks22jtPViAFZDzY
-            pyDwCuX2hTJ2c7r3KA0o7lG4pfvfLkOqXXcV3SnSBvYy4fuhLp2Id+1GWCOD0o1O
-            v5QlxcXSMuOeGygclwHdxzs+
-            =NQjH
+            wcBMA0SHG/zF3227AQf/Yd7gY/2c4vOYMbLIpvj5T8MRzNE2zd6tFaAneOAcjoIA
+            75mnXSAl1SJRvGkLVE1OmUlzx9b+i7GN2HM+Sv15YuOF0wZ7aBXZO8KvifGHXPyd
+            8DQ/K/amNLtuX73vQ80YOTOcXt1y79ZS+ku1kpCimByulCHOwAQjpizqkYSbIKAw
+            gv6Gb3UgMfzbZi3HWkuliqvrJRVk43nAavzoYwl1vNt55rsyxVLEtSGL8BzKhmu0
+            B5wY97/Y5RFo3bSEu5gvSxOBbX6EjOPfW4FvuqIx2NpMe0GpMzrZdGsD4yXKUi/c
+            1cNQ5EAnH1d789JBwHjtx/gXI6HndLuAvBQqJPjqGtJRATMeOBT6EWPcRPQD8zgZ
+            maohAle4gYeJNxdITzqjPwHzYx+y8VmQsDlRKapdMjPL2IqJYB1NNKHZE0uXkLWM
+            g7Nz8IknuR+g7FUI278+crnq
+            =4ocC
            -----END PGP MESSAGE-----
          fp: 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B
    unencrypted_suffix: _unencrypted