diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 3b30960..0e5699e 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -6,10 +6,6 @@
 		# As of the 1st of May 2023, the default packages are nano, perl, rsync and strace
 		# I don't need any of them, so I just empty the list
 		defaultPackages = [];
-		variables = {
-			# Environment variables go here
-			EDITOR = "micro";
-		};
 	};
 
 	# Set up /tmp
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index e6d2127..7950344 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -13,6 +13,7 @@
 		./starship.nix
 		./bat.nix
 		./btop.nix
+		./neovim.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [
diff --git a/roles/common/programs/neovim.nix b/roles/common/programs/neovim.nix
new file mode 100644
index 0000000..6b82c4b
--- /dev/null
+++ b/roles/common/programs/neovim.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  home-manager.users.toast = {
+    programs.neovim = {
+      enable = true;
+      plugins = with pkgs.vimPlugins; [
+        catppuccin-nvim
+      ];
+    };
+  };
+}
diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix
index b0b1d51..bfd7c38 100644
--- a/roles/desktop/programs/vscode.nix
+++ b/roles/desktop/programs/vscode.nix
@@ -13,6 +13,7 @@ let inputs = flakeSelf.inputs; in
 				extraBordersEnabled = true;
 			})
 			catppuccin.catppuccin-vsc-icons
+			waderyan.gitblame
 		];
 		userSettings = {
 			# VSCode doesn't like nested settings
diff --git a/roles/server/syncthing.nix b/roles/server/syncthing.nix
index dd7768c..48742ac 100755
--- a/roles/server/syncthing.nix
+++ b/roles/server/syncthing.nix
@@ -18,19 +18,19 @@
 			"school-things" = {
 				label = "School things";
 				id = "z6alc-nfoqr";
-				devices = [ "steamdeck" "server" "pc"];
+				devices = [ "steamdeck" "server" "pc" "winmax2" ];
 				path = "${config.services.syncthing.dataDir}/school-things";
 			};
 			"steam-201810" = {
 				label = "Wolfenstein The New Order Saves";
 				id = "laxxf-t2wmy";
-				devices = [ "steamdeck" "server" "pc" ];
+				devices = [ "steamdeck" "server" "pc" "winmax2" ];
 				path = "${config.services.syncthing.dataDir}/steam-201810";
 			};
 			"retroarch"= {
 			label = "RetroArch";
 			id = "jxuou-2yjnu";
-			devices = [ "steamdeck" "server" "pc" ];
+			devices = [ "steamdeck" "server" "pc" "winmax2" ];
 			path = "${config.services.syncthing.dataDir}/retroarch";
 		};
 		};