Update deps

flake.lock

@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697419184,
+        "lastModified": 1697721991,
-        "narHash": "sha256-eRPjCyjdcqaME/baecZHyTQTn3k0AYFzN/S+u351FcE=",
+        "narHash": "sha256-Sjm7WaD+zLi9R7x8QKa9HGkizFQXvWGo18WlQtNPPtw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "325e1f7f2e0eea44c27e5e8a3946c2461ec095f2",
+        "rev": "c24c3a902935321e1dfa1ca587e66f47edf79faf",
         "type": "github"
       },
       "original": {
@@ -282,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697622055,
+        "lastModified": 1697688028,
-        "narHash": "sha256-t9rwzjlfgCnXDFGH3wsooYfAOA+XqQmgTojhzuNafZ4=",
+        "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "84fa81c7acb018c3c5a504dcefbc28a182c933c2",
+        "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19",
         "type": "github"
       },
       "original": {
@@ -325,11 +325,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1697612973,
+        "lastModified": 1697665640,
-        "narHash": "sha256-b5nTKAKpZaI8BkIpZnezidJjFZR6yViCzS9R2xOw/HY=",
+        "narHash": "sha256-dodNEzwAW7MxaHy7BXA8olSZFGna6uB6RBMrf6UD7Sw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "eadedfd9084c338a9162ef3706756bda443d6559",
+        "rev": "a8fc94a2fdd07edf0679d34f2deaacb25b3fa69f",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697645480,
+        "lastModified": 1697702552,
-        "narHash": "sha256-R67duGL19v8YtjAg2kAT3BLweDERnqzJTz3at/PB5Q0=",
+        "narHash": "sha256-Zf38W4riXaKQL8651y4T3rz7x+TxshcAW44p0/vGcDQ=",
         "ref": "refs/heads/master",
-        "rev": "b52c4374c831e82a2d6e552afbbb2bd2b51ca4fb",
+        "rev": "4e65cdfa5b08e4943b2e109b4348d595c8584076",
-        "revCount": 533,
+        "revCount": 537,
         "type": "git",
         "url": "https://git.kempkens.io/daniel/nix-overlay"
       },
@@ -370,11 +370,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696360011,
+        "lastModified": 1697723594,
-        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
+        "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
+        "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980",
         "type": "github"
       },
       "original": {
@@ -385,11 +385,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1697100850,
+        "lastModified": 1697745251,
-        "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=",
+        "narHash": "sha256-3yLFt2ySYb2ZiFiCXYaBf/SHOKH3TyIfXaxB7qgdLfo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565",
+        "rev": "6e1fd3d5c267b10f44b59e437422f11cc8a3790c",
         "type": "github"
       },
       "original": {
@@ -401,11 +401,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1697538484,
+        "lastModified": 1697713104,
-        "narHash": "sha256-Snkk4LL4L3nqRiAJ6/BO9vTnuxbWZhR8jGlfAB5ohPY=",
+        "narHash": "sha256-DN7YOyKMCpAVeZ44N42LrujtTkoerkS9+kTufQiuntY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2cb9af4323c64c93e8df3cae5988a53b8687ef3f",
+        "rev": "6be2c349a30fcb489a3153dd331e9df387ab6449",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697379843,
+        "lastModified": 1697688401,
-        "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
+        "narHash": "sha256-61QlajY7R9PbK25uFl55zh968CVNspwXX1zzimic4Uo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
+        "rev": "458ef9126aa380996d77d44f53f886c2d8485f53",
         "type": "github"
       },
       "original": {

home/config/nvim/init.fnl

@@ -67,6 +67,7 @@
   (set g.mapleader " ") ; Some plugins need this, so set it before the keymap is loaded
   (set o.timeoutlen 400)
   (set g.loaded_python_provider 0) ; Disable built-in providers
+  (set g.loaded_python3_provider 0)
   (set g.loaded_ruby_provider 0)
   (set g.loaded_node_provider 0)
   (set g.loaded_perl_provider 0)

home/config/nvim/nifoc/keymap.fnl

@@ -9,6 +9,14 @@
       gitsigns (require :gitsigns)
       repl (require :nifoc.repl)
       formatting (require :nifoc.formatting)]
