summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/config.nix3
-rw-r--r--user/emacs/init.el23
-rw-r--r--user/mba.nix1
-rw-r--r--user/modules/tabnine.nix94
-rw-r--r--user/prefect.nix1
-rw-r--r--user/settings/base.nix3
-rw-r--r--user/settings/darwin.nix4
-rw-r--r--user/settings/development/base.nix6
-rw-r--r--user/settings/development/golang.nix1
-rw-r--r--user/settings/development/web.nix3
-rw-r--r--user/settings/git.nix12
-rw-r--r--user/settings/tabnine.nix124
12 files changed, 14 insertions, 261 deletions
diff --git a/user/config.nix b/user/config.nix
index 5a420d7b..6faa57cc 100644
--- a/user/config.nix
+++ b/user/config.nix
@@ -7,10 +7,9 @@ in
     "beeper"
     "discord"
     "input-fonts"
-    "tabnine"
   ];
   input-fonts.acceptLicense = true;
   permittedInsecurePackages = [
-    "electron-28.3.3" # for logseq 0.10.9
+    "electron-27.3.11" # for logseq 0.10.9
   ];
 }
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 45054237..69c71d00 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -582,29 +582,6 @@ _C-k_: prev  _u_pper              _=_: upper/lower       _s_mart resolve
             (setq kind-icon-default-face 'corfu-default)
             (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter)))
 
-(use-package tabnine-core
-  :config (progn
-            (setq tabnine-binaries-folder "~/.local/tabnine")
-            (with-demoted-errors "TabNine error: %s"
-              (when (tabnine--executable-path)
-                (global-tabnine-mode)))
-
-            (define-key tabnine-completion-map (kbd "TAB") #'tabnine-accept-completion)
-            (define-key tabnine-completion-map (kbd "<tab>") #'tabnine-accept-completion)
-
-            (define-key tabnine-completion-map (kbd "M-f") #'tabnine-accept-completion-by-word)
-            (define-key tabnine-completion-map (kbd "M-<return>") #'tabnine-accept-completion-by-line)
-            (define-key tabnine-completion-map (kbd "C-e") #'tabnine-accept-completion-by-line)
-            (define-key tabnine-completion-map (kbd "<right>") #'tabnine-accept-completion-by-line)
-
-            (define-key tabnine-completion-map (kbd "C-g") #'tabnine-clear-overlay)
-            (define-key tabnine-completion-map (kbd "M-[") #'tabnine-next-completion)
-            (define-key tabnine-completion-map (kbd "M-]") #'tabnine-previous-completion))
-  :init (progn
-          (advice-add 'tabnine-start-process :around #'quiet)
-
-          (add-hook 'kill-emacs-hook #'tabnine-kill-process)))
-
 (use-package tempel
   :general ("M-+" #'tempel-complete ;; Alternative tempel-expand
             "M-*" #'tempel-insert
diff --git a/user/mba.nix b/user/mba.nix
index ca7b0706..890cda69 100644
--- a/user/mba.nix
+++ b/user/mba.nix
@@ -12,7 +12,6 @@
     ./settings/kitty.nix
     ./settings/nixpkgs.nix
     ./settings/ssh.nix
-    ./settings/tabnine.nix
     ./settings/user-interface.nix
     <private>
     <private/ssh.nix>
diff --git a/user/modules/tabnine.nix b/user/modules/tabnine.nix
deleted file mode 100644
index 3eee4834..00000000
--- a/user/modules/tabnine.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-with lib; let
-  inherit (pkgs) stdenv;
-  tomlFormat = pkgs.formats.toml { };
-  cfg = config.programs.tabnine;
-  lspConfigFile = config:
-    pkgs.runCommand "TabNine.toml"
-      {
-        buildInputs = [ pkgs.remarshal ];
-        preferLocalBuild = true;
-        allowSubstitutes = false;
-      }
-      ''
-        remarshal -if json -of toml \
-        < ${pkgs.writeText "config.json" (builtins.toJSON cfg.lspConfig)} \
-        | sed  -e 's/^\["\(.*\)"\]/[\1]/' \
-        > $out
-      '';
-in
-{
-  options.programs.tabnine = {
-    enable = mkEnableOption "TabNine, Smart Compose for code.";
-
-    configDir = mkOption {
-      type = types.str;
-      default =
-        if stdenv.isDarwin
-        then "Library/Preferences/TabNine"
-        else "${config.xdg.configHome}/TabNine";
-      description = ''
-        Location of TabNine configuration directory relative to \$HOME
-      '';
-    };
-
-    config = mkOption {
-      type = types.attrs;
-      default = { };
-      description = ''
-        TabNine configuration written to
-        <filename>\${configDir}/tabnine_config.json</filename>
-      '';
-    };
-
-    registrationKey = mkOption {
-      type = types.str;
-      description = ''
-        Registration key for TabNine.  For one-time-purchase users, this should be the e-mail address and base-64-encoded key joined together without spacing.
-      '';
-    };
-
-    lspConfig = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      description = ''
-        LSP Server configuration written to
-        <filename>\${configDir}/TabNine.toml</filename>
-        </para><para>
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.file."${cfg.configDir}/TabNine.toml" = {
-      source = (tomlFormat.generate "TabNine.toml" cfg.lspConfig);
-    };
-    home.file."${cfg.configDir}/tabnine_config.json" = {
-      source = pkgs.writeText "tabnine_config.json" (builtins.toJSON cfg.config);
-    };
-    home.file."${cfg.configDir}/registration_key" = {
-      text = cfg.registrationKey;
-    };
-
-    programs.neovim.plugins = [
-      pkgs.vimPlugins.coc-tabnine
-    ];
-    programs.neovim.coc.settings = {
-      "tabnine.binary_path" = "${pkgs.tabnine}/bin/TabNine";
-    };
-
-    programs.emacs.extraPackages = epkgs: [
-      epkgs.tabnine
-    ];
-    programs.emacs.extraConfig = ''
-      (defun my/override-tabnine-exe-path (&rest args)
-        "${pkgs.tabnine}/bin/TabNine")
-      (with-eval-after-load 'tabnine
-        (advice-add 'tabnine--executable-path :override #'my/override-tabnine-exe-path))
-    '';
-  };
-}
diff --git a/user/prefect.nix b/user/prefect.nix
index 6cf31cbc..0a957d64 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -17,7 +17,6 @@
     ./settings/nixos.nix
     ./settings/passwords.nix
     ./settings/ssh.nix
-    ./settings/tabnine.nix
     ./settings/user-interface.nix
     ./settings/xresources.nix
     <private>
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"
-        ];
-      };
-    };
-  };
-}
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-07 18:44:00 +0000