it was base16 all along??

shaunsingh · Nov 18, 2023 · 426240d · 426240d
1 parent fb8a88f
commit 426240d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/flake.nix b/flake.nix
@@ -52,7 +52,6 @@
     home.inputs.nixpkgs.follows = "nixpkgs";
     nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
     statix.inputs.nixpkgs.follows = "nixpkgs";
-    base16.inputs.nixpkgs.follows = "nixpkgs";
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
     eww.inputs.nixpkgs.follows = "nixpkgs";
   };

diff --git a/modules/shared/home-manager/default.nix b/modules/shared/home-manager/default.nix
@@ -131,25 +131,25 @@
         nix_shell.symbol = " ";
       };
     };
-#     git = {
-#       enable = true;
-#       userName = "shaunsingh";
-#       userEmail = "[email protected]";
-#       ignores = [ "**/.idea/" "**/.vscode/settings.json" "**/.direnv/" "**/.DS_Store" ];
-#       extraConfig = {
-#         pull = { ff = "only"; };
-#         init.defaultBranch = "main";
-#         extraConfig = {
-#           diff.tool = "difftastic";
-#           pager.difftool = true;
-# 
-#           difftool = {
-#             prompt = false;
-#             difftastic.cmd = ''${lib.getExe pkgs.difftastic} "$LOCAL" "$REMOTE"'';
-#           };
-#         };
-#       };
-#     };
+    git = {
+      enable = true;
+      userName = "shaunsingh";
+      userEmail = "[email protected]";
+      ignores = [ "**/.idea/" "**/.vscode/settings.json" "**/.direnv/" "**/.DS_Store" ];
+      extraConfig = {
+        pull = { ff = "only"; };
+        init.defaultBranch = "main";
+        extraConfig = {
+          diff.tool = "difftastic";
+          pager.difftool = true;
+
+          difftool = {
+            prompt = false;
+            difftastic.cmd = ''${lib.getExe pkgs.difftastic} "$LOCAL" "$REMOTE"'';
+          };
+        };
+      };
+    };
     fish = {
       enable = true;
       shellAliases = {