3 files changed, 33 insertions, 37 deletions

diff --git a/programs/default.nix b/programs/default.nix
index 8157c8a..2b12888 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -27,10 +27,7 @@
     direnv = {
       enable = true;
       enableBashIntegration = true;
-      nix-direnv = {
-        enable = true;
-        enableFlakes = true;
-      };
+      nix-direnv.enable = true;
     };
     autojump = {
       enable = true;
diff --git a/programs/git.nix b/programs/git.nix
index dc842ce..b906efa 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -9,9 +9,35 @@ with theme;
   programs.git = {
     enable = true;
     ignores = [ ".envrc" ];
-    delta.enable = true;
     userEmail = "[email protected]";
     userName = "Akshay";
+    delta = {
+      enable = true;
+      options = {
+        features = "decorations labels";
+        syntax-theme = "none";
+        zero-style = "8";
+        navigate = "true";
+        keep-plus-minus-markers = "true";
+        decorations = {
+          file-decoration-style = "none";
+          whitespace-error-style = "22 reverse";
+          minus-style = "${base08}";
+          minus-emph-style = "${base08} bold";
+          plus-style = "${base0B}";
+          plus-emph-style = "${base0B} bold";
+          file-style = "7 italic";
+          hunk-header-style = "7";
+          hunk-header-decoration-style = "8 ul";
+        };
+        labels = {
+          file-modified-label = " MODIFIED ";
+          file-removed-label = " REMOVED ";
+          file-added-label = " ADDED ";
+          file-renamed-label = " RENAMED ";
+        };
+      };
+    };
     extraConfig = {
       commit.verbose = true;
       core = {
@@ -20,30 +46,4 @@ with theme;
     };
   };
 }
-# delta = {
-#   enable = true;
-#   options = {
-#     features = "decorations labels";
-#     syntax-theme = "none";
-#     zero-style = "8";
-#     navigate = "true";
-#     keep-plus-minus-markers = "true";
-#     decorations = {
-#       file-decoration-style = "none";
-#       whitespace-error-style = "22 reverse";
-#       minus-style = "${base08}";
-#       minus-emph-style = "${base08} bold";
-#       plus-style = "${base0B}";
-#       plus-emph-style = "${base0B} bold";
-#       file-style = "7 italic";
-#       hunk-header-style = "7";
-#       hunk-header-decoration-style = "8 ul";
-#     };
-#     labels = {
-#       file-modified-label = " MODIFIED ";
-#       file-removed-label = " REMOVED ";
-#       file-added-label = " ADDED ";
-#       file-renamed-label = " RENAMED ";
-#     };
-#   };
-# };
+
diff --git a/programs/neovim.nix b/programs/neovim.nix
index f108993..6095e0f 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -12,11 +12,10 @@
     vimAlias = true;
     withPython3 = true;
     extraPackages = with pkgs; [
-      gcc
-      python37Packages.yapf
-      hlint
-      ocamlformat
-      ocamlPackages.ocaml-lsp
+      # gcc
+      # python37Packages.yapf
+      # hlint
+      # ocamlformat
     ];
     plugins = with pkgs.vimPlugins; [
       # neovim only