diff --git a/home-manager/git.nix b/home-manager/git.nix
index 0fff1e2..47ea5fe 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -16,7 +16,7 @@
     };
     extraConfig = {
       core.autocrlf = false;
-      core.editor = "nvim";
+      core.editor = "${pkgs.neovim}/bin/nvim";
       pull.ff = "only";
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 964a8ce..27c7a74 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -44,22 +44,31 @@ in
     git-absorb
     git-crypt
     htop
+    hyperfine
     inferno
     jetbrains.idea-ultimate
     linuxKernel.packages.linux_6_1.perf
-    mold # For global .cargo/config.toml
     nixpkgs-fmt
-    obsidian
     obs-studio
+    obsidian
     postman
     prismlauncher
     python3
     ripgrep
     rnix-lsp
     rustup-toolchain-install-master
+    samply
     spotify
   ];
 
+  home.file.".cargo/config.toml" = {
+    text = ''
+      [target.x86_64-unknown-linux-gnu]
+      linker = "clang"
+      rustflags = ["-Clink-arg=-fuse-ld=${pkgs.mold}/bin/mold", "-Ctarget-cpu=native"]
+    '';
+  };
+
   programs.home-manager.enable = true;
 
   programs.fish = {
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 09d9f82..047e39b 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -1,7 +1,9 @@
 { pkgs, ... }: {
   programs.vscode = {
     enable = true;
-    package = pkgs.vscode;
+    package = pkgs.vscodium;
+    enableUpdateCheck = false;
+    mutableExtensionsDir = false;
     extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide
       usernamehw.errorlens
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 71791a9..663a044 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -152,13 +152,11 @@
         isNormalUser = true;
         openssh.authorizedKeys.keys = [
           # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0n1ikUG9rYqobh7WpAyXrqZqxQoQ2zNJrFPj12gTpP"
         ];
         extraGroups = [ "wheel" "networkmanager" "audio" "libvirtd" ];
-        # TODO: This is mostly temporary until home-manager works nicely
         packages = with pkgs; [
-          firefox
           vscode
-          home-manager
         ];
         shell = pkgs.fish;
       };
@@ -170,20 +168,15 @@
     };
   };
 
-  # SSH Server, maybe enable at some point
   services.openssh = {
     enable = true;
-    # Forbid root login through SSH.
     settings.PermitRootLogin = "no";
-    # Use keys only. Remove if you want to SSH using password (not recommended)
     settings.PasswordAuthentication = false;
   };
 
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    vim
     wget
     (curl.override {
       # error: implicit declaration of function 'SSL_set_quic_use_legacy_codepoint' :(