Allow choosing between iwd and wpa_supplicant

home/features/neovim/config/lazy-lock.json

@@ -38,8 +38,11 @@
   "navigator": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
   "neoconf": { "branch": "main", "commit": "23f24edab5f78465a0bc3320678e038664b9aa6e" },
   "neodev": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "neotest": { "branch": "master", "commit": "6d6ad113f56edc7c3f2a77a0836ea8c1b955ebea" },
+  "neotest-haskell": { "branch": "master", "commit": "10cd953fb7c81de82ce8dc618e0614e0ab5fa1e3" },
   "nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
   "rust-tools": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },

home/features/neovim/default.nix

@@ -518,7 +518,7 @@ let
                 (nmap "<c-p>" "find_files" "File finder [p]alette")
                 (nmap "<leader>d" "diagnostics" "[D]iagnostics")
                 (nmap "<c-f>" "live_grep" "[F]ind in project")
-                (nmap "<leader>t" "builtin" "[T]elescope pickers")
+                (nmap "<c-t>" "builtin" "[T]elescope pickers")
                 # {{{ Files by extension
                 (findFilesByExtension "tx" "tex" "[t]ex")
                 (findFilesByExtension "ts" "ts" "[t]ypescript")
@@ -643,8 +643,14 @@ let
           # {{{ treesitter
           treesitter = {
             # REASON: more grammars
-            # dir = upkgs.vimPlugins.nvim-treesitter.withAllGrammars;
-            package = "nvim-treesitter/nvim-treesitter";
+            dir = pkgs.symlinkJoin {
+              name = "treesitter-with-parsers";
+              paths = [
+                upkgs.vimPlugins.nvim-treesitter.withAllGrammars
+                upkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies
+              ];
+            };
+            # package = "nvim-treesitter/nvim-treesitter";
             main = "nvim-treesitter.configs";
 
             dependencies.nix = [ pkgs.tree-sitter ];
@@ -1218,6 +1224,43 @@ let
             config = importFrom ./plugins/cmp.lua "config";
           };
           # }}}
+          # {{{ neotest
+          neotest = {
+            package = "nvim-neotest/neotest";
+            dependencies.lua = [
+              # {{{ Adapters
+              "mrcjkb/neotest-haskell"
+              # }}}
+              "plenary"
+              "treesitter"
+              "nvim-neotest/nvim-nio"
+            ];
+
+            cond = blacklist "vscode";
+            config = _: {
+              setup.neotest.adapters = [
+                (require "neotest-haskell" {
+                  build_tools = [ "stack" ];
+                  frameworks = [ "hspec" ];
+                })
+              ];
+            };
+
+            # {{{ Keybinds
+            keys =
+              let
+                nmap =
+                  key: arg: desc:
+                  nlib.nmap "<leader>t${key}" (thunk "require('neotest').run.${arg}") desc;
+              in
+              [
+                (nmap "c" "run()" "Run [c]urrent [t]est")
+                (nmap "f" "run(vim.fn.expand('%'))" "Run [t]ests in [f]ile")
+                (nmap "s" "stop()" "Run [c]urrent [t]est")
+              ];
+            # }}}
+          };
+          # }}}
           # }}}
           # {{{ language support
           # {{{ haskell support