diff --git a/.github/workflows/nixfmt.yml b/.github/workflows/nixfmt.yml
new file mode 100644
index 0000000..766f6ba
--- /dev/null
+++ b/.github/workflows/nixfmt.yml
@@ -0,0 +1,44 @@
+name: Nix Format Check
+
+on:
+  pull_request:
+  push:
+    branches: [ master ]
+
+jobs:
+  check-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Install Nix
+        uses: cachix/install-nix-action@v30
+        with:
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+
+      - name: Install nixfmt
+        run: nix profile install nixpkgs#nixfmt-rfc-style
+        
+      - name: Check Nix formatting
+        run: |
+          exit_code=0
+          while IFS= read -r file; do
+            if ! nixfmt "$file"; then
+              echo "Error: Failed to format $file"
+              exit_code=1
+              break
+            fi
+          done < <(find . -name "*.nix" -type f)
+          
+          if [ $exit_code -eq 0 ]; then
+            if git diff --quiet; then
+              echo "All Nix files are properly formatted"
+            else
+              echo "Error: Some Nix files are not properly formatted"
+              git diff
+              exit 1
+            fi
+          else
+            exit $exit_code
+          fi
\ No newline at end of file
diff --git a/config/config.yaml b/config/config.yaml
index ddb57ee..939578a 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -13,8 +13,11 @@ config:
     # Gitconfig
     gitconfig:
       sources:
+        mennos-server: ~/dotfiles/config/gitconfig.mennos-server
+        mennos-desktop: ~/dotfiles/config/gitconfig.linux
+        mennos-gamingpc: ~/dotfiles/config/gitconfig.linux
+        homeserver-pc: ~/dotfiles/config/gitconfig.linux
         macos: ~/dotfiles/config/gitconfig.macos
-        linux: ~/dotfiles/config/gitconfig.linux
         wsl: ~/dotfiles/config/gitconfig.wsl
       target: ~/.gitconfig
 
diff --git a/config/gitconfig.mennos-server b/config/gitconfig.mennos-server
new file mode 100644
index 0000000..762430b
--- /dev/null
+++ b/config/gitconfig.mennos-server
@@ -0,0 +1,18 @@
+[user]
+  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr
+	email = menno@vleeuwen.me
+	name = Menno van Leeuwen
+
+[color]
+	ui = true
+[push]
+	autoSetupRemote = true
+[pull]
+	rebase = false
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+[init]
+	defaultBranch = main
diff --git a/config/nixos/hosts.nix b/config/nixos/hosts.nix
index 9cde74f..c92cfcf 100644
--- a/config/nixos/hosts.nix
+++ b/config/nixos/hosts.nix
@@ -7,5 +7,8 @@
     127.0.0.1 fr.discountoffice.be.local
     127.0.0.1 api.local
     127.0.0.1 mailpit.local
+
+    10.64.148.230 api.dev
+    10.64.148.230 subsites.dev
   '';
-}
\ No newline at end of file
+}
diff --git a/config/nixos/packages/workstation/flatpak.nix b/config/nixos/packages/workstation/flatpak.nix
index 396c208..71db5a7 100644
--- a/config/nixos/packages/workstation/flatpak.nix
+++ b/config/nixos/packages/workstation/flatpak.nix
@@ -1,10 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   services.flatpak.enable = true;
   systemd.services.flatpak-repo = {
     wantedBy = [ "multi-user.target" ];
     path = [ pkgs.flatpak ];
     script = ''
-    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     '';
   };
-}
\ No newline at end of file
+}
diff --git a/secrets/ssh_config/dev.conf.gpg b/secrets/ssh_config/dev.conf.gpg
index 7afa676..b03d7cf 100644
--- a/secrets/ssh_config/dev.conf.gpg
+++ b/secrets/ssh_config/dev.conf.gpg
@@ -1,8 +1,9 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMI5RidcMTcDnv/0pAB3EfRm5WT3Niz66zAHGrokTLfnp+yZ7BN6Tt3I6M1
-wGWBBCY11yJZ5WcD2h4jSdqJhdxsa2TJPKnUvkn4A2to1KMDpq72U4yzMfGc99K6
-tP9E6FiktACZQGlUaPVZe/Ut15jHSUEo894tso7XG/dWxqKbVMEjzMjwwC6WxJK1
-fd5WM2bor0fY9K9zMIOweCo=
-=2wZs
+jA0ECQMI71xa/M78CPH/0sABAWePpHsecx8nyyOTGKuQGT2gXkYLPDnYZ+tZRCWX
+YTGatN0+/jGc+5aluZfIZxJ7ukR+Fv+0DmdiWLHD/tNZsCvhYv5ULUjqW4uZWxsZ
+dnS6AnvYYVKPd8g9RopIh/gKQpEnMWZkD1LQ/xrXByMBS/yn+MZ6cwV33k7lWC3x
+qGlpdk9nmmTdEdEW8Jcby1izrNFzrOhMVxmokZ96q3S+/9gzJs9awdNoCqMhG7mR
+7BeCD7ljyg8rvFkQyccrdUOQPQ==
+=blvW
 -----END PGP MESSAGE-----