+  (set _G.mini_cr_action
+       (fn []
+         (if (not= (vim.fn.pumvisible) 0)
+             (if (not= (. (vim.fn.complete_info) :selected) -1)
+                 (vim.api.nvim_replace_termcodes :<C-y> true true true)
+                 (vim.api.nvim_replace_termcodes :<C-y><CR> true true true))
+             ((. (require :mini.pairs) :cr)))))
+
   (fn mod.setup []
     (keymap.set :n :<space> :<nop> {:noremap true})
     ;; Leader Mappings
@@ -48,7 +56,8 @@
     (keymap.set :n :<leader>dtp :<cmd>TSPlaygroundToggle<CR>
                 {:desc "Toggle Treetsitter Playground"})
     ;; Other Mappings
-    (keymap.set :n :F #(formatting.maybe-format-buffer 0) {:desc "Format Buffer"})
+    (keymap.set :n :F #(formatting.maybe-format-buffer 0)
+                {:desc "Format Buffer"})
     (keymap.set :n :<A-Left> :b)
     (keymap.set :n :<A-Right> :w)
     (keymap.set :n :<S-Left> "^")
@@ -66,7 +75,13 @@
     (keymap.set :x :gp "<Plug>(YankyGPutAfter)")
     (keymap.set :x :gP "<Plug>(YankyGPutBefore)")
     (keymap.set :n :y "<Plug>(YankyYank)")
-    (keymap.set :x :y "<Plug>(YankyYank)"))
+    (keymap.set :x :y "<Plug>(YankyYank)")
+    ;; Completion
+    (keymap.set :i :<Tab> "pumvisible() ? \"\\<C-n>\" : \"\\<Tab>\""
+                {:expr true})
+    (keymap.set :i :<S-Tab> "pumvisible() ? \"\\<C-p>\" : \"\\<S-Tab>\""
+                {:expr true})
+    (keymap.set :i :<CR> "v:lua._G.mini_cr_action()" {:expr true}))
 
   (fn mod.lsp-attach [client bufnr]
     (keymap.set :n :<leader>t

home/config/nvim/plugins/lsp.fnl

@@ -1,6 +1,5 @@
 (let [lsp (require :lspconfig)
       lsp-configs (require :lspconfig.configs)
-      coq (require :coq)
       navic (require :nvim-navic)
       diagnostic (require :nifoc.diagnostic)
       augroup (vim.api.nvim_create_augroup :NifocLsp {:clear true})
@@ -22,13 +21,16 @@
                                    (when (client.supports_method :textDocument/inlayHint)
                                      (vim.lsp.inlay_hint bufnr true)
                                      (setup-inlay-hint-toggle bufnr))
+                                   (when (client.supports_method :textDocument/completion)
+                                     (set vim.opt_local.omnifunc
+                                          "v:lua.MiniCompletion.completefunc_lsp"))
                                    (diagnostic.maybe-enable-lsp client bufnr)))
                      :group augroup
                      :desc "Automatic LSP setup"})
   ;; Servers
   (vim.lsp.set_log_level :OFF)
   (let [flags {:allow_incremental_sync true :debounce_text_changes 700}
-        default-config (coq.lsp_ensure_capabilities {: flags})
+        default-config {: flags}
         default-servers [:bashls
                          :cssls
                          :dockerls

home/config/nvim/plugins/mini.fnl

@@ -11,6 +11,15 @@
                    :clues [(miniclue.gen_clues.builtin_completion)]})
   ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-comment.md
   ((. (require :mini.comment) :setup) {})
+  ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-completion.md
+  ((. (require :mini.completion) :setup) {:window {:info {:height 25
+                                                          :width 80
+                                                          :border :rounded}
+                                                   :signature {:height 25
+                                                               :width 80
+                                                               :border :rounded}}
+                                          :lsp_completion {:source_func :omnifunc
+                                                           :auto_setup false}})
   ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-hipatterns.md
   (hipatterns.setup {:highlighters {:fixme {:pattern "%f[%w]()FIXME()%f[%W]"
                                             :group :MiniHipatternsFixme}

home/programs/fish.nix

@@ -37,17 +37,6 @@ in
         };
       }
 
-      # https://github.com/PatrickF1/fzf.fish/releases
-      {
-        name = "fzf-fish";
-        src = fetchFromGitHub {
-          owner = "PatrickF1";
-          repo = "fzf.fish";
-          rev = "v10.0";
-          hash = "sha256-CqRSkwNqI/vdxPKrShBykh+eHQq9QIiItD6jWdZ/DSM=";
-        };
-      }
-
       # https://github.com/jorgebucaran/autopair.fish/releases
       {
         name = "autopair-fish";

home/programs/nvim/default.nix

@@ -184,15 +184,6 @@ in
         telescope-ui-select-nvim
         telescope-undo-nvim
 
-        # Completion
-        {
-          plugin = pkgs.vimPlugins.coq_nvim;
-          config = builtins.readFile ../../config/nvim/plugins/coq.fnl;
-          type = "fennel";
-        }
-
-        pkgs.vimPlugins.coq-artifacts
-
         # LSP
         {
           plugin = nvim-lspconfig;

home/programs/nvim/plugins.nix

@@ -29,12 +29,12 @@ in
   };
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2023-10-17";
+    version = "2023-10-19";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "cff8f2bddbbc1093a9ffbf1122df918be5ff41d9";
+      rev = "e9a0716013abb8d2d6f8d77331600fb99eb15d51";
-      sha256 = "1acn9jqq90s1bp0xb5dflbf1vw8spgznaanzny5cmpian0bm2as9";
+      sha256 = "0xws1jj4z6w12fl2dl2glfd8i4ig782gk17316h3iwx68ixv0mhs";
       fetchSubmodules = false;
     };
   };
@@ -117,12 +117,12 @@ in
   };
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2023-10-18";
+    version = "2023-10-19";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "afa103385a2b5ef060596ed822ef63276ae88016";
+      rev = "eb3faef3a44641e5875581e901b0a8df8da2bde4";
-      sha256 = "005m975kwz7n11vpgrpr9w9x1ahb42r5x2zkxa78rhjcsb2g2gsg";
+      sha256 = "0y49lf9b12y24dq3j8g7zllgmgkzzxkwkvm6vv0qdlahnn9bvcn1";
       fetchSubmodules = false;
     };
   };
