From 45c6a5d5f2d81e8e6bed621cbf6a0c84a6ab5f79 Mon Sep 17 00:00:00 2001
From: Emma Thorpe <daniel@danielthorpe.me>
Date: Thu, 29 May 2025 17:05:38 +0100
Subject: [PATCH] feat: initial Vim configs

---
 emmathorpe/home.nix                 | 47 +++++++++++++++++------------
 system/machine/X1/configuration.nix |  1 -
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/emmathorpe/home.nix b/emmathorpe/home.nix
index 1ef33b6..eada8b3 100644
--- a/emmathorpe/home.nix
+++ b/emmathorpe/home.nix
@@ -15,16 +15,16 @@
 		};
 		syntaxHighlighting.enable = true;
 		initContent = lib.mkOrder 1500 ''
-				if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
-					exec sway
-				fi
-				if [ "$SSH_CLIENT" ] || [ "$SSH_TTY" ]; then
-					export PS1=%M\ $PS1
-				fi
-			'';
+			if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
+				exec sway
+			fi
+			if [ "$SSH_CLIENT" ] || [ "$SSH_TTY" ]; then
+				export PS1=%M\ $PS1
+			fi
+		'';
 		envExtra = ''
 			alias cls=clear
-			'';
+		'';
 	};
 	programs.tmux = {
 		enable = true;
@@ -45,25 +45,34 @@
 	};
 	home.stateVersion = "25.05";
 	home.pointerCursor = {
-	  	gtk.enable = true;
-	  	x11 = {
-			enable = true;
-			defaultCursor = "Adwaita";
-		};
-	  	package = pkgs.adwaita-icon-theme;
-	  	name = "Adwaita";
-	  	size = 24;
+	  gtk.enable = true;
+	  x11 = {
+		  enable = true;
+		  defaultCursor = "Adwaita";
+	  };
+    package = pkgs.adwaita-icon-theme;
+    name = "Adwaita";
+    size = 24;
 	};
 	home.packages = [
 		pkgs.element-desktop
 	];
 	home.sessionVariables = {
 		MOZ_USE_XINPUT2 = "1";
-  		# only needed for Sway
-  		XDG_CURRENT_DESKTOP = "sway"; 
+  	# only needed for Sway
+  	XDG_CURRENT_DESKTOP = "sway"; 
 	};
 	programs.vim = {
 		enable = true;
-		defaultEditor = true;
+    defaultEditor = true;
+    plugins = with pkgs.vimPlugins; [ nerdtree ale vim-fugitive vim-indent-guides ];
+    settings = {
+      expandtab = false;
+      tabstop = 2;
+      shiftwidth = 2;
+    };
+    extraConfig = ''
+      let g:indent_guides_enable_on_vim_startup = 1
+    '';
 	};	
 }
diff --git a/system/machine/X1/configuration.nix b/system/machine/X1/configuration.nix
index 6efe63f..67e3dc7 100644
--- a/system/machine/X1/configuration.nix
+++ b/system/machine/X1/configuration.nix
@@ -76,7 +76,6 @@
   # 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.
     git
     neofetch
   #   wget