diff --git a/modules/nixos-common.nix b/modules/nixos-common.nix
index 41d77c6..8c7c637 100644
--- a/modules/nixos-common.nix
+++ b/modules/nixos-common.nix
@@ -116,7 +116,7 @@
           devices = ["bicep" "jwst" "echo"];
         };
         "/data/textbooks" = {
-        	id = "textbooks";
+          id = "textbooks";
           devices = ["bicep" "jwst" "echo"];
         };
       };
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index e6eeb11..1f18059 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -15,7 +15,7 @@
     homeDirectory = "/home/tacocat";
     stateVersion = "24.05";
     sessionVariables = {
-      EDITOR = "hx";
+      EDITOR = "nvim";
       BAT_THEME = "ansi";
       DOTNET_ROOT = "$HOME/.dotnet";
     };
diff --git a/users/tacocat/neovim/default.nix b/users/tacocat/neovim/default.nix
index b6ad2e0..2c197cc 100644
--- a/users/tacocat/neovim/default.nix
+++ b/users/tacocat/neovim/default.nix
@@ -1,10 +1,14 @@
-{pkgs, lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nixvim = {
     enable = true;
-    colorschemes.base16 = {
+    colorschemes.nord = {
       enable = true;
-      colorscheme = "blueish";
-      setUpBar = false;
+      borders = true;
+      contrast = true;
     };
     clipboard = {
       providers.wl-copy.enable = true;
@@ -18,6 +22,7 @@
       expandtab = false;
       scrolloff = 5;
       autoindent = true;
+      smartindent = true;
       copyindent = true;
       signcolumn = "yes";
       cursorline = true;
@@ -26,7 +31,7 @@
     plugins = {
       lightline = {
         enable = true;
-        colorscheme = lib.mkForce "solarized";
+        colorscheme = "nord";
       };
       gitsigns = {
         enable = true;
@@ -36,5 +41,10 @@
         nixvimInjections = true;
       };
     };
+    #    filetype.extension = {
+    #    	".md" = ''
+    #    		vim.bo.spell = true
+    #    	'';
+    #    };
   };
 }
diff --git a/users/tacocat/programs/git.nix b/users/tacocat/programs/git.nix
index fd00b53..ed0823d 100644
--- a/users/tacocat/programs/git.nix
+++ b/users/tacocat/programs/git.nix
@@ -5,6 +5,7 @@
     userName = "Aria Nolan";
     extraConfig = {
       init.defaultbranch = "main";
+      diff.tool = "nvimdiff";
     };
     aliases = {
       co = "checkout";
@@ -12,19 +13,6 @@
       pom = "push -u origin main";
       cm = "commit -m";
     };
-    delta = {
-      enable = true;
-      options = {
-        decorations = {
-          commit-decoration-style = "bold yellow box ul";
-          file-decoration-style = "none";
-          file-style = "bold yellow ul";
-        };
-        features = "decorations";
-        whitespace-error-style = "22 reverse";
-        syntax-theme = "ansi";
-      };
-    };
   };
 
   programs.gitui = {