diff --git a/secrets/ssh_config/personal.conf.gpg b/secrets/ssh_config/personal.conf.gpg
index 7f9cbe0..84f7289 100644
--- a/secrets/ssh_config/personal.conf.gpg
+++ b/secrets/ssh_config/personal.conf.gpg
@@ -1,11 +1,10 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIJX/hE+QfNpz/0sBiAfL+UCwD3Q6xmXtnWFfx2jaPVzJ0LsxWCirV4NBR
-XdIYJ+bHdCPB6kTTCxbtY/oDMdC2POpDTCrF1hz76Ca42lvTN2OLxPuOmZwhp+GL
-fTYUaMcGcP5u6Lo3fHSeOo+EKLK9//S5HhKTn8ymJh+MllQbpBKBoO/GB+qOIcvh
-esRPM1szohidAYhpAmmLw0m7+LRrC5MN0pbrG80D0kchkhl+XYIUX39eUymbuAgZ
-ZIdJQ4inS/cp8FKZO0JI4HD6fu9+UFMeJrpv61XvQ3C06urNexyjNLvpUM/up/Nz
-xfCIiNTGvJY21kOAV3j9xtBz+ApZOgixzLr+QYHwJsKQPRlCRONhe+L8dpS6kIXm
-R/HEujbrurgfxlfe/jUCc96yGLY=
-=dKuW
+jA0ECQMI9K855NRHvZn/0sA2Ad1WfRHgB8vPtrPs9XXSm/NRgopAvuUON9AucQEE
+MCwfFuVbCyI9Ys3QrlyVhVgCb87YWYymT6LwxA8qSci1Y+WO5Pou5QD9zKnhNR2m
+KusG784K9YYj0cs7F0h8ecHAqpiu+kjhD6lEENCtYrHBd2Nv5Y3dTsFVgWVkBAYw
+YMoRb/e3d76BM2Jxm3nQLC+Bq6YrAPBbV6iwAZ/3yiunVBmzSdtB5Ksiz2y14C2U
+X3c6+m5x1eZj8IIufp0HR6AKbhtrHI5pRWtSEIcZnR9L1AiPTCfaT18JH2qZ1x81
+qQdWGj2donyx451Gbi1JXPrCdOP3tszR
+=BP/T
 -----END PGP MESSAGE-----
diff --git a/secrets/ssh_config/prod.conf.gpg b/secrets/ssh_config/prod.conf.gpg
index 9eef54c..85a5767 100644
--- a/secrets/ssh_config/prod.conf.gpg
+++ b/secrets/ssh_config/prod.conf.gpg
@@ -1,11 +1,12 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMI5QTAzMem3iX/0sB7Af9vzRP3ckaEbBXnuuDV2rySfPhVUIhWhCLrdDlF
-VPKF+LpsZtQ/YTMDUIs+LyY4+9WEAnA4BtvoKT0+dlG7KrkVZm0cdnuYPAjxUj/d
-UY6Oe+SxhWZ8REwee1bIezwOR1TDrCZ4Puqhzku6ldTCQ4TStm21yX6n0bC1sDZW
-crLZokGAnrdMurXNskjoCy7NKbA+qHPuX2dwjDLc5mM1nFUwSVcQKDGT2wa7oYgQ
-f/9BhI9TH/1uepyRErZq6J1DR0sc2q4ZEsMrIR7gqdGLlflFuZwZvmTrFybLEihV
-U3G+09UM1utbGlgkex7yOTp0DZ9/UxYvVdunrvS4WLM29ULQe6oGt7coTD9MiCQe
-2OvH/dvSNSgGcHvrYMEcORaLDtHJgYVvhY1CgYXrvthUsehAxBalSYKyFZfJ
-=XWXt
+jA0ECQMI35Tv4sOHHFP/0sCiATjXa++7x2ShpxMOSYkYv9EjI3Bw20iC3S6eN9EM
+mKo/zxJHCytI936OT9buxcEWgz9eIzQqFPl1H6W+ElKbQ79X401hLC3VkFUnlF/5
+RPAyVObbSoH1u1H3KVJ0LIguyCghxqxBCt1BEmS8R+y27PC0yCAl3fms6bfSt+mF
+MZIGXSrczmmuwzIRIUhXwqEpSLnnmpziQ22B/Npr2Asu3nwCA4zHan7doVPwCroH
+XA5HsQThAWx5G5FyQRAeAPneg6icJso7gvqBVMkuGLfh1BGAf2u5eHgbKopfdYh2
+NpE4JujzwMpp3e36NAuYcaR3JCodB3ULp0iPBtfqC7nfgm/XWHtul9pyIjIqFZG7
+8NFHRcbvvVRpP04/ESWS9Qlbc8x9A3jV3JdCHLup/W5xVJBVH0/XBP70rRCyVyxQ
+/4NJviMnzAXfFDRoEcNKVtdz2zQ20gVCBBOFVv/aGAtpuZNC
+=DPk2
 -----END PGP MESSAGE-----