flake.lock: Update

Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/cde886a1c97ef2399b4f91409db045785020291f' (2023-10-05) → 'github:nix-community/disko/6ad5c9c17cbd5514ce0cc2692dd82dd6d8e5d879' (2023-10-13) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/6c9812285de872caff762633928370fe9f30365d' (2023-10-07) → 'github:bandithedoge/nixpkgs-firefox-darwin/972388ef1f081def3398135dea9edbbede8a6435' (2023-10-14) • Updated input 'home-manager': 'github:nix-community/home-manager/3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d' (2023-10-08) → 'github:nix-community/home-manager/d4a5076ea8c2c063c45e0165f9f75f69ef583e20' (2023-10-14) • Updated input 'nextcloud-cookbook': 'https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz?narHash=sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI%2BeXDHnNSm1HDbP6M%3D' → 'https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz?narHash=sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI%2BeXDHnNSm1HDbP6M%3D' (2023-03-24) • Updated input 'nextcloud-external': 'https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz?narHash=sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ%3D' → 'https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz?narHash=sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ%3D' (2023-09-04) • Updated input 'nextcloud-news': 'https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz?narHash=sha256-cfJkKRNSz15L4E3w1tnEb%2Bt4MrVwVzb8lb6vCOA4cK4%3D' → 'https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz?narHash=sha256-cfJkKRNSz15L4E3w1tnEb%2Bt4MrVwVzb8lb6vCOA4cK4%3D' (2023-09-28) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/87828a0e03d1418e848d3dd3f3014a632e4a4f64' (2023-10-06) → 'github:nixos/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11) • Updated input 'nur': 'github:nix-community/nur/09a721cf6869671ec2258da3c377436e3498eead' (2023-10-08) → 'github:nix-community/nur/a7f7dc7099baec26335cb9335e0adfc3d838e098' (2023-10-15) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/53b0bcaadaffb505acff230578b56a86ec1ab38a' (2023-10-08) → 'github:kyazdani42/nvim-tree.lua/aaee4cd896b74f85a81bed7eef2db7869960c4d0' (2023-10-15) • Updated input 'nvim-treesitter-src': 'github:nvim-treesitter/nvim-treesitter/a102053352bd958d84a3e1be3de0203d2af92984' (2023-10-08) → 'github:nvim-treesitter/nvim-treesitter/ad02fbcdfc391017cad462e04e4740d2887cfa2e' (2023-10-14) • Updated input 'proton-ge': 'https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz?narHash=sha256-75A0VCVdYkiMQ1duE9r2%2BDLBJzV02vUozoVLeo/TIWQ%3D' → 'https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz?narHash=sha256-75A0VCVdYkiMQ1duE9r2%2BDLBJzV02vUozoVLeo/TIWQ%3D' (2023-09-24) • Updated input 'tree-sitter-bash': 'github:tree-sitter/tree-sitter-bash/1479a4030f1a399c253aee02097576d4af46f23a' (2023-10-03) → 'github:tree-sitter/tree-sitter-bash/7331995b19b8f8aba2d5e26deb51d2195c18bc94' (2023-10-10) • Updated input 'tree-sitter-python': 'github:tree-sitter/tree-sitter-python/a901729099257aac932d79c60adb5e8a53fa7e6c' (2023-09-21) → 'github:tree-sitter/tree-sitter-python/82f5c9937fe4300b4bec3ee0e788d642c77aab2c' (2023-10-11) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/337edef90c8abe35b42e95aecf510a063dad02dd' (2023-10-02) → 'github:nix-community/NixOS-WSL/5da7c4fd0ab9693d83cae50de7d9430696f92568' (2023-10-09) • Updated input 'wsl/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Updated input 'wsl/nixpkgs': 'github:NixOS/nixpkgs/32dcb45f66c0487e92db8303a798ebc548cadedc' (2023-09-30) → 'github:NixOS/nixpkgs/5a237aecb57296f67276ac9ab296a41c23981f56' (2023-10-07)
fix: buildVimPluginFrom2Nix deprecated
2025-07-07 07:50:13 +00:00 · 2023-10-15 03:54:49 +00:00 · 2023-10-08 11:17:55 -04:00 · 2023-10-08 11:14:50 -04:00
8 changed files with 131 additions and 108 deletions
--- a/flake.lock
+++ b/flake.lock
@ -90,11 +90,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696043447,
-        "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
+        "lastModified": 1696360011,
+        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
+        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
        "type": "github"
      },
      "original": {
@ -111,11 +111,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1695864092,
-        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
+        "lastModified": 1697230660,
+        "narHash": "sha256-Faw7qTLNVZYxW1nBHKhfrKY0lOicJaxxHh5u/Gq4M3Q=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
+        "rev": "6ad5c9c17cbd5514ce0cc2692dd82dd6d8e5d879",
        "type": "github"
      },
      "original": {
@ -131,11 +131,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696034364,
-        "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=",
+        "lastModified": 1697243978,
+        "narHash": "sha256-ZhtaqhEFcYxxPNNm246uqVGJ/CiM6j8mK0xGIZ8Dk0c=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df",
+        "rev": "972388ef1f081def3398135dea9edbbede8a6435",
        "type": "github"
      },
      "original": {
@ -147,11 +147,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@ -237,11 +237,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696063111,
-        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
+        "lastModified": 1697323135,
+        "narHash": "sha256-tlAv11c0NIRTk2IzpFxYknHrveeFXojVyCTAMg749Zg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
+        "rev": "d4a5076ea8c2c063c45e0165f9f75f69ef583e20",
        "type": "github"
      },
      "original": {
@ -254,6 +254,7 @@
    "nextcloud-cookbook": {
      "flake": false,
      "locked": {
+        "lastModified": 1679666795,
        "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
        "type": "tarball",
        "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
@ -266,6 +267,7 @@
    "nextcloud-external": {
      "flake": false,
      "locked": {
+        "lastModified": 1693816929,
        "narHash": "sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ=",
        "type": "tarball",
        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"
@ -278,6 +280,7 @@
    "nextcloud-news": {
      "flake": false,
      "locked": {
+        "lastModified": 1695883388,
        "narHash": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=",
        "type": "tarball",
        "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"
@ -369,11 +372,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1695830400,
-        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+        "lastModified": 1697059129,
+        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
+        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
        "type": "github"
      },
      "original": {
@ -385,11 +388,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1696697597,
+        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
        "type": "github"
      },
      "original": {
@ -417,11 +420,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1696080597,
-        "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=",
+        "lastModified": 1697340698,
+        "narHash": "sha256-2oXnPWy3YDsqVnNIcRO/uSKYHe9K+jAGbpF+CLI13O8=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6",
+        "rev": "a7f7dc7099baec26335cb9335e0adfc3d838e098",
        "type": "github"
      },
      "original": {
@ -450,11 +453,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1695716495,
-        "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=",
+        "lastModified": 1697339044,
+        "narHash": "sha256-iECRtmxspzOSP2orpTXzzhA5IxFrGDfgBeO2cvNIv6o=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "934469b9b6df369e198fb3016969e56393b0dc07",
+        "rev": "aaee4cd896b74f85a81bed7eef2db7869960c4d0",
        "type": "github"
      },
      "original": {
@ -466,11 +469,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1696061053,
-        "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=",
+        "lastModified": 1697285046,
+        "narHash": "sha256-jOgWEDjO4rEtD8hsZV9wv3DJRBb3El++nm3dlqz+b/M=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32",
+        "rev": "ad02fbcdfc391017cad462e04e4740d2887cfa2e",
        "type": "github"
      },
      "original": {
@ -483,6 +486,7 @@
    "proton-ge": {
      "flake": false,
      "locked": {
+        "lastModified": 1695533697,
        "narHash": "sha256-75A0VCVdYkiMQ1duE9r2+DLBJzV02vUozoVLeo/TIWQ=",
        "type": "tarball",
        "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
@ -655,11 +659,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1695263734,
-        "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=",
+        "lastModified": 1696959291,
+        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "fd4e40dab883d6456da4d847de8321aee9c80805",
+        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
        "type": "github"
      },
      "original": {
@ -721,11 +725,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1695282953,
-        "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=",
+        "lastModified": 1696990675,
+        "narHash": "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c",
+        "rev": "82f5c9937fe4300b4bec3ee0e788d642c77aab2c",
        "type": "github"
      },
      "original": {
@ -790,11 +794,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1696053802,
-        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
+        "lastModified": 1696883888,
+        "narHash": "sha256-EdQMeJxDoi26YDtkNf20mNBeCj7Y5eKg+rrxkiB86z0=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
+        "rev": "5da7c4fd0ab9693d83cae50de7d9430696f92568",
        "type": "github"
      },
      "original": {
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -1,76 +1,94 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, lib, config, dsl, ... }: {

-  plugins = [
-    pkgs.vimPlugins.nvim-lspconfig
-    pkgs.vimPlugins.lsp-colors-nvim
-    pkgs.vimPlugins.null-ls-nvim
-  ];
+  # Terraform optional because non-free
+  options.useTerraform = lib.mkEnableOption "Whether to enable Terraform LSP";

-  use.lspconfig.lua_ls.setup = dsl.callWith {
-    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
-  };
+  config =

-  use.lspconfig.nil_ls.setup = dsl.callWith {
-    cmd = [ "${pkgs.nil}/bin/nil" ];
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
-  };
+    let

-  use.lspconfig.pyright.setup = dsl.callWith {
-    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
-  };
+      terraformFormat = if config.useTerraform then ''
+        require("null-ls").builtins.formatting.terraform_fmt.with({
+            command = "${pkgs.terraform}/bin/terraform",
+            extra_filetypes = { "hcl" },
+        }),
+      '' else
+        "";

-  use.lspconfig.terraformls.setup =
-    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
+    in {
+      plugins = [
+        pkgs.vimPlugins.nvim-lspconfig
+        pkgs.vimPlugins.lsp-colors-nvim
+        pkgs.vimPlugins.null-ls-nvim
+      ];

-  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+      use.lspconfig.lua_ls.setup = dsl.callWith {
+        settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+        cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
+      };

-  lua = ''
-    ${builtins.readFile ./lsp.lua}
+      use.lspconfig.nil_ls.setup = dsl.callWith {
+        cmd = [ "${pkgs.nil}/bin/nil" ];
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      };

-    -- Prevent infinite log size (change this when debugging)
-    vim.lsp.set_log_level("off")
+      use.lspconfig.pyright.setup = dsl.callWith {
+        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+      };

-    require("null-ls").setup({
-        sources = {
-            require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
-            require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
-            require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
-            require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
-            require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
-            require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
-            require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
-            require("null-ls").builtins.formatting.shfmt.with({
-                command = "${pkgs.shfmt}/bin/shfmt",
-                extra_args = { "-i", "4", "-ci" },
-            }),
-            require("null-ls").builtins.formatting.terraform_fmt.with({
-                command = "${pkgs.terraform}/bin/terraform",
-                extra_filetypes = { "hcl" },
-            }),
-        },
+      use.lspconfig.terraformls.setup = dsl.callWith {
+        cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ];
+      };

-        on_attach = function(client, bufnr)
-            if client.supports_method("textDocument/formatting") then
-                -- Auto-format on save
-                vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-                vim.api.nvim_create_autocmd("BufWritePre", {
-                    group = augroup,
-                    buffer = bufnr,
-                    callback = function()
-                        vim.lsp.buf.format({ bufnr = bufnr })
-                    end,
-                })
-                -- Use internal formatting for bindings like gq.
-                vim.api.nvim_create_autocmd("LspAttach", {
-                    callback = function(args)
-                        vim.bo[args.buf].formatexpr = nil
-                    end,
-                })
-            end
-        end,
-    })
-  '';
+      vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+
+      lua = ''
+        ${builtins.readFile ./lsp.lua}
+
+        -- Prevent infinite log size (change this when debugging)
+        vim.lsp.set_log_level("off")
+
+        require("null-ls").setup({
+            sources = {
+                require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
+                require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+                require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+                require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
+                require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
+                require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
+                require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
+                require("null-ls").builtins.formatting.shfmt.with({
+                    command = "${pkgs.shfmt}/bin/shfmt",
+                    extra_args = { "-i", "4", "-ci" },
+                }),
+                ${terraformFormat}
+            },
+
+            on_attach = function(client, bufnr)
+                if client.supports_method("textDocument/formatting") then
+                    -- Auto-format on save
+                    vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+                    vim.api.nvim_create_autocmd("BufWritePre", {
+                        group = augroup,
+                        buffer = bufnr,
+                        callback = function()
+                            vim.lsp.buf.format({ bufnr = bufnr })
+                        end,
+                    })
+                    -- Use internal formatting for bindings like gq.
+                    vim.api.nvim_create_autocmd("LspAttach", {
+                        callback = function(args)
+                            vim.bo[args.buf].formatexpr = nil
+                        end,
+                    })
+                end
+            end,
+        })
+      '';
+
+    };

 }
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -24,7 +24,7 @@
    pkgs.vimPlugins.vim-helm
    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
+    (pkgs.vimUtils.buildVimPlugin {
      pname = "nmasur";
      version = "0.1";
      src = ../plugin;
--- a/modules/common/neovim/config/tree.nix
+++ b/modules/common/neovim/config/tree.nix
@ -63,7 +63,6 @@
    '';
    view = { # Set look and feel
      width = 30;
-      hide_root_folder = false;
      side = "left";
      number = false;
      relativenumber = false;
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -5,6 +5,7 @@ let
  neovim = import ./package {
    inherit pkgs;
    colors = config.theme.colors;
+    useTerraform = config.terraform.enable;
  };

 in {
--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@ -26,13 +26,13 @@
 #   ] ++ extraConfig;
 # }

-{ pkgs, colors, ... }:
+{ pkgs, colors, useTerraform ? false, ... }:

 # Comes from nix2vim overlay:
 # https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
  package = pkgs.neovim-unwrapped;
-  inherit colors;
+  inherit colors useTerraform;
  imports = [
    ../config/align.nix
    ../config/bufferline.nix
--- a/modules/common/programming/terraform.nix
+++ b/modules/common/programming/terraform.nix
@ -3,6 +3,7 @@
  options.terraform.enable = lib.mkEnableOption "Terraform tools.";

  config = lib.mkIf config.terraform.enable {
+    unfreePackages = [ "terraform" ];

    home-manager.users.${config.user} = {
      programs.fish.shellAbbrs = {
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -9,7 +9,7 @@ let

  # Package plugin - for plugins not found in nixpkgs at all
  plugin = pname: src:
-    prev.vimUtils.buildVimPluginFrom2Nix {
+    prev.vimUtils.buildVimPlugin {
      inherit pname src;
      version = "master";
    };