Random vim updates

sandhose · Jun 10, 2024 · 1cc4bec · 1cc4bec
1 parent fd9be4c
commit 1cc4bec
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 14 deletions.
diff --git a/profiles/common/packages.nix b/profiles/common/packages.nix
@@ -54,7 +54,8 @@ with pkgs; [
   python3Full
   # python37Packages.ansible
   redis
-  # rustup
+  rye
+  rustup
   # socat
   sqlite-interactive
   sshpass
@@ -74,6 +75,10 @@ with pkgs; [
   # clang-tools # broken on darwin
   zig
 
+  haproxy
+  python3Packages.supervisor
+  prometheus
+
   (hiPrio corepack_20)
   (hiPrio fenix.rust-analyzer)
 
@@ -142,7 +147,6 @@ with pkgs; [
   bat
   ripgrep
 
-  rustup
   #(fenix.complete.withComponents [ "rustc" "rustfmt" ])
   #(hiPrio
   #  (fenix.combine [

diff --git a/profiles/darwin/default.nix b/profiles/darwin/default.nix
@@ -5,8 +5,8 @@ with inputs; {
 
   environment = {
     systemPackages = with pkgs; [
-      postgresql_14
-      postgresql_14.lib
+      postgresql_16
+      postgresql_16.lib
       openssl.out
       pinentry_mac
       reattach-to-user-namespace

diff --git a/profiles/home-manager/vim/config/lua/my/completion.lua b/profiles/home-manager/vim/config/lua/my/completion.lua
@@ -1,11 +1,10 @@
 local cmp = require'cmp'
 local lspkind = require'lspkind'
 
-require'copilot'.setup({
-  suggestion = { enabled = false },
-  panel = { enabled = false },
-})
-require'copilot_cmp'.setup({})
+require'supermaven-nvim'.setup{
+  disable_inline_completion = true,
+  disable_keymaps = true,
+}
 
 local has_words_before = function()
   local line, col = unpack(vim.api.nvim_win_get_cursor(0))
@@ -16,6 +15,14 @@ local feedkey = function(key, mode)
   vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true)
 end
 
+lspkind.init({
+  symbol_map = {
+    Supermaven = "",
+  },
+})
+
+vim.api.nvim_set_hl(0, "CmpItemKindSupermaven", {fg ="#6CC644"})
+
 cmp.setup {
   snippet = {
     expand = function(args)
@@ -65,7 +72,7 @@ cmp.setup {
 
   sources = cmp.config.sources({
     { name = 'nvim_lsp' },
-    { name = 'copilot' },
+    { name = 'supermaven' },
     --{ name = 'vsnip' },
     { name = 'path' },
     { name = 'crates' },

diff --git a/profiles/home-manager/vim/config/lua/my/init.lua b/profiles/home-manager/vim/config/lua/my/init.lua
@@ -30,6 +30,13 @@ require'nvim-tree'.setup {
   },
 }
 
+require'treesitter-context'.setup {
+  enable = true,
+  max_lines = 10,
+  multiline_threshold = 2,
+  mode = 'topline',
+}
+
 local dap, dapui = require'dap', require'dapui'
 dapui.setup()
 dap.listeners.before.attach.dapui_config = function()

diff --git a/profiles/home-manager/vim/default.nix b/profiles/home-manager/vim/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   nvimHome = "${config.xdg.configHome}/nvim";
@@ -21,6 +21,18 @@ let
     url = "http://ftp.vim.org/vim/runtime/spell/fr.latin1.sug";
     sha256 = "5cb2c97901b9ca81bf765532099c0329e2223c139baa764058822debd2e0d22a";
   };
+
+  supermaven-nvim = pkgs.vimUtils.buildVimPlugin {
+    pname = "supermaven-nvim";
+    version = "2010-10-18";
+    src = pkgs.fetchFromGitHub {
+      owner = "supermaven-inc";
+      repo = "supermaven-nvim";
+      rev = "4621e779e69c2b09807a3c545ed43697d826ef83";
+      sha256 = "0ajh64bkvfkcyb7lvjd9hs184yg83p72d9x0g5phqnzihxdz7aqg";
+    };
+    meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim";
+  };
 in
 {
   programs = {
@@ -42,7 +54,7 @@ in
         clang-tools # broken on darwin
         nodePackages.vscode-langservers-extracted
         nodePackages.dockerfile-language-server-nodejs
-        nodePackages.pyright
+        pyright
         gopls
         # python38Packages.python-lsp-server
         # python38Packages.python-lsp-black
@@ -131,8 +143,7 @@ in
         fidget-nvim
         nvim-treesitter-context
 
-        copilot-lua
-        copilot-cmp
+        supermaven-nvim
 
         cmp-nvim-lsp
         cmp-buffer