refactor: update SSH configurations and add new key for Menno's 2025 setup

bin/actions/secrets.sh

@@ -82,6 +82,9 @@ encrypt_folder() {
         printfe "%s\n" "cyan" "Encrypting $file..."
         gpg --quiet --batch --yes --symmetric --cipher-algo AES256 --armor --passphrase="$password" --output "$file.gpg" "$file"
 
+        printfe "%s\n" "cyan" "Staging $file for commit..."
+        git add -f "$file.gpg"
+
         # Update checksum file
         echo $current_checksum > "$checksum_file"
     done

config/ansible/inventory.ini

@@ -4,5 +4,5 @@ mennos-desktop ansible_connection=local
 
 [servers]
 mennos-server ansible_connection=local
-homeserver-pc ansible_connection=local
+mennos-hobbypc ansible_connection=local
 mennos-vm ansible_connection=local

config/ansible/main.yml

@@ -18,4 +18,4 @@
 
     - name: Include server tasks
       ansible.builtin.import_tasks: tasks/servers/server.yml
-      when: hostname in ['mennos-server', 'homeserver-pc', 'mennos-vm']
+      when: hostname in ['mennos-server', 'mennos-hobbypc', 'mennos-vm']

config/ansible/tasks/global/symlinks.yml

@@ -25,13 +25,11 @@
     follow: false
   vars:
     gitconfig_mapping:
+      mennos-desktop: "~/dotfiles/config/git/gitconfig.linux"
+      mennos-laptop: "~/dotfiles/config/git/gitconfig.linux"
       mennos-server: "~/dotfiles/config/git/gitconfig.mennos-server"
       mennos-vm: "~/dotfiles/config/git/gitconfig.mennos-server"
-      mennos-desktop: "~/dotfiles/config/git/gitconfig.linux"
+      mennos-hobbypc: "~/dotfiles/config/git/gitconfig.linux"
-      mennos-gamingpc: "~/dotfiles/config/git/gitconfig.linux"
-      mennos-laptop: "~/dotfiles/config/git/gitconfig.linux"
-      homeserver-pc: "~/dotfiles/config/git/gitconfig.linux"
-      wsl: "~/dotfiles/config/git/gitconfig.wsl"
 
 - name: Create SSH authorized_keys symlink
   ansible.builtin.file:
@@ -42,10 +40,8 @@
     follow: false
   vars:
     authorized_keys_mapping:
+      mennos-desktop: "~/dotfiles/config/ssh/authorized_keys/mennos-desktop"
+      mennos-laptop: "~/dotfiles/config/ssh/authorized_keys/mennos-laptop"
       mennos-server: "~/dotfiles/config/ssh/authorized_keys/mennos-server"
       mennos-vm: "~/dotfiles/config/ssh/authorized_keys/mennos-server"
-      mennos-desktop: "~/dotfiles/config/ssh/authorized_keys/mennos-desktop"
+      mennos-hobbypc: "~/dotfiles/config/ssh/authorized_keys/mennos-hobbypc"
-      mennos-gamingpc: "~/dotfiles/config/ssh/authorized_keys/mennos-gamingpc"
-      mennos-laptop: "~/dotfiles/config/ssh/authorized_keys/mennos-laptop"
-      homeserver-pc: "~/dotfiles/config/ssh/authorized_keys/homeserver-pc"
-      wsl: "~/dotfiles/config/ssh/authorized_keys/wsl"

config/home-manager/flake.nix

@@ -83,13 +83,13 @@
           };
         };
 
-        "homeserver-pc" = home-manager.lib.homeManagerConfiguration {
+        "mennos-hobbypc" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home.nix ];
           extraSpecialArgs = {
             inherit pkgs pkgs-unstable;
             isServer = true;
-            hostname = "homeserver-pc";
+            hostname = "mennos-hobbypc";
           };
         };
       };

config/home-manager/workstation/dconf.nix

@@ -32,16 +32,19 @@
   dconf = {
     enable = true;
     settings = {
-      # Set nemo as the default file manager and disable desktop icons since this is handled by nemo
       "org/gnome/desktop/background" = {
-        show-desktop-icons = false;
+        show-desktop-icons = true;
       };
+
       "org/gnome/desktop/applications/file-manager" = {
-        exec = "nemo";
+        exec = "nautilus";
       };
 
       "org/gnome/desktop/interface" = {
         color-scheme = "prefer-dark";
+        font-name = "Hack Nerd Font 11";
+        monospace-font-name = "Hack Nerd Font Mono 10";
+        document-font-name = "Hack Nerd Font 11";
       };
 
       # Pinned apps

config/ssh/authorized_keys/homeserver-pc

@@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
 
 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey

config/ssh/authorized_keys/mennos-desktop

@@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
 
 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey

config/ssh/authorized_keys/mennos-laptop

@@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
 
 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey

config/ssh/authorized_keys/mennos-server

@@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
 
 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey

config/ssh/config

@@ -1,4 +1,4 @@
 Host *
-    IdentityAgent ~/.1password/agent.sock
+    IdentityFile ~/dotfiles/secrets/ssh_keys/mennos-2025.pem
 
 Include ~/.ssh/config.d/*.conf

secrets/ssh_keys/mennos-2025.pem.gpg

@@ -0,0 +1,14 @@
+-----BEGIN PGP MESSAGE-----
+
+jA0ECQMI/MBD50d0mRj/0sDsAbPsVpYUTMPTlDOwOER6j9yC6VRLupYjlis0G+qX
+HsrmJzhwzh0Cs3OB8/NjX/pZIt19UL1gAQ6dtwENrUrjb3BjfTlKWh2WZkVctLMk
+ezGmBYbThvZeeyQKvftsC1BvdA7tWNdFf6Tq7joMSZKUtxqvFfSPhXEcKGxO2Kml
+Y1oSB/jGxZ8Ix5zw2+jf1PpBCiiB/XdryHalw/ygj3CW6WuipGv9jkwOOFRtV9pl
+KfWtS+ytHzRuWt7xxe4oQQpbZ93/wvU85ukkZTIUPbryGbjn4NJ2GTEYAx/jpgmf
+PHpZ4tvp7ni5bNtVQYFs8bOLjTZ6axmxNEUQ7I1Q9zzC9htGIWjnGQa/qKeM9miK
+ITiY2Z6j3eyNigkoGNonKgIbGAP4kFUm8gZEAa48oMDc1k13OFMzUSpGrkzsWeG8
+/SlyxeqjKwiZGprRW7wIpJaTWRMlM2itFki20W1YIFaEgrdFkHYCzsJvBWquCz5q
+JvHkMlWsXcfdxyy/GX/m0iydXkEvZr1MlYqZrjddyjQ8h9naCdv3RKk20VXpDAEL
+IjoWOLem4O/J0ukkSZk=
+=lWRa
+-----END PGP MESSAGE-----

secrets/ssh_keys/mennos-2025.pub.gpg

@@ -0,0 +1,8 @@
+-----BEGIN PGP MESSAGE-----
+
+jA0ECQMI/d1LfLMuNKf/0p8Bjsbms6yKmGKnfL876Ze+/qWSg+rGiFdRhDW02efU
+GEXEN+a7yFAlFtJi8bFw3VRyFBJZqhWkYKb3kDGRrtSqJxQOj0KnH2Sc8MJWGQ2C
+1tRPtujn9jSbjp7bzCt922vvtRDqRI8LUcyfUKVxb91XEltwcBUaAoqw7v94kFMk
+4IE94vikxtpwfrqx0A0Zcbdzq1IPL5HPoihZJ/GKauw=
+=hdl1
+-----END PGP MESSAGE-----