From 27145cd80d44412353aed64f3bd43da1dddb5115 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 9 Aug 2023 13:05:42 +0200 Subject: [PATCH] Update deps --- flake.lock | 30 +++++++++++++++--------------- home/config/nvim/plugins/lsp.fnl | 17 ++++++++++++++--- home/programs/nvim/default.nix | 1 + home/programs/nvim/plugins.nix | 18 +++++++++--------- 4 files changed, 39 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 2a753ea..9a7f53b 100644 --- a/flake.lock +++ b/flake.lock @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1691312444, - "narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", + "lastModified": 1691506824, + "narHash": "sha256-Z2Ms7036CCEAfCmDBDy+sFauO6/7fx2UN3aoPCpp4tA=", "owner": "nix-community", "repo": "home-manager", - "rev": "903e06d734bcae48efb79b9afd51b406d2744179", + "rev": "7b8d43fbaf8450c30caaed5eab876897d0af891b", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1691428956, - "narHash": "sha256-JeZWpcCczEwIw3wX3zUFN0kM/y5cj5PrlO59ckUdGyE=", + "lastModified": 1691544471, + "narHash": "sha256-1jF7vuB/c0dHuR+8AdoV8cS1AqAgUWvwpHZXpzRnI3Y=", "owner": "neovim", "repo": "neovim", - "rev": "0211f889b9538f7df5fbcb06273d273fb071efff", + "rev": "8afdc1f3867a620c8235b3d3964b019b94657190", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1691482757, - "narHash": "sha256-Pw+VRZxjdDkUuGcuGNxGuy9mKFdf0v7UmDzFOPTHUKA=", + "lastModified": 1691569245, + "narHash": "sha256-L6jHCyKAsbj7B7wwfOQP3y48zmJSaExgBnQAVhhF3q0=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "b18065efcdee7fe92ef3c87471b579b37a6cde0b", + "rev": "e2c53fbb0012207bda31323c5ecac35cdfda9b89", "type": "github" }, "original": { @@ -498,11 +498,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1691305349, - "narHash": "sha256-0Pig7jnmuRH3c5dOTVTOvTLwo2CRzYTyvJRQ82HWRSo=", + "lastModified": 1691566999, + "narHash": "sha256-c4G++nXzVgJbXe5tuUZxSS+SbDqynO/nG3wocRcP6YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5426a95071d0b9782b3209b3995cde1f5689616e", + "rev": "8ff521acd2c8132c62141c2990deb7406e32b335", "type": "github" }, "original": { @@ -801,11 +801,11 @@ ] }, "locked": { - "lastModified": 1691440708, - "narHash": "sha256-c7Cc08vJ0IPFgIERpTdO2xvDHQNL7Uf5iXT0GlYO6vo=", + "lastModified": 1691522377, + "narHash": "sha256-1LafgFJaSk53ccsTlI2gWSmIyxRJfFVyoaGJg0c3LjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2a535809ac5c9a32288f4d3b938296e056d948cc", + "rev": "7b380d3cce8271b37394790b521ec2f7a6b248ad", "type": "github" }, "original": { diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index cd569fc..8e6d2f4 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -1,4 +1,5 @@ (let [lsp (require :lspconfig) + lsp-configs (require :lspconfig.configs) cmp (require :cmp_nvim_lsp) navic (require :nvim-navic) diagnostic (require :nifoc.diagnostic) @@ -45,9 +46,19 @@ (each [_ name (pairs default-servers)] ((. lsp name :setup) default-config)) ;; Custom - (when (= (vim.fn.executable :elixir-ls) 1) - (lsp.elixirls.setup (->> {:cmd [:elixir-ls]} - (vim.tbl_extend :force default-config)))) + (when (not lsp-configs.lexical) + (set lsp-configs.lexical + {:default_config {:filetypes [:elixir :eelixir] + :cmd [:lexical :start] + :root_dir (fn [fname] + (or ((lsp.util.root_pattern :mix.exs + :.git) fname) + (vim.loop.os_homedir))) + :settings {}}})) + (if (= (vim.fn.executable :elixir-ls) 1) + (lsp.elixirls.setup (->> {:cmd [:elixir-ls]} + (vim.tbl_extend :force default-config))) + (lsp.lexical.setup {})) (when (= (vim.fn.executable :nil) 1) (lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}} (vim.tbl_extend :force default-config)))) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index ee2d1db..a3d877c 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -26,6 +26,7 @@ in # LSP fennel-ls + lexical nil nodePackages.bash-language-server nodePackages.dockerfile-language-server-nodejs diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 1439a09..dd63e92 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -118,12 +118,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-08"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a9ce9fb7cccf59e0c2f65d26a14942356c93948e"; - sha256 = "0agl2wl6x378dfa4am36vcd2gdrflb98fssaywicdzlghw9yba4k"; + rev = "80cee52d445363c8bd08eacca17be31e3837f4d0"; + sha256 = "0ny0vaz6idv0zn5f90yj33bscm9apd356gh2xfdwill5n0ly29m8"; fetchSubmodules = false; }; }; @@ -242,12 +242,12 @@ in }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-08-04"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c0de180ddb3df36feef8ac3607670894d0e7497f"; - sha256 = "0j1ymayx1c1dycgc50gvq8iv029slc6wzlpj0mbyh60g0wjp7flc"; + rev = "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4"; + sha256 = "0k7cly9xmjgpq55izxk3kcrc6289fra3pcpkisslr9jj6qzq3bfq"; fetchSubmodules = false; }; }; @@ -572,12 +572,12 @@ in }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-08-08"; + version = "2023-08-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "287fffb410ce82d19da2d503a1f1570adf7b7874"; - sha256 = "00cg45dascmbnfmb0lhvxcm82f597bmmy5sh003c0amsn0zc7k30"; + rev = "bae45ef449d8811061cc940459e70e883a3aa83a"; + sha256 = "0ns6qhw79fjxns6x36474dsl6ihqw2sxxm126bpgi9612cq134gs"; fetchSubmodules = false; }; };