7 files changed, 13 insertions, 140 deletions
diff --git a/user/settings/base.nix b/user/settings/base.nix
index 52cb14ac..5c5d6012 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -65,10 +65,7 @@ args@{ config
   programs.bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [
-      batdiff
       batman
-      batgrep
-      batpipe
     ];
     config = {
       theme = "ansi";
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index acb0697b..e894bebd 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -16,10 +16,6 @@
 
   home.file.".hushlogin".text = "";
 
-  services.syncthing = {
-    enable = true;
-  };
-
   launchd.agents = {
     home-manager-expire-generations = {
       enable = true;
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index 5bf54172..83af68ae 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -3,14 +3,12 @@
 , ...
 }:
 {
-  imports = [ ../../modules/tabnine.nix ];
   home.packages = with pkgs;
     [
       shellcheck
       shfmt
-      nodePackages.dockerfile-language-server-nodejs
-      nodePackages.vscode-json-languageserver
-      nodePackages.yaml-language-server
+      dockerfile-language-server-nodejs
+      yaml-language-server
       lua-language-server
       taplo # toml
 
diff --git a/user/settings/development/golang.nix b/user/settings/development/golang.nix
index 8798fbc6..7fe5ad1e 100644
--- a/user/settings/development/golang.nix
+++ b/user/settings/development/golang.nix
@@ -15,6 +15,7 @@
   home.sessionPath = [
     "$HOME/go/bin"
   ];
+  home.sessionVariables.GOTOOLCHAIN = "local"; # use installed go tools
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     go-eldoc
     go-tag
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index 77b3e01d..e4d9d02c 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -4,8 +4,7 @@
 , ...
 }: {
   home.packages = with pkgs.nodePackages; [
-    vscode-css-languageserver-bin
-    vscode-html-languageserver-bin
+    vscode-langservers-extracted
     csslint
     stylelint
   ] ++ (with pkgs; [
diff --git a/user/settings/git.nix b/user/settings/git.nix
index 769b3728..646a10c2 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -32,21 +32,27 @@
       pull = {
         rebase = true;
       };
+      fetch = {
+        prune = true;
+        prunetags = true;
+      };
       push = {
         default = "current";
+        autoSetupRemote = true;
         followTags = true;
       };
       rebase = {
         autosquash = true;
+        updateRefs = true;
       };
       rerere = {
-        enable = true;
+        enabled = true;
       };
       merge = {
         conflictStyle = "diff3";
       };
       diff = {
-        algorithm = "patience";
+        algorithm = "histogram";
         colorMoved = "default";
       };
       remote = {
@@ -58,6 +64,7 @@
       "branch.main" = {
         rebase = false;
       };
+      "url.git@github.com:".insteadOf = "https://github.com/";
     };
     signing = {
       key = "0xCD4BEB92A8D46583";
@@ -91,7 +98,6 @@
       "*~"
       "\#*\#"
       ".\#*"
-      ".tabnine_root"
     ];
   };
   programs.gh = {
diff --git a/user/settings/tabnine.nix b/user/settings/tabnine.nix
deleted file mode 100644
index 9502c68d..00000000
--- a/user/settings/tabnine.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ config
-, pkgs
-, ...
-}: {
-  home.packages = with pkgs; [
-    tabnine
-  ];
-  programs.tabnine = {
-    enable = pkgs.lib.mkDefault true;
-    config = {
-      version = pkgs.tabnine.version;
-
-      api_base_url = null;
-      api_key = config.programs.tabnine.registrationKey;
-      beta_enabled = "No";
-      binary_update_interval_seconds = 365 * 24 * 3600;
-      cloud_whitelist = [ ];
-      creation_time = "2020-12-28T21:42:35.732522096Z";
-      deep_completions_work_mode = "LocalOnly";
-      disable_auto_update = true;
-      disable_local_when_using_battery = false;
-      enable_power_saving_mode = false;
-      enable_telemetry = false;
-      exclude_file_masks = true;
-      force_local_hub = true;
-      generation = 0;
-      guuid = null;
-      gusr.gcgdc = "0000000000000000000000000000000000000000000000000000000000000000";
-      has_git_repos = null;
-      heartbeat_interval_seconds = null;
-      hide_deep_information_message = false;
-      hide_promotional_message = true;
-      hosted_deep_completions_enabled = "Disabled";
-      ignore_all_lsp = false;
-      inline_suggestions_mode = true;
-      inline_suggestions_mode_clients = null;
-      last_service_level = null;
-      line_suggestions = true;
-      local_enabled = "Yes";
-      local_indexing = null;
-      local_model_size = null;
-      manually_selected_model = null;
-      model_hash_override = null;
-      num_of_suggestions = 5;
-      omit_prefix_suggestions = null;
-      onboarding = {
-        model_type = null;
-        skipped_login = true;
-        completed = true;
-      };
-      rate_limit_amount = null;
-      rate_limit_interval_seconds = null;
-      rlhf = null;
-      semantic_status = {
-        css = "Enabled";
-        dockerfile = "Enabled";
-        go = "Enabled";
-        haskell = "Enabled";
-        html = "Enabled";
-        javascript = "Enabled";
-        nix = "Enabled";
-        ruby = "Enabled";
-        scss = "Enabled";
-        typescript = "Enabled";
-        yaml = "Enabled";
-      };
-      snippets_enabled_v2 = true;
-      tabnine_cloud_certificate_domain = null;
-      tabnine_cloud_host = null;
-      tabnine_cloud_port = null;
-      tabnine_hub_port = null;
-      use_specialized_model_if_available = true;
-      user_understands_that_enabling_tabnine_cloud_sends_code_to_tabnine_servers = false;
-    };
-    lspConfig.language = {
-      typescript = {
-        command = "typescript-language-server";
-        args = [ "--stdio" ];
-      };
-      javascript = {
-        command = "javascript-typescript-stdio";
-        args = [ "--stdio" ];
-      };
-      css = {
-        command = "css-languageserver";
-        args = [ "--stdio" ];
-      };
-      scss = {
-        command = "css-languageserver";
-        args = [ "--stdio" ];
-      };
-      html = {
-        command = "html-languageserver";
-        args = [ "--stdio" ];
-      };
-      nix = {
-        command = "nil";
-        args = [ "--stdio" ];
-      };
-      dockerfile = {
-        command = "docker-langserver";
-        args = [ "--stdio" ];
-      };
-      ruby = {
-        command = "solargraph";
-        args = [ "stdio" ];
-      };
-      yaml = {
-        command = "yaml-language-server";
-        args = [ "--stdio" ];
-      };
-      haskell = {
-        command = "hie";
-        args = [ "--stdio" ];
-      };
-      go = {
-        command = "gopls";
-        args = [
-          "serve"
-        ];
-      };
-    };
-  };
-}