nvim: Convert after hooks to fnl

config/nvim/after/ftplugin/NvimTree.vim

@@ -1 +0,0 @@
-setlocal signcolumn=no

config/nvim/after/ftplugin/elixir.fnl

@@ -0,0 +1,4 @@
+(let [lo vim.opt_local]
+  (set lo.spell true)
+  (set lo.textwidth 120)
+  (set lo.colorcolumn :+1))

config/nvim/after/ftplugin/elixir.vim

@@ -1,6 +0,0 @@
-setlocal comments=:#
-setlocal commentstring=#\ %s
-
-setlocal spell
-setlocal textwidth=120
-setlocal colorcolumn=+1

config/nvim/after/ftplugin/erlang.vim

@@ -1 +0,0 @@
-iabbrev <buffer> <= =<

config/nvim/after/ftplugin/gitcommit.fnl

@@ -0,0 +1,3 @@
+(let [lo vim.opt_local]
+  (set lo.spell true)
+  (set lo.colorcolumn :+1))

config/nvim/after/ftplugin/gitcommit.vim

@@ -1,2 +0,0 @@
-setlocal spell
-setlocal colorcolumn=+1

config/nvim/after/ftplugin/list.vim

@@ -1,6 +0,0 @@
-setlocal nonumber norelativenumber
-
-nnoremap <buffer> <silent> <esc> :q!<CR>
-nnoremap <buffer> <silent> q :q!<CR>
-
-let b:toggle_line_style = v:false

config/nvim/after/ftplugin/make.fnl

@@ -0,0 +1,4 @@
+(let [lo vim.opt_local]
+  (set lo.expandtab false)
+  (set lo.shiftwidth 2)
+  (set lo.softtabstop 0))

config/nvim/after/ftplugin/make.vim

@@ -1,3 +0,0 @@
-setlocal noexpandtab
-setlocal shiftwidth=2
-setlocal softtabstop=0

config/nvim/after/ftplugin/markdown.fnl

@@ -0,0 +1,2 @@
+(let [lo vim.opt_local]
+  (set lo.spell true))

config/nvim/after/ftplugin/markdown.vim

@@ -1 +0,0 @@
-setlocal spell

config/nvim/after/ftplugin/pandoc.vim

@@ -1 +0,0 @@
-setlocal spell

config/nvim/after/ftplugin/qf.vim

@@ -1,6 +0,0 @@
-setlocal nonumber norelativenumber
-
-nnoremap <buffer> <silent> <esc> :q!<CR>
-nnoremap <buffer> <silent> q :q!<CR>
-
-let b:toggle_line_style = v:false

config/nvim/after/ftplugin/text.fnl

@@ -0,0 +1,2 @@
+(let [lo vim.opt_local]
+  (set lo.spell true))

config/nvim/after/ftplugin/text.vim

@@ -1 +0,0 @@
-setlocal spell

programs/nvim/default.nix

@@ -296,48 +296,55 @@ in
     ]);
   };
 
-  xdg.configFile."nvim/lua" = {
+  xdg.configFile."nvim" = {
     source = pkgs.runCommandLocal "nvim-fennel-files"
       {
         nativeBuildInputs = [ pkgs.fennel pkgs.stylua ];
       } ''
-      mkdir -p $out/configuration
+      mkdir -p $out/lua/configuration
-      mkdir -p $out/nifoc/utils
+      mkdir -p $out/lua/nifoc/utils
+      mkdir -p $out/after/ftplugin
 
-      fennel --use-bit-lib --compile "${../../config/nvim/init.fnl}" > "$out/configuration/init.lua"
+      fennel="fennel --use-bit-lib --compile"
+      config_store_path="${../../config/nvim}"
 
-      cat <<EOF >>plugins.fnl
+      # Init
-      ${config.programs.neovim.generatedConfigs.fennel}
+      $fennel "$config_store_path/init.fnl" > "$out/lua/configuration/init.lua"
-      nil
-      EOF
 
-      fennel --use-bit-lib --compile "./plugins.fnl" > "$out/configuration/plugins.lua"
+      # Utils
-
+      nifoc_store_path="$config_store_path/nifoc"
-      nifoc_store_path="${../../config/nvim/nifoc}"
-      nifoc_store_lua="$(find "$nifoc_store_path" -type f -name '*.lua')"
       nifoc_store_fnl="$(find "$nifoc_store_path" -type f -name '*.fnl')"
 
-      for luafile in $nifoc_store_lua; do
-        file_out_path="$(echo "$luafile" | sed "s|$nifoc_store_path/||")"
-
-        echo "Copying $luafile ..."
-        cat "$luafile" > "$out/nifoc/$file_out_path"
-      done
-
       for fnlfile in $nifoc_store_fnl; do
         file_out_path="$(echo "$fnlfile" | sed "s|$nifoc_store_path/||" | sed "s/.fnl$/.lua/")"
 
         echo "Compiling $fnlfile ..."
-        fennel --use-bit-lib --compile "$fnlfile" > "$out/nifoc/$file_out_path"
+        $fennel "$fnlfile" > "$out/lua/nifoc/$file_out_path"
       done
 
-      stylua $out/
+      # Plugins
-    '';
+      cat <<EOF >>plugins.fnl
-    recursive = true;
+      ${config.programs.neovim.generatedConfigs.fennel}
-  };
+      nil
+      EOF
 
-  xdg.configFile."nvim/after" = {
+      $fennel "./plugins.fnl" > "$out/lua/configuration/plugins.lua"
-    source = ../../config/nvim/after;
+
+      # After
+      after_store_path="$config_store_path/after"
+      after_store_fnl="$(find "$after_store_path" -type f -name '*.fnl')"
+
+      for fnlfile in $after_store_fnl; do
+        file_out_path="$(echo "$fnlfile" | sed "s|$after_store_path/||" | sed "s/.fnl$/.lua/")"
+
+        echo "Compiling $fnlfile ..."
+        $fennel "$fnlfile" > "$out/after/$file_out_path"
+      done
+
+      cp -r "$after_store_path/queries" "$out/after/"
+
+      stylua "$out/"
+    '';
     recursive = true;
   };