diff --git a/flake.lock b/flake.lock index b6baa83..5449dca 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667898954, - "narHash": "sha256-VqHVeoxcOl9M6yQ+LV3yTWMb0h5Rl5yixn9PCY/MJJo=", + "lastModified": 1667981810, + "narHash": "sha256-p27zd5M+OkfND46gzbGkaHlNBZsYe95M48OJuFeuuSY=", "owner": "nix-community", "repo": "home-manager", - "rev": "d20e3d070c78271356a2d5d73c01f1de94586087", + "rev": "6ce3493a3c5c6a8f4cfa6f5f88723272e0cfd335", "type": "github" }, "original": { @@ -102,11 +102,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1667868109, - "narHash": "sha256-5Y0P2fKF66sDbHHopIc4kJkBLjqXtTETyB8M0J0JpNQ=", + "lastModified": 1667897328, + "narHash": "sha256-jwdTgwWUUraNQ0UC735EhRTQqN2kdlZfrfyE+QAQP98=", "owner": "neovim", "repo": "neovim", - "rev": "d187c00faf4feb76bdc544b87bea71f217d05957", + "rev": "fae754073289566051433fae74ec65783f9e7a6a", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1667895627, - "narHash": "sha256-3A5/ooaZYfFESwpTpVuTxgHWBhZahgO37FbDOY5CyRo=", + "lastModified": 1667981950, + "narHash": "sha256-rOO+7k7lKIo9J8eBVYgLuPbEGe8sNYQNGeVaaB/6aek=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d520530dd8a81282039fef2c00464a7e6cbfed45", + "rev": "2a2a702fcb4ce5ecd792f1ec799d69026ce5d594", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1667896360, - "narHash": "sha256-DzrQU830FtlRLzDCwXR8tC/TW0c1x8AzGDgK4ZO01rs=", + "lastModified": 1667982678, + "narHash": "sha256-0r1WcvIQxPNV+P9Vzgp84o1hTofgyMW+x84uEmjfG4g=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "d89d8dc5a1c6d95e8315d05dbdef58e7b62ccfde", + "rev": "84fe46e63d4d70bf7b877db75f40dad0a00d41a0", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667879206, - "narHash": "sha256-fHiB8mIUotFpbvugTJ9ImYJ6q0ry2QVFHYox6YRHHaE=", + "lastModified": 1667969101, + "narHash": "sha256-GL53T705HO7Q/KVfbb5STx8AxFs8YgaGY8pvAZC+O7U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "295778ad21806918c16176164497f2793e2133f4", + "rev": "bbf77421ac51a7c93f5f0f760da99e4dbce614fa", "type": "github" }, "original": { diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index 1a29e90..285317f 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -27,6 +27,7 @@ :erlangls :eslint :html + :jdtls :nil_ls :rnix :sqls diff --git a/home/programs/custom-nix-cache.nix b/home/programs/custom-nix-cache.nix index af5a208..c81c948 100644 --- a/home/programs/custom-nix-cache.nix +++ b/home/programs/custom-nix-cache.nix @@ -23,6 +23,7 @@ in if [[ $storePath == *"darwin-system"* ]] || [[ $storePath == *"nixos-system"* ]] || + [[ $storePath == *"-nix-shell-env" ]] || [[ $storePath == *"-system-"* ]] || [[ $storePath == *"home-manager"* ]] || [[ $storePath == *"-etc" ]] || diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 4500c0e..d229154 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -91,12 +91,12 @@ rec { }; leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-11-05"; + version = "2022-11-09"; src = pkgs.fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "dda4ed60f90ae889f459887449a43c4de29609bd"; - sha256 = "1vg3aawik80g59kvaf0n97hc6k3f7bkh43xw94dz3f3gs1yiks8b"; + rev = "c19e974cfd9d52dc5070ec7b68183da39702c877"; + sha256 = "1wdjmziq9910h51hvnmq27abqa8052fbpx5g065hbwk3jwsb5417"; fetchSubmodules = false; }; }; @@ -197,8 +197,8 @@ rec { src = pkgs.fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "f244aa391774b29878db580eff63a9e26dc5f084"; - sha256 = "1awd6008lzmhwc285ldzglmjmzqiianfn32d5siy9lhlri915v33"; + rev = "bca0e00644c22a3eecedce703c0db080dd6bdc55"; + sha256 = "1rb8w2xgnwkf2vv3fwrjmqzw06iwhfmzb33ya01kbs077hp5qyc9"; fetchSubmodules = false; }; }; @@ -567,12 +567,12 @@ rec { }; nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-11-08"; + version = "2022-11-09"; src = pkgs.fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "ba270debc292cf173f5907ab67325947334c6dd8"; - sha256 = "1zwmzvy900xdqzp7p8dicp7gr6x7256j30y9aqq1s06lskkg9w31"; + rev = "30e6b5a710319e354c3e362deb7819cb2135c417"; + sha256 = "0wg4zh8n25q9yhfhpgf9vimgcq5mim3nfj332fzh13vzn2w9z4jp"; fetchSubmodules = false; }; }; diff --git a/home/programs/scripts/jdtls b/home/programs/scripts/jdtls new file mode 100755 index 0000000..af18b03 --- /dev/null +++ b/home/programs/scripts/jdtls @@ -0,0 +1,3 @@ +#!/bin/sh + +exec jdt-language-server "$@"