diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 24d894a..b00f4d7 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -90,9 +90,6 @@ inputs.nixpkgs.lib.nixosSystem {
       yubikey.enable = true;
       kdeconnect.enable = true;
       tailscale.enable = true;
-
-      # TODO: Move this out
-
     }
   ];
 }
diff --git a/hosts/kim/netbird.nix b/hosts/kim/netbird.nix
index 28944f9..5543e5e 100644
--- a/hosts/kim/netbird.nix
+++ b/hosts/kim/netbird.nix
@@ -1,6 +1,8 @@
-{ config, lib, pkgs, ... }:
-{
-  sops.secrets."netbird/setup_keys/end_user" = { };
+{ config, lib, pkgs, ... }: {
+  sops.secrets."netbird/setup_keys/end_user" = {
+    owner = config.users.users.annika.name;
+    group = config.users.users.annika.group;
+  };
   netbird = {
     enable = true;
     opts = {
diff --git a/modules/common/applications/netbird.nix b/modules/common/applications/netbird.nix
index 55a2c2f..5a2c5c0 100644
--- a/modules/common/applications/netbird.nix
+++ b/modules/common/applications/netbird.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, lib, ... }:
-{
+{ config, pkgs, lib, ... }: {
   options = {
     netbird = {
       enable = lib.mkEnableOption {
@@ -43,33 +42,40 @@
   #   (lib.mkIf p yes)
   #   (lib.mkif (!p) no)
   # ];
-  config = lib.mkIf (config.netbird.enable)
-    (lib.mkMerge [
-      {
-        services.netbird = {
-          enable = true;
-          tunnels = {
-            wt0.environment = (lib.mkMerge [
-              {
-                NB_MANAGEMENT_URL = config.netbird.opts.management_url;
-                NB_ADMIN_URL = config.netbird.opts.admin_url;
-              }
-              (lib.mkIf (config.netbird.opts.setup_key != "") {
-                NB_SETUP_KEY = config.netbird.opts.setup_key;
-              })
-              (lib.mkIf(config.netbird.opts.setup_key_file != "") {
-                NB_SETUP_KEY_FILE = config.netbird.opts.setup_key_file;
-              })
-            ]);
-          };
+  config = lib.mkIf (config.netbird.enable) (lib.mkMerge [
+    {
+      services.netbird = {
+        enable = true;
+        tunnels = {
+          wt0.environment = (lib.mkMerge [
+            {
+              NB_MANAGEMENT_URL = config.netbird.opts.management_url;
+              NB_ADMIN_URL = config.netbird.opts.admin_url;
+            }
+            (lib.mkIf (config.netbird.opts.setup_key != "") {
+              NB_SETUP_KEY = config.netbird.opts.setup_key;
+            })
+            (lib.mkIf (config.netbird.opts.setup_key_file != "") {
+              NB_SETUP_KEY_FILE = config.netbird.opts.setup_key_file;
+            })
+          ]);
         };
-      }
-      (lib.mkIf (config.gui.enable) {
-        home-manager.users.${config.user} = {
-          home.packages = [
-            pkgs.netbird-ui
-          ];
+      };
+      environment = {
+        variables = {
+          NB_MANAGEMENT_URL = config.netbird.opts.management_url;
+          NB_ADMIN_URL = config.netbird.opts.admin_url;
+          NB_SETUP_KEY = config.netbird.opts.setup_key;
+          NB_SETUP_KEY_FILE = config.netbird.opts.setup_key_file;
         };
-      })
-    ]);
+      };
+    }
+    (lib.mkIf (config.gui.enable) {
+      home-manager.users.${config.user} = {
+        home.packages = [
+          pkgs.netbird-ui
+        ];
+      };
+    })
+  ]);
 }
diff --git a/modules/common/programming/nixpkgs-fmt.nix b/modules/common/programming/nixpkgs-fmt.nix
index de6a172..3e3c794 100644
--- a/modules/common/programming/nixpkgs-fmt.nix
+++ b/modules/common/programming/nixpkgs-fmt.nix
@@ -12,6 +12,7 @@
     home-manager.users.${config.user} = {
       home.packages = [
         pkgs.nixpkgs-fmt
+        pkgs.nixfmt-classic
       ];
     };
   };
diff --git a/modules/common/programming/vscode.nix b/modules/common/programming/vscode.nix
index 279c62b..f78d8ba 100644
--- a/modules/common/programming/vscode.nix
+++ b/modules/common/programming/vscode.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, lib, ... }:
-{
+{ config, pkgs, lib, ... }: {
   options = {
     vscode = {
       enable = lib.mkEnableOption {
@@ -11,10 +10,10 @@
   config = lib.mkIf (config.gui.enable && config.vscode.enable) {
     home-manager.users.${config.user} = {
       nixpkgs.config.allowUnfree = true;
-      
+
       programs.vscode = {
         enable = true;
-        
+
         enableUpdateCheck = false;
         enableExtensionUpdateCheck = false;
         mutableExtensionsDir = false;
@@ -32,13 +31,13 @@
           golang.go
           mkhl.direnv
           ms-vscode-remote.remote-ssh
+          ms-vscode-remote.remote-containers
         ];
         userSettings = {
           "workbench.colorTheme" = "Catppuccin Mocha";
           "editor.tabSize" = 2;
           "editor.insertSpaces" = true;
           "git.autofetch" = true;
-          # "git.enableSmartCommit" = true;
           "git.confirmSync" = false;
         };
       };
diff --git a/modules/common/utilities/git.nix b/modules/common/utilities/git.nix
index e28bd8c..9755d7f 100644
--- a/modules/common/utilities/git.nix
+++ b/modules/common/utilities/git.nix
@@ -22,6 +22,11 @@ in
         enable = true;
         userName = config.gitName;
         userEmail = config.gitEmail;
+        extraConfig = {
+          pull = {
+            rebase = true;
+          };
+        };
       };
     };
   };
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index abed3a1..37763a5 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -5,7 +5,7 @@ spotifyd:
 annika_password: ENC[AES256_GCM,data:qRdNYmU7Z0A0r3rhyTQMa9I/uNjlSMSjPzRNDBUvpV8t+jlN+l+5XzGawS7E1cwBTuU/rkdSha2vU2hCyWgxqOmLjSp8okCUSw==,iv:12lV4/zC5uneYnDrps9cdv5J1fXiuMfIGmoaYDaVD5c=,tag:d8SNVCcbYOT0iiUjeKVsWA==,type:str]
 netbird:
     setup_keys:
-        end_user: ENC[AES256_GCM,data:9fFfVWHO2e3lACEl1+g+rWUQ1o6jZUQfTKBCXRcGTLClZ+ho,iv:LPaUSzZHy+iN9w7kjvDyGhHajR56G+S26JlMeur+Bko=,tag:SAASFjfyya3cigsyaR/mlg==,type:str]
+        end_user: ENC[AES256_GCM,data:XjgsnBmh0pzRoFBlrB9Bcaa6vtyw9Uzy0lzqLyl74S4TBMQu,iv:QMXT9RivPRerlc6/L0GACUp0Eys1fPWMX9BBbaHKoOM=,tag:2wG7cz0bV+axaAszxz6ueQ==,type:str]
         servers: ENC[AES256_GCM,data:2x2OPHTTTK3bltlzE/bQWuy+4l5/qxlkmyS8Ll1rvZVm5L0t,iv:+kXwJCQsg4qxNWzhTekwaSHOdTlM1HHFwIBK9iRKMA0=,tag:aQjYYU0MvMccwoOBtvzYdg==,type:str]
 sops:
     kms: []
@@ -31,8 +31,8 @@ sops:
             akR2d2ZrWjd5cWZ4NnJoSko3SWR3NmsKuq10DkZpKclYzpcl1BURi3oiHCNabrih
             svx2Rm2xAvWQZldB3i0Bhie7NszqWM0qQ82dKUkia8GDmz8HNC3pdA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-13T18:16:36Z"
-    mac: ENC[AES256_GCM,data:6WrgKVG9k6MupgyoclYxBNuo1KL4GShO6v+dfIZtthgaN3EVXFflG2ZnmVQfy5Y1lkxnLYcjD0kUeEsT4h5pjR9tMw7ZOwXclWdR8CskInhhAqcLUhtORjuW2gxxeR7JYFXoizuSFKh6C4ebG1TFugWK47DjfBA6yHLFDjUwBjw=,iv:3kAxoBN0FD3E6jtlR9B8NOywoyzKS1ihjUVWpHErdvY=,tag:ljQt4hrhvmRIwhENNUYduw==,type:str]
+    lastmodified: "2024-09-02T21:20:03Z"
+    mac: ENC[AES256_GCM,data:5lz7qVbblzjAA3Kpmckvb1AhuuuHDu2g2vO/mh0h3DQFdX5t32VkM7FBsrl+i0r79yduhRhZ2cqNpvmeWPmwvQ1g4tctunqwul139WEfm39P1gqRXCP1PfVIwCT6WOhMwnzd6UyCSA57CbjJodMXHIj/A3nre0L5DgPJFy5imNQ=,iv:58d0HqoTobZcv2S3+L5Fe3lk+ctxLiDBOlTnjsQZGQM=,tag:p/i0C2jAcijaCN2vLy8blQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0