Merge branch 'master' of git.mvl.sh:vleeuwenmenno/dotfiles

bin/actions/update.sh

@@ -113,7 +113,7 @@ sys_packages() {
       nix-channel --update
 
       printfe "%s\n" "cyan" "Updating nixos flake..."
-      cd $HOME/dotfiles/config/nixos && nix flake update
+      cd $HOME/dotfiles/config/nixos && nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update
 
       # Exit if this failed
       if [ $? -ne 0 ]; then
@@ -122,9 +122,16 @@ sys_packages() {
       return
     fi
     
-    printfe "%s\n" "cyan" "Updating apt packages..."
+    if [ -x "$(command -v apt)" ]; then
-    sudo nala upgrade -y
+      printfe "%s\n" "cyan" "Updating apt packages..."
-    sudo nala autoremove -y --purge
+      sudo nala upgrade -y
+      sudo nala autoremove -y --purge
+    fi
+    
+    if [ -x "$(command -v yum)" ]; then
+      printfe "%s\n" "cyan" "Updating yum packages..."
+      sudo yum update -y
+    fi
   fi
 }
 
@@ -163,7 +170,7 @@ flatpakpkgs() {
 
 homemanager() {
   printfe "%s\n" "cyan" "Updating Home Manager flake..."
-  cd $HOME/dotfiles/config/home-manager && nix flake update
+  cd $HOME/dotfiles/config/home-manager && nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update
 }
 
 ####################################################################################################

bin/actions/upgrade.sh

@@ -40,24 +40,33 @@ fi
 printfe "%s\n" "cyan" "Limiting to $CORES cores with $JOBS jobs."
 
 if [[ "$RUN_NIX" == true ]]; then
-  printfe "%s\n" "cyan" "Upgrading NixOS packages..."
+  if command -v nixos-rebuild &> /dev/null; then
-  cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS
+    printfe "%s\n" "cyan" "Upgrading NixOS packages..."
+    cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS
 
-  if [[ $? -ne 0 ]]; then
+    if [[ $? -ne 0 ]]; then
-    printfe "%s\n" "red" "Failed to upgrade NixOS packages."
+      printfe "%s\n" "red" "Failed to upgrade NixOS packages."
-    exit 1
+      exit 1
+    fi
+  else
+    printfe "%s\n" "red" "Skipping nixos-rebuild, NixOS is not installed."
   fi
 fi
 
 if [[ "$RUN_HA" == true ]]; then
-  printfe "%s\n" "cyan" "Cleaning old backup files..."
+  if command -v home-manager &> /dev/null; then
-  rm -rf $HOME/.config/mimeapps.list.backup
+    printfe "%s\n" "cyan" "Cleaning old backup files..."
+    rm -rf $HOME/.config/mimeapps.list.backup
 
-  printfe "%s\n" "cyan" "Upgrading Home Manager packages..."
+    printfe "%s\n" "cyan" "Upgrading Home Manager packages..."
-  cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS
+    cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager --extra-experimental-features nix-command --extra-experimental-features flakes switch -b backup --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS
 
-  if [[ $? -ne 0 ]]; then
+    if [[ $? -ne 0 ]]; then
-    printfe "%s\n" "red" "Failed to upgrade Home Manager packages."
+      printfe "%s\n" "red" "Failed to upgrade Home Manager packages."
+      exit 1
+    fi
+  else
+    printfe "%s\n" "red" "Home Manager is not installed."
     exit 1
   fi
 fi

config/autostart/ulauncher.desktop

@@ -1 +1 @@
-/nix/store/c9d6gxqsxdxk6fki5844wv0c6yrx86n1-home-manager-files/.config/autostart/ulauncher.desktop
+/nix/store/b21375qzs3rbmhz9wrvyab7jljis7jc3-home-manager-files/.config/autostart/ulauncher.desktop

config/flatpaks/org.fedoraproject.MediaWriter.flatpakref

@@ -0,0 +1,10 @@
+[Flatpak Ref]
+Name=org.fedoraproject.MediaWriter
+Branch=stable
+Title=org.fedoraproject.MediaWriter from flathub
+IsRuntime=false
+Url=https://dl.flathub.org/repo/
+SuggestRemoteName=flathub
+GPGKey=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
+RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
+

config/gitconfig.linux

@@ -6,9 +6,6 @@
 [gpg]
   format = ssh
 
-[gpg "ssh"]
-  program = "op-ssh-sign"
-
 [commit]
   gpgsign = true
   

config/home-manager/flake.lock

@@ -1,5 +1,60 @@
 {
   "nodes": {
+    "flake-compat": {
+      "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-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "ghostty": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "zig": "zig"
+      },
+      "locked": {
+        "lastModified": 1736402835,
+        "narHash": "sha256-SiG2B2KfU4BIOggrJJa9nKoagXtLXWWo9vXJ88a+ls8=",
+        "owner": "ghostty-org",
+        "repo": "ghostty",
+        "rev": "2d7706ec4f7042b9072d3b8ac8ea496dee209bc8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ghostty-org",
+        "repo": "ghostty",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -37,7 +92,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-stable": {
       "locked": {
         "lastModified": 1736798957,
         "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
@@ -55,9 +110,50 @@
     },
     "root": {
       "inputs": {
+        "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable_2"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "zig": {
+      "inputs": {
+        "flake-compat": [
+          "ghostty"
+        ],
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs-stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717848532,
+        "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "type": "github"
       }
     }
   },

config/home-manager/flake.nix

@@ -9,6 +9,7 @@
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ghostty.url = "github:ghostty-org/ghostty";
   };
 
   outputs =
@@ -17,6 +18,7 @@
       nixpkgs,
       nixpkgs-unstable,
       home-manager,
+      ghostty,
     }:
     let
       system = "x86_64-linux";
@@ -31,11 +33,15 @@
     in
     {
       homeConfigurations = {
-        "mennos-gamingpc" = home-manager.lib.homeManagerConfiguration {
+        "mennos-desktop" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home.nix ];
           extraSpecialArgs = {
-            inherit pkgs pkgs-unstable;
+            inherit
+              pkgs
+              pkgs-unstable
+              ghostty
+              ;
             isServer = false;
             hostname = "mennos-gamingpc";
           };
@@ -45,7 +51,10 @@
           inherit pkgs;
           modules = [ ./home.nix ];
           extraSpecialArgs = {
-            inherit pkgs pkgs-unstable;
+            inherit
+              pkgs
+              pkgs-unstable
+              ;
             isServer = true;
             hostname = "mennos-server";
           };
@@ -55,7 +64,11 @@
           inherit pkgs;
           modules = [ ./home.nix ];
           extraSpecialArgs = {
-            inherit pkgs pkgs-unstable;
+            inherit
+              pkgs
+              pkgs-unstable
+              ghostty
+              ;
             isServer = false;
             hostname = "mennos-laptop";
           };

config/home-manager/packages/workstation/ghostty.nix

@@ -0,0 +1,6 @@
+{ ghostty, pkgs, ... }:
+{
+  home.packages = [
+    ghostty.packages.${pkgs.system}.default
+  ];
+}

config/home-manager/packages/workstation/steam.nix

@@ -0,0 +1,7 @@
+{ pkgs, pkgs-unstable, ... }:
+{
+  home.packages = with pkgs; [
+    steamcmd
+    steam-tui
+  ];
+}

config/home-manager/workstation/keyboard-shortcuts.nix

@@ -30,7 +30,7 @@
     };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = {
       binding = "<Ctrl><Alt>t";
-      command = "ghostty";
+      command = "ptyxis --new-window"; # ghostty doesn't work on Fedora atm
       name = "terminal";
     };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/emotes" = {

config/nixos/flake.lock

@@ -50,22 +50,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1717312683,
@@ -212,7 +196,7 @@
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2",
+        "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
@@ -394,7 +378,7 @@
     },
     "nixos-cosmic": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
@@ -526,7 +510,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "gitignore": "gitignore",
         "nixpkgs": [
           "hyprland",
@@ -549,30 +533,14 @@
     },
     "root": {
       "inputs": {
-        "ghostty": "ghostty",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-unstable": "nixpkgs-unstable_2"
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -627,31 +595,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "zig": {
-      "inputs": {
-        "flake-compat": [
-          "ghostty"
-        ],
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs-stable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717848532,
-        "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
     }
   },
   "root": "root",

config/nixos/flake.nix

@@ -10,7 +10,6 @@
       url = "github:hyprwm/hyprland-plugins";
       inputs.hyprland.follows = "hyprland";
     };
-    ghostty.url = "github:ghostty-org/ghostty";
   };
 
   outputs =
@@ -20,7 +19,6 @@
       nixpkgs-unstable,
       hyprland,
       hyprland-plugins,
-      ghostty,
       nixos-cosmic,
     }:
     let
@@ -50,7 +48,6 @@
               pkgs-unstable
               hyprland
               hyprland-plugins
-              ghostty
               nixos-cosmic
               ;
             isWorkstation = true;
@@ -70,7 +67,6 @@
               pkgs-unstable
               hyprland
               hyprland-plugins
-              ghostty
               nixos-cosmic
               ;
             isWorkstation = true;

config/nixos/packages/workstation/default.nix

@@ -2,10 +2,7 @@
 {
   # Import all the package modules
   imports = [
-    ./1password.nix
-    ./flatpak.nix
-    ./steam.nix
     ./hyprland.nix
-    ./ghostty.nix
+    ./flatpak.nix
   ];
 }

config/nixos/packages/workstation/ghostty.nix

@@ -1,10 +0,0 @@
-{ ghostty, pkgs, ... }:
-{
-  # Known issue: https://ghostty.org/docs/help/terminfo
-  # Issue output such as: tput: unknown terminal "xterm-ghostty"
-  # Simply run:
-  #   $ infocmp -x | ssh SERVER_TO_FIX -- tic -x -
-  environment.systemPackages = [
-    ghostty.packages.x86_64-linux.default
-  ];
-}

config/nixos/packages/workstation/steam.nix

@@ -1,13 +0,0 @@
-# In your configuration.nix
-{ config, pkgs, ... }:
-{
-  programs.steam = {
-    enable = true;
-    # Open ports in the firewall for Steam Remote Play
-    remotePlay.openFirewall = true;
-    # Open ports in the firewall for Source Dedicated Server
-    dedicatedServer.openFirewall = true;
-    # Open ports in the firewall for Steam Local Network Game Transfers
-    localNetworkGameTransfers.openFirewall = true;
-  };
-}

secrets/openai_api_key.secret.gpg

@@ -1,9 +1,9 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIdzswSvGKIFj/0sAIAc0IMa6q0CiEqk/RjpEaea0RpVSxKL8v/E0HyqiC
+jA0ECQMIyS/QhVzk8iz/0sAIAYCHd2CTLa3u1Ajj4oj7tqJivyB2moggjt7f0uep
-nZBGvcaadZ+uQ/Ndxk3WfehTYuXWZk9gotfoQ91TrvMcCNt0ag6sMdVLHtEzoXWF
+qpah5aM35C/BnzMVRkg6CBWbMFhBRYlRaJ7oyQMPlq/OAtDuk4heXhQfqN24PEEb
-93wn4UDc9kv56mfU+JnSK5Rv6euXhZ8ZapEqFIvmh7kGkX/nwTJFNU/f6jz0yhaw
+X5SzXFaTtW01HIHy2JNaVaz7qU4RsRctayjPe6jBKfkDrxbLpKtUf1ETNuwqgMOR
-uu/pa9b9NFpIH7IoelJ2SzJMX3ZhX5aVcY0ojOEvlfRxOGdsOxUK2Ifd9MWV9Tyd
+pyZjgoBO6Wo2DUkeq3cku95ejsX/63XXnTKW0CXwVdvolo7OzdBIfNsiSMTnvnr5
-Sgsa3uFFcL4STwXNq6umwlfkk/SOqtq5WAA=
+s1jFbGH7K3QOz7FcSyanG4gK+z3x6Njaduc=
-=Zo/k
+=tmo1
 -----END PGP MESSAGE-----

secrets/ssh_config/dev.conf.gpg

@@ -1,9 +1,9 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMI519bNNdOqtX/0sASAZFH3wmp22L1th/nrq1TY4WHFcQGWe4mh2LFIE+z
+jA0ECQMI3rCkM4WCKnn/0sASAQjifcMA4M5hjwkP8dZXxah9d8g8YeofFTPLgPMm
-XWM+UKAYBaE6apC8psVW6/1s+3J5zQrtE2WyWQ+YEGsk+LhgliEXEtmIMF06/xia
+zUR7BcyuniGeHkdkPhVIPDU9ea8BB6JVgldGNeHOh0Rj+OdO95RzPkC4VyGlhVC7
-P1l13eea95sIA0sIG5qkHuMQ6MgkhfIYhfZOW/5T7hCeFxg7LweB1SAi0k11dho1
+qoDdy+QQUOVImgEjbNLSOD3VKJzYQMfcmF2X6yZ0TpfOeHZyOmaVXQU+hdIl2g9r
-BgaE+kaZDxcphyKKWrbTmfzvUvVXWkN6kOGMCvKg+Rf+of+9On2Jo0Gpm8cz5iSH
+zJjzKh2Ukp0VAF+1mp6mcU3fKhwJyffxF1491ExXYM80q1+S247/zLgU1/nQi/u5
-3fF1U9djpnp4/NphV05b0tJpQWYJXBsGa54VN0ubTUXGjdCT
+cX1cV14qi/nFQdmuNlNjahusvSpVtkhsa8TYMRyDP9rr+WdQ
-=XFXP
+=an0w
 -----END PGP MESSAGE-----

secrets/ssh_config/personal.conf.gpg

@@ -1,10 +1,10 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIMtJCio7/eYP/0sA6AUnti1nRUB47NBp+VFxeWAAkjLj1x+u2124Vm7pI
+jA0ECQMIECtNQigofUT/0sA7AfQFumfYw02g3y4nQuPYrfbgyHuMVCsMk+nLlcLb
-ghbcrcvnpqiqXnlNeibhIFyuU/12Lfsy27mCYZZgH/bVik10gGIi1Xu4sGUujLSU
+5I+zgR8c1ie/S5XBk3wLlJ0suhb8m4ifZOJoRcIW7G+ISTPjIetaJQnkvObKUBgG
-zB8R2GjceTbqSDMUp3XWEMSjmNRweNnwBMesJVVuwJfw7HIiIdsYIJMINCVO4m3O
+QXz54oWcQYXMeaGcEq442gU0x+S3HVU2GcIhRdiUuZ5DYbaEsYnLcPLBrp73a/wE
-7YQ8tJrmfc4q7q15ZcV/uU/AQVydw+o3yElnO/fiuiXUxuMP/KdZJNJ7zSX+CRL7
++hb3IZC1zGcijpC4ovcVVAZvHUaKpV0hCzJXNGgvPW0H7/GRxQyPKjghUQ7DgCRu
-bV29m19w58iUouXGLUgLvKU/1x+siOcJh9zTEM+IeFspz5Gr9BlUZFiewuR6NuP7
+4u7t/GU2JDrep+nteUu5Rs+P7bypZdyripMj6BxoqHmwjj1ddeSK7Bv602Nt+7/n
-MsppiqYsH1be70J26FfTki9G8sOVR4BjVdNW1w==
+Bcg8xpViAasXREuaR3Z6r9SFlex7qbQjMMBtb2M=
-=3d5a
+=wrl9
 -----END PGP MESSAGE-----

secrets/ssh_config/prod.conf.gpg

@@ -1,9 +1,9 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIzH98wOyu8vL/0sAdAdNq59gT7UxaXaNy/ezeziTtcyJm3JFFzC3hFPCd
+jA0ECQMILwzTWNDBbZX/0sAeAQMlmiKRJM5YPtC78LvlLroqE5R6hysJq1nGV34U
-OYrDYiJgDqjDXNVEyPR24ffXSk+WbfSQEqEd9KCaSiFueP8d+IMMzHtHsgMrx+sT
+CcY7XmuLz/Bvx2/ZGE1urY48AmgNZraiKOh8kfTG5T7dCTqrkMiz1MpNRYVdnXvW
-v4G88/gsQpBbxVUs6yktCVmchlsbgshflajhigfHqbSSUp/DramW4ueKRSUEixty
+LOanl3+alv6tmosD52zn4vRmRCnIaqE/k6ne+NV4BuRj0u9qWLoNI/7uGFnjcvI3
-IoUvTEJqE7VWMC2QBaPtpn6tBqNtQyQZtzQFMdjH4xXa4eQZkIgZo4YZt1rXxUkK
+mGYlDF7ArQH0gVpmW8wmlNFzMPe4ccqWMjGbpB1h3TEALy4nh2wwNH5PvF1FKesJ
-eTUZjRCRRDyiJSlh6dK+R++eUh2NcN97f/ThPUPxhKTLAml1obfqcW2JFc+xp9Y=
+iq4Vvhslo8LbyjQdkA7/fPlYEu1MDJKDCaHWwmAevMwNuGNLrdupyOf2KkHSYmUB
-=+WWh
+=ULsR
 -----END PGP MESSAGE-----

secrets/transip-discountoffice.pem.gpg

@@ -1,34 +1,34 @@
 -----BEGIN PGP MESSAGE-----
 
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-+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
+TXYpUUG/saog0+FVQcRbnapWViNHUI1j/ggVgqD0Kpi0Aw1XpREBqCSvZlKPv4P1
-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
+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
-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
+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
-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
+Nc7vWyoM9yLrjbX4zxMq4xIcty2aQ4iY/BKmAh0M/FcPkim8D+ypFF/ri+hB5/cH
-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
+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
-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
+qMjmfBRTS39j+gOfVvZo5F/02K5V2DiSYRdeTnsCdQ/jzJdJ2yoxCGHeMNm1Prv6
-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
+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
-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
+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
-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
+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
-IIXxiPQR0er50Mn5/NkLWS89CrkQXeLqzPlK5nCkG2ata5okV2E3p48/BPT2rPhj
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+8Bhuu372s4s5Mgu2jf1PVcJqEwNl+AIZGgByEmRxXJg0xd3sP89p4afcST9UC8l1
-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
+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
-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
+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
-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
+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
-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
+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
-ONY1f7A7XMHgpoQGd6SIsbVDtLIstni4adzqH6ahi+PXdMOVTaGCbU7UAfrTjXfn
+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
-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
+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
-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
+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
-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
+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
-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
+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
-byTxf7j9BRGGrslm
+PppWvUzUlOlJJPetJb5F
-=+LIn
+=U7VL
 -----END PGP MESSAGE-----

secrets/wireguard/work.wg0.conf.gpg

@@ -1,12 +1,12 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIKAqIdDLxbRz/0sCVARMDv657J+xXkIKk4c1zesqgKfLc1/6O1Fd2Ftho
+jA0ECQMI475OuKYqXMv/0sCXAShLaWEeFxtqCZ2dN7OqEy5ucrqr9u0I0yurJbwo
-7Sc1g74tXidtPEerJPT1baZbVDNc0EC2p55sNxpB1e7jgvzbgBebTulTz5u1g77Z
+lYxL/g/tHRoqVDiLHx0hJMtmL5mltn+GBbGA1Y5wcqQyYvU74qUEn8iCbw1BYMQ+
-v83ei7O9Zcb1e/NeuH+BXc5IJFqb5wIBqrEiSrohC4TCWI9EPCw5gfiWfZOatj1l
+1zEMwZZG5FEmW1nHYA1OM0JeWPDqpveMr/XBk8P/bI5zDr93XXKshFsuVbHvyPBJ
-hZ0RGXPITvJU2GWDq1GJrxtDCM7ozKi45+bFXlKq1WYMODC3kBgaaZA7lrWBCYXM
+CiPIXPv1Pu8rJHcIjEDkknnz48ZeS2RR2N30LFmTBdD6ZmkLfq8vYtPkJFW6rb0w
-lp8aOVABCtBg8N5XHFCTCll5VEcvKkWywPCFs7g1Qrwz1m4KxYtQPJgYfjRnOJcw
+jTIsDyzDbtCF6YU9VnARNCQo6y5gEUi+nZi730trfSUmFJEa1BKwG4aE46bxborn
-TL1KhwEwOXmYU4LOO7PZhlI3/zDsWroJHtkrtOS2ocDCxQqcjLf//wwYHf63qLNL
+sHmV1NTN2rZrxMRIRe05S4zqZ7Dod6eN+KBDZsSXuYWxD+sUjmWA1agYJndhk2xr
-qdEOQ6zDdckwmkaExidTevhUPy+PlhD4mnKhlXivmk7SEPq7Epxqm37uP/xfAfDz
+HzIFJwk7kNgKZnW6QY+/phxJX/txHd5GMjwjjYBSJ3M7Txm7BBtNoflz0TqBaIay
-aVohRYRI0rooMZ+xjGlncc15ZCDhLPk=
+9vJUhWMfcPETc0/CB3S5PiMbVVGyw5jhLg==
-=uIWs
+=S/fh
 -----END PGP MESSAGE-----

secrets/yubico/u2f.personal.keys.gpg

@@ -1,10 +1,10 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMI5VBc0KVbLDL/0sBCAf3oZq8xXuCs66vm9peFWtjXJJ8KoeHE27LNfvT5
+jA0ECQMIJ9R5BaXIG1//0sBBAe8JsWlg3N50w7zu3Uwke1Hu1QLkDYFgsTBsz6Og
-xAO5z6CuPzOdwLe4k8w2mIA1csivmGinWj2OqHelLzVIdrNZj2FW8baP+lhE9m5l
+Vp6mPHVeNK6IPl0pUT1IaZHNhKNc9Bd4/ZYoubfkfBIyIlXclcjRzgcorOtkOsWs
-ZWUIc6c2Ow4gBqI24U6KQHYOZS4vZ/lUhN9Ja/3RrSyhQfXbjeU2rQtfrfVQlQzk
+YcFUYdYwKCLsS0K4wq7setmy3wAjTnrULyXDS4xRA/30NtOL/Cx9i6hyAlkOjcfA
-HY7XdGtnsOta7Aanp4I4nJB5H48i8OnMBt7BI3R3wUY/9dnQ/+UP0PGkH48scnW2
+l0mFtzLBrEP4LMbSo2oFtFyhPP05R3kZwe1hukZzmsuNI7W1scEBtKQcTCz01ngL
-9NMIhCnIa8evzVEwa10KG5tKMXfJT0ZBcj0PuwWhpDV6hqtLAfaiyNYux6nMRSQk
+h/B0AE1dX8bRU+Yyl6aZ3iPLS+J2o5jsZ+ou3Iy5SXqBqVhlJXxxjCP0VF7ZYSGC
-VPdHjG/SrFusOUAQWmZCwPYHQIhSvQotfHIoQkt4ktmFGjWf
+YLnxqSvcBp0wuLjgMlJlGu0omZR7axTFZaE4ts4oULS0YaI=
-=203E
+=5mIs
 -----END PGP MESSAGE-----

secrets/yubico/u2f.work.keys.gpg

@@ -1,13 +1,13 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIvkpSi/VwY0D/0sDKAUychqUMz34QzcenJFg72hd0QCirPZPrFGg/kXLW
+jA0ECQMILlvRxivBmtv/0sDKAeUG/vps231Rvtbj5zCM00heDgy6Y8oFmsPfbQ+/
-iAHp6oxrENcPW7Ll1tHDPrL+QC06RPOsrWXO0LjGnOsHjDron+DnmznXhLFDSXgZ
+mC4id1R7/qvhC6R89nM6kNC4nIcMQj7L3I7XJRUZNe6pX1es84PiafuHBBLQ5nnH
-br3q5jqYTnYrAFoTChVtz+PaRB0CRg4W1IbM5VhwDVKjcNq0NHZtc9pTCBsaIaCV
+1BBkR/QVB+oAf1p4i8M8AvsrZv7VQQ5jNmETU+xrYp+mfQytDUCSIM8LjQw3Doz3
-xTbQge6bAq8hPcezP7VOnfJpMKi1G2pILhRJviZN6nzzUoMfRMxdwx9JyPGKruFL
+kOghN6UNJdJRrwjFdrJ9TZqmBmz9KXh8o7elZQQcwRB9vHVz4TUTFKoslUn821UV
-BAZYtFMUlfL+jBATKop2oZeEQqW+mzwmUFSKEOFFqrLTePh90kN2cZwiof4W4vvn
+A2xefTxZwiYw1ExqxObs1Dc+cVjitCelXfhRNEszL42gG1VUyLuY71lDphzxmyDD
-cQ2APHSxmWniW21Qrm/9YCRE+HKLt2Yz+nYx7zvEuRpeN25aaVQu5DnkHfzFbKfj
+HPk7yZuCciBgCA+VNkBsjHLLyGtsR2FqqU8DraXXq6cFcxjMIkRoza9AUi4Xk1GG
-c5Nv7kIi0pGT5niTlcAipSZ6YRyy6K6b9A04H8JyxJ51+HCfEb0Ns9yPcjCXffs1
+NQ7ONEwmXHH2db+Z8H5F1NXt+UfW41gbVWKek1Cxooa37FXUn995RCeMcaDeKfVM
-h9dmZ2MnTv9zX2w0th/SlQ9C0A9MGr9SPLsLz6WcaOuswhWCNNdkF4tQ8vnHTEsZ
+f8vYFELIyrkAuLkltO2twcFi4d9pnYYnxJOmtj9heH8SDcaSuj++03vN0CQu1Xw2
-ezi+iRTIHhI3zQ9YjR07Tki8s8i5rWUCaFzOvg==
+qEhF3L/aEQwUrRaayI7F2NJmEfQgGZfcjVc+1Q==
-=kFIl
+=weU9
 -----END PGP MESSAGE-----