diff --git a/flake.lock b/flake.lock index 40537c5..81ab5cd 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1670338166, - "narHash": "sha256-6vCOISPvB/HCMrn2807EkzGVDsvmnxXjNtXQcgY8lIY=", + "lastModified": 1671155090, + "narHash": "sha256-kRbTLQN4oQGu3YTxRgB75rCV18QLc4ENKfT3xhjrVT4=", "owner": "hercules-ci", "repo": "arion", - "rev": "261d1507d633fe256f8d9bfdc820b83e3c7aeec6", + "rev": "cabcbcacca1ba6e71f91dbccec24880850bdf516", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1668784520, - "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=", + "lastModified": 1671196037, + "narHash": "sha256-2+J98SeczFWonbqFLMEAQC7vZEe6I2gM17XYvEmG52I=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f", + "rev": "adb8ac0453c8b2c40f5bffb578453dbaee838952", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670513770, - "narHash": "sha256-muL74fsbGA8K8WlZSPNWddOiuBnC54kAajncX6nXrh4=", + "lastModified": 1671209729, + "narHash": "sha256-zxn1eA/rMi2DOx43V7q87bGaDzvL7CMVY/Ti7lJ92DQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "054d9e3187ca00479e8036dc0e92900a384f30fd", + "rev": "7d55a72d4c1df694e87a41a7e6c9a7b6e9a40ca3", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1670719680, - "narHash": "sha256-kP4/BLoMtt69GcoSOu8fcD+rImuR6GPNrat5HUnsmGY=", + "lastModified": 1671152053, + "narHash": "sha256-YMSY0zPXRq92S7vCuOhl3yCCJtwzpBcrk/JyRKv6egs=", "owner": "neovim", "repo": "neovim", - "rev": "3dadd3aca5af4d09d0acbb027098b1a2c889e433", + "rev": "72a19b2ffe93ab20f6ff1825e11b43da4e44842a", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1670746448, - "narHash": "sha256-LwBDkKsmzOjBEMqcebf+dOX3Uc6r13hZnVLpTIGAt0I=", + "lastModified": 1671178444, + "narHash": "sha256-56YShCCAXWaFbTtyk01rWFJKK9FmV2ugjC0/2wlOIeg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "f9c19bc5e9f8bb90035f57e131098be891f40b5f", + "rev": "0d604e189ceb48b53987fb3e407a7f764d84d3db", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1670747030, - "narHash": "sha256-7B7NyI/O8xef3lggKu6LjDCqR2xfH6ucyHOSNj8TSLs=", + "lastModified": 1671178982, + "narHash": "sha256-x3AqEGjOXlg64/cNBx9EcXTHdLfiroPm/VyGPxLDIoQ=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "c60a3c66cb842e614c8513140ded890b53f9179d", + "rev": "8c670c62d520c74ad8d41b126c1b78bbc0ca2e3f", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670681895, - "narHash": "sha256-kZH9DSU36W4fn1z81a/24JCGkU517TcY50VE0RFJ9k4=", + "lastModified": 1671190014, + "narHash": "sha256-NW385LW4Nj53Hbv3LXr458s4NL2/wcARC8rzK7vSWkw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", + "rev": "fbcb61bd7eb19914cbd88789c3586a63ff46b72b", "type": "github" }, "original": { diff --git a/home/config/nvim/ftplugin/java.fnl b/home/config/nvim/ftplugin/java.fnl index 0764207..736128b 100644 --- a/home/config/nvim/ftplugin/java.fnl +++ b/home/config/nvim/ftplugin/java.fnl @@ -4,12 +4,16 @@ jars-dir (.. cache-dir :/jars) workspace-dir (.. cache-dir :/workspace/ project-name) formatter-config (.. cache-dir :/config/formatter. project-name :.xml) + formatter-settings (if (= (vim.fn.filereadable formatter-config) 1) + {:enabled true :settings {:url formatter-config}} + {:enabled false}) config {:cmd [:jdt-language-server :-data workspace-dir] :root_dir (vim.fs.dirname (. (vim.fs.find [:.gradlew :.git :.mvnw] {:upward true}) - 1))}] + 1)) + :settings {:java {:format formatter-settings}}}] (set vim.env.JAVA_OPTS (.. "-javaagent:" jars-dir :/lombok.jar)) (jdtls.start_or_attach config)) diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 3258a40..0397440 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -3,12 +3,12 @@ rec { impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-11-12"; + version = "2022-12-15"; src = pkgs.fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "d3dd30ff0b811756e735eb9020609fa315bfbbcc"; - sha256 = "04wv6hzmdwcd563kl68n33yyyydhr0rdbjc93874dlh2nlfm7ixn"; + rev = "9f7eed8133d62457f7ad2ca250eb9b837a4adeb7"; + sha256 = "0kzghqbidarjabmn1i0vwkz3jfnwpfzj36ild15y77l673acwdcj"; fetchSubmodules = false; }; }; @@ -58,12 +58,12 @@ rec { }; yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "yanky.nvim"; - version = "2022-12-09"; + version = "2022-12-16"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "022899d0c30d3a6344344f05df0850574c38ac9c"; - sha256 = "1j17rh9m87n5zs048bxzd62l297jj1skfxn0clykix9as4lhafs3"; + rev = "2bb05abe20b5d7af917a48785acfacb602248e36"; + sha256 = "1zhf7mbrl45hnfdmg26hlvh758cjy5kxn5ygxk7x5b480w0vg45i"; fetchSubmodules = false; }; }; @@ -80,44 +80,44 @@ rec { }; substitute-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "substitute.nvim"; - version = "2022-11-21"; + version = "2022-12-16"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "1491b84348de39a54865f321b66bd2c03700ef04"; - sha256 = "1dv7bk3hzf4gs4ljbfflgy60q5lh2zvh120f9rmhsm4m0npj7z76"; + rev = "e63afff1ab385bb210a97bbafa23ba05bdc336b7"; + sha256 = "0lqx6i9c69a1r39y9isg5dhvg8cm07j3sfanf6gjzf4mnp1zkv5w"; fetchSubmodules = false; }; }; leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-12-11"; + version = "2022-12-14"; src = pkgs.fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "8f0d4a96d888f40ceff4f5a47f01ec06d48cb75a"; - sha256 = "05mmjpxvics8f7qxjs6syj87ngvx2wqqqgxk3rd2y8cpjxyqiacw"; + rev = "5e7e4462cc4b9e6a13e0f25b81d88d8b331cb29f"; + sha256 = "1dp35q869qiw94jwfvc174vq7siggxz263srqs31gd9ivl6c2q7q"; fetchSubmodules = false; }; }; dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-12-09"; + version = "2022-12-12"; src = pkgs.fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "3fef2ddad976873dd9c9e769e14bd6ae10a3fdff"; - sha256 = "1f0g63h2kbs5vzfan7cfirk3c0aqv3mhp32bpf3scalrdrwr5mpi"; + rev = "1ee6072c6638de86abc9aef43ac315fd7eede6aa"; + sha256 = "0xq0m5qy3c48bvc6rrhr9w3rzy51a0gl2wi4y64mxp96aapz7j6h"; fetchSubmodules = false; }; }; nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { - version = "2022-12-10"; + version = "2022-12-16"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "619f1ace03860d668c7a661332c38480f2db2584"; - sha256 = "05gj2gxi5bhi2xg6ihgwckjkcspaijdyrgbwzh96hz766s0zz3f3"; + rev = "36c6826274ac85e04558e875a30e82aca676e3fe"; + sha256 = "196klrl7yzawafzklrwcpz7qwrklwaaki653r40k95ljxsc5bf2r"; fetchSubmodules = false; }; }); @@ -181,12 +181,12 @@ rec { }; todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-11-16"; + version = "2022-12-14"; src = pkgs.fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "1b9df577262b2c4c4ea422161742927f80ffa131"; - sha256 = "14yiibv5qh89y8d7ps1rv65sxq2ckj7mky5wv9fkzhplvjzg84zi"; + rev = "c1760010f46992165995aaa52ca967f473a2e8e6"; + sha256 = "0r7nx0bfw9cn8xjbwxi8gzds768lmcbwwfvivmy0hib82xprf674"; fetchSubmodules = false; }; }; @@ -214,23 +214,23 @@ rec { }; nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-11"; + version = "2022-12-16"; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6eb24ef9175d1fa3c7a23e115854b1a2d923d386"; - sha256 = "0qwc6c1s37vyv913m984yicj3fkich26c06zs86q6pnc1n65cfl9"; + rev = "e95c12cea141632d3502fad4fb1c9260a91a65f4"; + sha256 = "19xmj232j9lir27486qksf86f1wwblv7v9b7lpmial1p1nfj8m50"; fetchSubmodules = false; }; }; nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-12-08"; + version = "2022-12-14"; src = pkgs.fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e0147c1b0f94708392783bbb44db8cd8bf8c84d4"; - sha256 = "1m015d36yxq3q5f2pw9bpn3jrr35gi333c78x8brzng7l592zs8j"; + rev = "69ad133ef7296b26f6f05ed5d0960628fbb15a83"; + sha256 = "0z3xsn52lgvcdfgc06w4b4m2hyyd6nzdlygwk5n97ryjaahhm07j"; fetchSubmodules = false; }; }; @@ -280,12 +280,12 @@ rec { }; nvim-lint = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-12-08"; + version = "2022-12-15"; src = pkgs.fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "5b6d0463e956b625cd17b51ad391bae9ee5bea92"; - sha256 = "0ignv8w27jzxg1a3c884j0xgy10bwkbdk1inip9jrv3hpai2x9rj"; + rev = "d60514f14baf8eacef4166070783d26c28fe3699"; + sha256 = "0fxk2gwq1dpmjsk9vwb8vh54xv7wh21skw1c4wg8pz9fcar3790w"; fetchSubmodules = false; }; }; @@ -313,23 +313,23 @@ rec { }; friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-12-05"; + version = "2022-12-13"; src = pkgs.fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "9b3e497cf0c3abcf73d791968a9768a22405fa13"; - sha256 = "14j3w7aqnz62fxkrhyklbip9qpdj0cmfxj3japvxbjksh7iba35b"; + rev = "2379c6245be10fbf0ebd057f0d1f89fe356bf8bc"; + sha256 = "10xxrx62mb71mh6q2zm82zkgbghlgq39fnqsaig3p947qjlinndn"; fetchSubmodules = false; }; }; nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-11-27"; + version = "2022-12-15"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "93f385c17611039f3cc35e1399f1c0a8cf82f1fb"; - sha256 = "0c9931rb4pf9vj51gqxizvbamq9ycjzy08vq2arm1jkrrr8fkmfc"; + rev = "8bbaeda725d5db6e4e1be2867a64b43bf547cf06"; + sha256 = "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5"; fetchSubmodules = false; }; }; @@ -478,23 +478,23 @@ rec { }; nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-12-10"; + version = "2022-12-15"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e8b7807e0398754bd7dbb5cae043340374975f77"; - sha256 = "18vc5nzvxijg8nm7k635y0w95lihqgwyix4ljwrx7gqr73smwqv9"; + rev = "e0d2c72894db60001650b36357d3480f17e1c340"; + sha256 = "14c8m1s6c8hwn71797ir3rvwpjw1hgjcn28w1mb14w6781c8710k"; fetchSubmodules = false; }; }; nvim-surround = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-24"; + version = "2022-12-11"; src = pkgs.fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "6b45fbffdabb2d8cd80d310006c92e59cec8fd74"; - sha256 = "1qdhyclzsw1inwwzw3kr1jxq3cz0qr358whj93y16x7id3ylsx52"; + rev = "6cc6b54d3728a17e34bb5c9b9db05c7e5690813d"; + sha256 = "06sbki4m8za9zsj643fj5wzx44xsa1nv23as1m9ip99cwqrvxqcc"; fetchSubmodules = false; }; }; @@ -555,23 +555,23 @@ rec { }; gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-11-30"; + version = "2022-12-16"; src = pkgs.fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "d076301a634198e0ae3efee3b298fc63c055a871"; - sha256 = "12990v2zcsas8575nf6ln1byw3zg473s5jpizk4g3v9ikfdvjbfr"; + rev = "71644a2907adc076f1c5e712f59d897f5197d5d6"; + sha256 = "03gx7af2n6m04jwpng8l8d35rf6a67d85sq66crmqwg1ycyk1vln"; fetchSubmodules = false; }; }; nui-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-12-09"; + version = "2022-12-15"; src = pkgs.fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "2a6533fb798efad7dd783311315bab8dc5eb381b"; - sha256 = "08r8ddpxs6zf13vkdjcvhczh6g4r4hkfag5yqkc3pa57wfrda8f2"; + rev = "7427f979cc0dc991d8d177028e738463f17bcfcb"; + sha256 = "0z2yxlvm10wcbgjbbyyl6zranv5f81mn29vq6b4q32l84ah8kvpw"; fetchSubmodules = false; }; }; @@ -588,12 +588,12 @@ rec { }; noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-12-03"; + version = "2022-12-16"; src = pkgs.fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "e013b6ebbad0fab34013be6f073da38c53c9e1dc"; - sha256 = "1pxnj2m7v8m943xs24hspggwhwyv0nla96d38mh1r8bllhh367k8"; + rev = "e7ca27179fe77761fd961f4e0dfeaa464da0a72c"; + sha256 = "17z6gnbxwm7hlr42yl1jd7q7w9av926a2y0jhr2mc1rknnx1y4yx"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/update-plugins.sh b/home/programs/nvim/update-plugins.sh index 4c50db9..626607b 100755 --- a/home/programs/nvim/update-plugins.sh +++ b/home/programs/nvim/update-plugins.sh @@ -21,7 +21,7 @@ echo '{ pkgs, ... }:' >>"$nix_new_file" echo "rec {" >>"$nix_new_file" for plugin in "${plugin_array[@]}"; do - raw_src="$(echo "$plugin" | dasel -r json --plain '.src')" + raw_src="$(echo "$plugin" | dasel -r json -w - '.src')" owner="$(echo "$raw_src" | awk -F'/' '{ print $(NF-1) }')" repo="$(echo "$raw_src" | awk -F'/' '{ print $(NF) }')" name="$(echo "$repo" | tr [.] '-')" @@ -55,12 +55,12 @@ for plugin in "${plugin_array[@]}"; do src="{ owner = \"${owner}\"; repo = \"${repo}\"; - rev = \"$(echo "$src_json" | dasel -r json --plain '.rev')\"; - sha256 = \"$(echo "$src_json" | dasel -r json --plain '.sha256')\"; - fetchSubmodules = $(echo "$src_json" | dasel -r json --plain '.fetchSubmodules'); + rev = \"$(echo "$src_json" | dasel -r json -w - '.rev')\"; + sha256 = \"$(echo "$src_json" | dasel -r json -w - '.sha256')\"; + fetchSubmodules = $(echo "$src_json" | dasel -r json -w - '.fetchSubmodules'); }" - commit_date="$(echo "$src_json" | dasel -r json --plain '.date')" + commit_date="$(echo "$src_json" | dasel -r json -w - '.date')" version="$(date -d "$commit_date" "+%Y-%m-%d")" case "$clone_src" in