@@ -263,23 +263,23 @@ in
   };
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2023-10-18";
+    version = "2023-10-19";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "7c8b50a2bb62b544eb91434fd008a34c4b51fd6d";
+      rev = "e366dc5ed4002d3489d03200c0b132ce2b1ba532";
-      sha256 = "01h3gii9wrzvg5csp028rc5aaz3l575xqgykwipcapdkvdkv9lg0";
+      sha256 = "0azmih7djcnfg58wdcmpsr90nvhlqvr3km7h4dv69hh3xjp06qma";
       fetchSubmodules = false;
     };
   };
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2023-10-17";
+    version = "2023-10-19";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "2e8b826cb4af5cf36b5febc5e7a71d3284f161f2";
+      rev = "55abaaa9ed4684cd9ba8f0c062379be6cf41b8f3";
-      sha256 = "179cnlmnz0rxrcfi6na1qipnwa7fc19cplzv9499ki125lqmhw8p";
+      sha256 = "1nl7qqm61rin8v8xl11qlfajwqjmwzz4x79mwwcrml2d387nksbn";
       fetchSubmodules = false;
     };
   };
@@ -307,12 +307,12 @@ in
   };
   indent-blankline-nvim = buildVimPlugin {
     pname = "indent-blankline.nvim";
-    version = "2023-10-17";
+    version = "2023-10-19";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff";
+      rev = "8a7b48f5823cc924f815129192288ec2e2b9288f";
-      sha256 = "1m27krw7zdlbnnip046acnndkniif2a6kg7aj61mf6l1ikbzy9x2";
+      sha256 = "000mvx49b92ndhgpa8p3a2a089vpn1rqgkn8l09mgmbnpcgn3ib6";
       fetchSubmodules = false;
     };
   };