diff --git a/flake.lock b/flake.lock index dad137c..b929894 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1700118404, - "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", + "lastModified": 1700261686, + "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", + "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1700187596, - "narHash": "sha256-EZAN3gQj0mYLCr05oDoaj7E8R1lYBuAYFil2+3R1Qdo=", + "lastModified": 1700281612, + "narHash": "sha256-oKR2QnOvPKMGCFEDe37b8SbYU05XKZ7MlGb5/KrhukM=", "owner": "neovim", "repo": "neovim", - "rev": "dc9f7b814517045b5354364655f660aae0989710", + "rev": "cdc8bacc7945da816738e330555fa85d3ffffd56", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1700213693, - "narHash": "sha256-Fa/I0fYJ2Twe2uqyV38b1wTX6Vo6HDokjtCFQXxIPOg=", + "lastModified": 1700310591, + "narHash": "sha256-sRlItVBFbw1lqmnY/6sQiQRGZ6NiPCoB+/OAg+G9tkQ=", "ref": "refs/heads/master", - "rev": "5781d052ab86184a8bf2faad89bad408d9c41dfe", - "revCount": 587, + "rev": "45c471887a88e4a4144e26499fddffea78b25cfe", + "revCount": 588, "type": "git", "url": "https://git.kempkens.io/daniel/nix-overlay" }, @@ -363,11 +363,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1700169889, - "narHash": "sha256-AnqotTs1cIpx7Rc0ML3cnQwGJGSmlaLQZ2xzbjLU3XQ=", + "lastModified": 1700218750, + "narHash": "sha256-ft54Un/pZ/KoI6hx9HLeb/SLg0SB8NvV+z7vzrpWs8c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7bea27b7ef1c23c7433e52327d81a01702d34272", + "rev": "2542afeb0d81db4d1e5bc8df8354cbdcc29c2f53", "type": "github" }, "original": { diff --git a/home/config/nvim/nifoc/clipboard.fnl b/home/config/nvim/nifoc/clipboard.fnl index 2c23332..5697722 100644 --- a/home/config/nvim/nifoc/clipboard.fnl +++ b/home/config/nvim/nifoc/clipboard.fnl @@ -5,7 +5,7 @@ (fn mod.setup [] (if (= uname.sysname :Darwin) (set vim.g.clipboard {:name clip-name - :copy {:+ osc52.copy :* osc52.copy} + :copy {:+ :pbcopy :* :pbcopy} :paste {:+ :pbpaste :* :pbpaste} :cache_enabled 0}) ;; Other OS diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index 7d24ac5..39fc527 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -45,19 +45,12 @@ (each [_ name (pairs default-servers)] ((. lsp name :setup) default-config)) ;; Custom - (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 default-config)) + (when (= (vim.fn.executable :elixir-ls) 1) + (lsp.elixirls.setup (->> {:cmd [:elixir-ls]} + (vim.tbl_extend :force default-config)))) + (when (= (vim.fn.executable :lexical) 1) + (lsp.lexical.setup (->> {:cmd [:lexical :start]} + (vim.tbl_extend :force default-config)))) (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 b171662..a9047e6 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -44,6 +44,7 @@ in nodePackages.eslint_d hadolint luajitPackages.fennel + nixpkgs-fmt shellcheck statix ] ++ optionals isDarwin [ diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 6083d8e..75d9728 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -29,12 +29,12 @@ in }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-14"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "abd7aa3ec50350ec3c986fcdd7328e3d23948b89"; - sha256 = "188dqyddsj2rzz212n8kswxqn8mxa0n38j681r912z4yf4vbmjqi"; + rev = "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10"; + sha256 = "10wnamdjjg904j3rb87a4mfsrpr5aqv4n0bns443wn5a3myl8q0g"; fetchSubmodules = false; }; }; @@ -106,12 +106,12 @@ in }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-17"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8199529bc42ab275786d2f2cc83903f35ff6db9e"; - sha256 = "0831pmrlsplfkzpdyqx7zmygb977rx08n25ir3z8ifflbyvbyz5g"; + rev = "2b12560bc3d7331156c81b02ef7609fce85c1ef8"; + sha256 = "0jlnqsq3qvfxa29j37q70rdm7lz48gk2yyp458jy8ivlb8wxc275"; fetchSubmodules = false; }; }; @@ -128,12 +128,12 @@ in }; rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-16"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "HiPhish"; repo = "rainbow-delimiters.nvim"; - rev = "538b4aec989e05e86dd42eccafa84f27733f9cf7"; - sha256 = "0ajfq3i0sm2xdqmfjfykfyzlmr3lcc9myk7zq07sx25lj6qzz41q"; + rev = "769436897e32bc4f01a9d5f57a23169efe099d46"; + sha256 = "0lafii68ygk7c7x59hz2is6i6ir9v0hdcgnfi8x3rk3cfxzx75mq"; fetchSubmodules = false; }; }; @@ -208,12 +208,12 @@ in }; nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-17"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "48347089666d5b77d054088aa72e4e0b58026e6e"; - sha256 = "1dz7m7mfmpllbfk00sa2q2ga4gyq7jj3sc7l6cw5d7x8g196yd18"; + rev = "7384e7149e79365c96dc623d9fa3444737776982"; + sha256 = "10z5y7mr47cnrpkwl3ai5alvkdy8fj7d2lp22zpg01b4r3nniz5p"; fetchSubmodules = false; }; }; @@ -384,12 +384,12 @@ in }; conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "4524a687107c6e598017dc7356b7cd1eb046aa71"; - sha256 = "02waplka03ghpxhwsgjf0z4iv6dqkcrg2whlha334982q57gml1w"; + rev = "a36c68d2cd551e49883ddb2492c178d915567f58"; + sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba"; fetchSubmodules = false; }; }; @@ -472,23 +472,23 @@ in }; gitsigns-nvim = buildVimPlugin { pname = "gitsigns.nvim"; - version = "2023-11-16"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "37d26d718f8120a8c5c107c580c8c98cf89fdf1f"; - sha256 = "02w4xk0ps1swpj7fl73rxn15mf799ih04sx6k1wjrbxa5j3vwdqp"; + rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55"; + sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f"; fetchSubmodules = false; }; }; fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-11-15"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "f10103f8f30fed80a7ab07fff5756164fea87c70"; - sha256 = "1qw2ib10mca7a8hjpr6sl792shrgn4zmybab3ldzw31v8wk1s24g"; + rev = "bd0b8b644d4fb293dc4df2718b1f2df3abd90767"; + sha256 = "15kchq7qmlrr15s0g2zxaq4nr4q1i773210564h4a42lmmql5xv7"; fetchSubmodules = false; }; };