daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps

Browse source
This commit is contained in:
Daniel Kempkens 2023-08-09 13:05:42 +02:00
parent df0ab93237
commit 27145cd80d
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
4 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -415,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691312444, "lastModified": 1691506824,
"narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", "narHash": "sha256-Z2Ms7036CCEAfCmDBDy+sFauO6/7fx2UN3aoPCpp4tA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "903e06d734bcae48efb79b9afd51b406d2744179", "rev": "7b8d43fbaf8450c30caaed5eab876897d0af891b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1691428956, "lastModified": 1691544471,
"narHash": "sha256-JeZWpcCczEwIw3wX3zUFN0kM/y5cj5PrlO59ckUdGyE=", "narHash": "sha256-1jF7vuB/c0dHuR+8AdoV8cS1AqAgUWvwpHZXpzRnI3Y=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "0211f889b9538f7df5fbcb06273d273fb071efff", "rev": "8afdc1f3867a620c8235b3d3964b019b94657190",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +463,11 @@
"weewx-proxy-flake": "weewx-proxy-flake" "weewx-proxy-flake": "weewx-proxy-flake"
}, },
"locked": { "locked": {
"lastModified": 1691482757, "lastModified": 1691569245,
"narHash": "sha256-Pw+VRZxjdDkUuGcuGNxGuy9mKFdf0v7UmDzFOPTHUKA=", "narHash": "sha256-L6jHCyKAsbj7B7wwfOQP3y48zmJSaExgBnQAVhhF3q0=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "b18065efcdee7fe92ef3c87471b579b37a6cde0b", "rev": "e2c53fbb0012207bda31323c5ecac35cdfda9b89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1691305349, "lastModified": 1691566999,
"narHash": "sha256-0Pig7jnmuRH3c5dOTVTOvTLwo2CRzYTyvJRQ82HWRSo=", "narHash": "sha256-c4G++nXzVgJbXe5tuUZxSS+SbDqynO/nG3wocRcP6YE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "5426a95071d0b9782b3209b3995cde1f5689616e", "rev": "8ff521acd2c8132c62141c2990deb7406e32b335",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +801,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691440708, "lastModified": 1691522377,
"narHash": "sha256-c7Cc08vJ0IPFgIERpTdO2xvDHQNL7Uf5iXT0GlYO6vo=", "narHash": "sha256-1LafgFJaSk53ccsTlI2gWSmIyxRJfFVyoaGJg0c3LjM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "2a535809ac5c9a32288f4d3b938296e056d948cc", "rev": "7b380d3cce8271b37394790b521ec2f7a6b248ad",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
home/config/nvim/plugins/lsp.fnl
View file

@ -1,4 +1,5 @@
(let [lsp (require :lspconfig) (let [lsp (require :lspconfig)
lsp-configs (require :lspconfig.configs)
cmp (require :cmp_nvim_lsp) cmp (require :cmp_nvim_lsp)
navic (require :nvim-navic) navic (require :nvim-navic)
diagnostic (require :nifoc.diagnostic) diagnostic (require :nifoc.diagnostic)
@ -45,9 +46,19 @@
(each [_ name (pairs default-servers)] (each [_ name (pairs default-servers)]
((. lsp name :setup) default-config)) ((. lsp name :setup) default-config))
;; Custom ;; Custom
(when (= (vim.fn.executable :elixir-ls) 1) (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]} (lsp.elixirls.setup (->> {:cmd [:elixir-ls]}
(vim.tbl_extend :force default-config)))) (vim.tbl_extend :force default-config)))
(lsp.lexical.setup {}))
(when (= (vim.fn.executable :nil) 1) (when (= (vim.fn.executable :nil) 1)
(lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}} (lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}}
(vim.tbl_extend :force default-config)))) (vim.tbl_extend :force default-config))))

1
home/programs/nvim/default.nix
View file

@ -26,6 +26,7 @@ in
# LSP # LSP
fennel-ls fennel-ls
lexical
nil nil
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs nodePackages.dockerfile-language-server-nodejs

18
home/programs/nvim/plugins.nix
View file

@ -118,12 +118,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-08-08"; version = "2023-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "a9ce9fb7cccf59e0c2f65d26a14942356c93948e"; rev = "80cee52d445363c8bd08eacca17be31e3837f4d0";
sha256 = "0agl2wl6x378dfa4am36vcd2gdrflb98fssaywicdzlghw9yba4k"; sha256 = "0ny0vaz6idv0zn5f90yj33bscm9apd356gh2xfdwill5n0ly29m8";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -242,12 +242,12 @@ in
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-08-04"; version = "2023-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "c0de180ddb3df36feef8ac3607670894d0e7497f"; rev = "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4";
sha256 = "0j1ymayx1c1dycgc50gvq8iv029slc6wzlpj0mbyh60g0wjp7flc"; sha256 = "0k7cly9xmjgpq55izxk3kcrc6289fra3pcpkisslr9jj6qzq3bfq";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -572,12 +572,12 @@ in
}; };
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-08-08"; version = "2023-08-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "287fffb410ce82d19da2d503a1f1570adf7b7874"; rev = "bae45ef449d8811061cc940459e70e883a3aa83a";
sha256 = "00cg45dascmbnfmb0lhvxcm82f597bmmy5sh003c0amsn0zc7k30"; sha256 = "0ns6qhw79fjxns6x36474dsl6ihqw2sxxm126bpgi9612cq134gs";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };