diff --git a/home-manager/IDEs/vscode.nix b/home-manager/IDEs/vscode.nix
index 656ff54..8c69109 100644
--- a/home-manager/IDEs/vscode.nix
+++ b/home-manager/IDEs/vscode.nix
@@ -11,6 +11,33 @@
       mhutchie.git-graph
       donjayamanne.githistory
       eamodio.gitlens
+
+      # Rust plugins
+      rust-lang.rust-analyzer
+      tamasfe.even-better-toml
+      fill-labs.dependi
     ];
+
+    userSettings = {
+      # Theme
+      "workbench.iconTheme" = "catppuccin-mocha";
+      "workbench.colorTheme" = "Catppuccin Mocha";
+      "workbench.sideBar.location" = "right";
+      "workbench.activityBar.location" = "bottom";
+      "editor.fontFamily" = "Source Code Pro";
+
+      # Settings for all files
+      "files.autoSave" = "off";
+
+      # Git settings
+      "git.autofetch" = true;
+      "git.confirmSync" = false;
+      "git.alwaysSignOff" = true;
+      "git.pruneOnFetch" = true;
+
+
+      # Nix lang settings
+      "[nix]"."editor.tabSize" = 2;
+    };
   };
 }
\ No newline at end of file
diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix
index d7e1d8e..d781f56 100644
--- a/home-manager/git/default.nix
+++ b/home-manager/git/default.nix
@@ -22,19 +22,40 @@
       fetch = { prune = true; };
     };
 
+    lfs.enable = true;
+
     includes = [
       {
-        condition = "gitdir:~/git.noahknegt.com";
-        path = "~/.config/git/git.noahknegt.com.gitconfig";
+        condition = "gitdir:~/Repos/git.noahknegt.com/";
         contents = {
-          userEmail = "git@noahknegt.com";
+          user = {
+            email = "git@noahknegt.com";
+          };
+
+          commit = {
+            gpgSign = true;
+          };
+
+          tag = {
+            gpgSign = true;
+          };
         };
       }
       {
-        condition = "gitdir:~/open-source";
-        path = "~/.config/git/open-source.gitconfig";
+        condition = "gitdir:~/Repos/open-source/";
         contents = {
-          userEmail = "git@noahknegt.com";
+          user = {
+            email = "git@noahknegt.com";
+            signingKey = "~/.ssh/id_open_source.pub";
+          };
+
+          commit = {
+            gpgSign = true;
+          };
+
+          tag = {
+            gpgSign = true;
+          };
         };
       }
     ];
diff --git a/home-manager/home.nix b/home-manager/home.nix
index eea40ec..30cd3e6 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -49,17 +49,28 @@
     username = "noahk";
     homeDirectory = "/home/noahk";
 
-    packages = [
-      (pkgs.nerdfonts.override { fonts = [ "SourceCodePro" ]; })
+    packages = with pkgs; [
+      (nerdfonts.override { fonts = [ "SourceCodePro" ]; })
+
+      # Desktop env
+      discord
+      spotify
+      obsidian
+      vlc
+
+      # Security
+      openvpn
+      bitwarden-desktop
+      bitwarden-cli
+
+      # Development
+      gcc
+      rustup
     ];
   };
 
   fonts.fontconfig.enable = true;
 
-  # Add stuff for your user as you see fit:
-  # programs.neovim.enable = true;
-  # home.packages = with pkgs; [ steam ];
-
   # Enable home-manager and git
   programs.home-manager.enable = true;
 
diff --git a/home-manager/tools/default.nix b/home-manager/tools/default.nix
index 6af9a51..4ce84e2 100644
--- a/home-manager/tools/default.nix
+++ b/home-manager/tools/default.nix
@@ -5,6 +5,7 @@
     ./bat.nix
     ./eza.nix
     ./fzf.nix
+    ./jq.nix
     ./ripgrep.nix
     ./tmux.nix
   ];
diff --git a/home-manager/tools/jq.nix b/home-manager/tools/jq.nix
new file mode 100644
index 0000000..1506d5b
--- /dev/null
+++ b/home-manager/tools/jq.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  programs.jq.enable = true;
+}
\ No newline at end of file
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 8b8859f..c242f0e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -123,9 +123,6 @@
     papirus-icon-theme
     # Menu kind
     xfce.xfce4-whiskermenu-plugin
-
-    # Spotify
-    spotify
   ];
 
   # This value determines the NixOS release from which the default