6 files changed, 63 insertions, 31 deletions

diff --git a/common/vim.nix b/common/vim.nix
index 2f36958..bebfb0e 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -12,8 +12,8 @@ inputs: {
 
   cfg = config.vim;
 
-  myConfigPackage = with lib; let
-    config = ''
+  variables = with lib;
+    pkgs.writeTextDir "lua/myVariables.lua" ''
       -- Autogenerated variables from the NixOS configuration
 
       ${(concatStringsSep
@@ -21,35 +21,32 @@ inputs: {
         (mapAttrsToList
           (variable: value: "vim.g.${variable} = ${luaFormat.generate value}")
           cfg.variables))}
+    '';
 
-      -- vim.lua from the NixOS configuration
+  extraConfig = pkgs.writeTextDir "lua/myExtraConfig.lua" ''
+    -- luaConfig from the NixOS configuration
 
-      ${builtins.readFile ../dotfiles/vim.lua}
+    ${cfg.luaConfig}
+  '';
 
-      -- luaConfig from the NixOS configuration
+  myGeneratedConfigPackage = pkgs.symlinkJoin {
+    name = "myGeneratedConfig-nvim";
+    paths = [variables extraConfig];
+  };
 
-      ${cfg.luaConfig}
-    '';
-  in
-    pkgs.runCommand
-    "myConfig"
-    {
-      pname = "myConfig";
-      inherit config;
-      passAsFile = ["config"];
-      runLocal = true;
-    }
-    ''
-      mkdir -p "$out/lua"
-      mv "$configPath" "$out/lua/myConfig.lua"
-    '';
+  myConfigPackage = pkgs.unstable.vimUtils.buildVimPluginFrom2Nix {
+    name = "myConfig-nvim";
+    src = ../dotfiles/vim;
+  };
 
   myNeovim = wrapNeovim neovim-unwrapped {
     configure = {
       inherit (config.vim) beforePlugins;
 
       customRC = ''
+        lua require("myVariables")
         lua require("myConfig")
+        lua require("myExtraConfig")
 
         ${cfg.extraConfig}
       '';
@@ -57,6 +54,7 @@ inputs: {
       packages.myVimPackage = with vimPlugins; {
         start =
           [
+            myGeneratedConfigPackage
             myConfigPackage
 
             # Dependencies
@@ -72,6 +70,15 @@ inputs: {
             diffview-nvim
             nvim-notify
             indent-blankline-nvim
+                        (pkgs.unstable.vimUtils.buildVimPluginFrom2Nix {
+              name = "oil.nvim";
+              src = pkgs.fetchFromGitHub {
+                owner = "stevearc";
+                repo = "oil.nvim";
+                rev = "abfc455f62dac385b0fc816f37c64dffead0bcf3";
+                hash = "sha256-oA220nzaBlFnJ0s23oabIW3XV1tWml5kBuBkTImOPjM=";
+              };
+                        })
 
             # Completion
             nvim-cmp
@@ -92,7 +99,6 @@ inputs: {
 
             # Telescope
             telescope-nvim
-            telescope-file-browser-nvim
             telescope-ui-select-nvim
 
             # Treesitter
diff --git a/dotfiles/vim/ftplugin/nix.lua b/dotfiles/vim/ftplugin/nix.lua
new file mode 100644
index 0000000..7401054
--- /dev/null
+++ b/dotfiles/vim/ftplugin/nix.lua
@@ -0,0 +1,6 @@
+vim.bo.expandtab = true
+vim.bo.shiftwidth = 2
+vim.bo.softtabstop = 2
+
+vim.opt_local.comments = { ":#", "s1:/*", "ex:*/", }
+vim.bo.commentstring = "# %s"
diff --git a/dotfiles/vim/ftplugin/rust.lua b/dotfiles/vim/ftplugin/rust.lua
new file mode 100644
index 0000000..23a46f1
--- /dev/null
+++ b/dotfiles/vim/ftplugin/rust.lua
@@ -0,0 +1,18 @@
+-- TODO: suffixes, includes
+
+vim.bo.expandtab = true
+vim.bo.shiftwidth = 4
+vim.bo.softtabstop = 4
+vim.bo.textwidth = 99
+
+vim.opt_local.comments = {
+        "s0:/*!",
+        "ex:*/",
+        "s1:/*",
+        "mb:*",
+        "ex:*/",
+        ":///",
+        "://!",
+        "://",
+}
+vim.bo.commentstring = "// %s"
diff --git a/dotfiles/vim.lua b/dotfiles/vim/lua/myConfig.lua
index defee0c..58c6f6d 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim/lua/myConfig.lua
@@ -13,6 +13,8 @@ vim.o.ignorecase = true
 vim.o.smartcase = true
 
 vim.o.smartindent = true
+-- TODO: check that
+vim.o.cindent = true
 
 -- tabstop and shiftwidth are also set locally by individual filetypes
 
@@ -347,21 +349,15 @@ cmp.setup {
 
 require("telescope").setup {
         extensions = {
-                file_browser = {
-                        path = "%:p:h",
-                        dir_icon = "D",
-                },
                 ["ui-select"] = {
                         require("telescope.themes").get_dropdown(),
                 },
         },
 }
 
-require("telescope").load_extension "file_browser"
 require("telescope").load_extension "ui-select"
 
-local telescope_builtin = require "telescope.builtin"
-local telescope_extensions = require("telescope").extensions
+local telescope_builtin = require("telescope.builtin")
 
 vim.keymap.set("n", "<leader>fb", telescope_builtin.buffers, mapopts)
 vim.keymap.set("n", "<leader>ff", telescope_builtin.find_files, mapopts)
@@ -370,7 +366,12 @@ vim.keymap.set("n", "<leader>fh", telescope_builtin.help_tags, mapopts)
 vim.keymap.set("n", "<leader>fo", telescope_builtin.oldfiles, mapopts)
 vim.keymap.set("n", "<leader>fs", telescope_builtin.spell_suggest, mapopts)
 vim.keymap.set("n", "<leader>ft", telescope_builtin.treesitter, mapopts)
-vim.keymap.set("n", "-", telescope_extensions.file_browser.file_browser, mapopts)
+
+-- Oil.nvim
+
+require("oil").setup()
+
+vim.keymap.set("n", "-", require("oil").open, { desc = "Open parent directory" })
 
 -- Lualine
 
diff --git a/dotfiles/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index 33b46fd..a852447 100644
--- a/dotfiles/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -42,7 +42,7 @@ local function on_attach(client, bufnr)
         }
 end
 
-capabilities = require("cmp_nvim_lsp").default_capabilities()
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
 require("rust-tools").setup {
         server = {
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index 8fc2c85..c07a1a9 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -100,7 +100,8 @@ in
           (mapAttrsToList lspconfigFor config.vim.lsp);
       in
       mkMerge [
-        (readFile ../../dotfiles/vim-dev.lua)
+        "require('vim-dev')"
+        "local lspconfig = require('lspconfig')"
         lspconfig
       ];
     };