common/home/neovim/langs/bash.nix

@@ -6,33 +6,33 @@
 }: let
   inherit (config.vars) neovimIde;
   inherit (pkgs) vimPlugins;
-in {
+in
-  programs = {
+  lib.mkIf neovimIde {
-    # I love doing typos
+    programs = {
-    bash.shellAliases = {
+      # I love doing typos
-      nivm = "nvim";
+      bash.shellAliases = {
-      nivim = "nvim";
+        nivm = "nvim";
-    };
+        nivim = "nvim";
+      };
 
-    neovim = {
+      neovim = {
-      defaultEditor = true;
+        defaultEditor = true;
-      viAlias = true;
+        viAlias = true;
-      vimAlias = true;
+        vimAlias = true;
 
-      extraLuaConfig =
+        extraLuaConfig =
-        /*
+          /*
-        lua
+          lua
-        */
+          */
-        ''
+          ''
-          vim.api.nvim_create_autocmd("FileType", {
+            vim.api.nvim_create_autocmd("FileType", {
-             pattern = 'sh',
+               pattern = 'sh',
-             command = 'setlocal ts=4 sw=4 sts=0 expandtab',
+               command = 'setlocal ts=4 sw=4 sts=0 expandtab',
-          });
+            });
-        '';
+          '';
 
-      plugins =
+        plugins = [
-        lib.mkIf neovimIde [
         ];
+      };
     };
-  };
+  }
-}

common/home/neovim/langs/default.nix

@@ -50,23 +50,13 @@ in {
                   lsp_status.on_attach(client);
               end,
           });
-
-          -- Disable virtual_text since it's redundant due to lsp_lines.
-          vim.diagnostic.config({
-              virtual_text = false,
-          });
-
-          require('lsp_lines').setup();
         '';
       plugins = [
         vimPlugins.nvim-lspconfig
-
         vimPlugins.coq_nvim
         vimPlugins.coq-artifacts
         vimPlugins.coq-thirdparty
-
         vimPlugins.lsp-status-nvim
-        vimPlugins.lsp_lines-nvim
       ];
     };
   };

common/home/neovim/langs/nix.nix

@@ -55,7 +55,7 @@ in
           lua
           */
           ''
-            local lsp = require('lspconfig');
+            local lsp = require('lspconfig')
 
             lsp.nixd.setup({});
             lsp.nixd.setup(require('coq').lsp_ensure_capabilities({}));

common/home/neovim/neotree.lua

@@ -1,6 +1,6 @@
 -- Override netrw
-vim.g.loaded_netrw = 0;
+vim.g.loaded_netrw = 0
-vim.g.loaded_netrwPlugin = 0;
+vim.g.loaded_netrwPlugin = 0
 
 require('neo-tree').setup({
   close_if_last_window = true,
@@ -28,20 +28,21 @@ require('neo-tree').setup({
 
   source_selector = {
     winbar = true,
-    statusline = false,
+    statusline = false
   },
 
   follow_current_file = {
     enabled = true,
     leave_dirs_open = true,
-  },
+  }
-});
+})
 
 local function is_neotree_open()
-  local manager = require("neo-tree.sources.manager");
+  local manager = require("neo-tree.sources.manager")
-  local renderer = require("neo-tree.ui.renderer");
+  local renderer = require("neo-tree.ui.renderer")
-  local state = manager.get_state("filesystem");
+  local state = manager.get_state("filesystem")
-  return renderer.window_exists(state);
+  local window_exists = renderer.window_exists(state)
+  return window_exists
 end
 
 -- Auto open Neo-Tree on big enough window