diff --git a/flake.lock b/flake.lock index e010044..b6baa83 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1666776005, - "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=", + "lastModified": 1667419884, + "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c", + "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1666903647, - "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=", + "lastModified": 1667898954, + "narHash": "sha256-VqHVeoxcOl9M6yQ+LV3yTWMb0h5Rl5yixn9PCY/MJJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745", + "rev": "d20e3d070c78271356a2d5d73c01f1de94586087", "type": "github" }, "original": { @@ -102,11 +102,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1666937749, - "narHash": "sha256-EV5xedVss7k6kkCSANpV5kvUTdzJF800ou4XM+WzGPw=", + "lastModified": 1667868109, + "narHash": "sha256-5Y0P2fKF66sDbHHopIc4kJkBLjqXtTETyB8M0J0JpNQ=", "owner": "neovim", "repo": "neovim", - "rev": "3de2a7f6df26ceb27d465d37f78306af2a4c5119", + "rev": "d187c00faf4feb76bdc544b87bea71f217d05957", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1666945201, - "narHash": "sha256-ClMLV340uIkcagESVZMH7FBDAvLNm+LLS5Dup+9iZDI=", + "lastModified": 1667895627, + "narHash": "sha256-3A5/ooaZYfFESwpTpVuTxgHWBhZahgO37FbDOY5CyRo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4cc4b85e63cc16ade53faf30e310650102e69aaa", + "rev": "d520530dd8a81282039fef2c00464a7e6cbfed45", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1666946188, - "narHash": "sha256-woseBu8GSShZQQT7VkhuI4MFP9XikuT41wMCVQ446Zo=", + "lastModified": 1667896360, + "narHash": "sha256-DzrQU830FtlRLzDCwXR8tC/TW0c1x8AzGDgK4ZO01rs=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "6891b68c73d16a4189772a02d5c9f4614f660c24", + "rev": "d89d8dc5a1c6d95e8315d05dbdef58e7b62ccfde", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666926733, - "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=", + "lastModified": 1667879206, + "narHash": "sha256-fHiB8mIUotFpbvugTJ9ImYJ6q0ry2QVFHYox6YRHHaE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f44ba1be526c8da9e79a5759feca2365204003f6", + "rev": "295778ad21806918c16176164497f2793e2133f4", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/home/config/direnv/direnvrc b/home/config/direnv/direnvrc index d01ef11..4464630 100644 --- a/home/config/direnv/direnvrc +++ b/home/config/direnv/direnvrc @@ -18,7 +18,7 @@ project_erlang() { export REBAR_GLOBAL_CACHE_DIR=$(direnv_layout_dir)/rebar/cache } -project_elixir() { +project_elixir() { project_erlang export MIX_HOME=$(direnv_layout_dir)/mix @@ -28,6 +28,10 @@ project_elixir() { PATH_add $HEX_HOME/bin } +project_java() { + export M2_HOME=$(direnv_layout_dir)/m2 +} + project_node() { export NODE_PATH=$(direnv_layout_dir)/node export NPM_CONFIG_USERCONFIG=$(direnv_layout_dir)/npm/npmrc @@ -36,6 +40,7 @@ project_node() { export NPM_CONFIG_DEVDIR=$(direnv_layout_dir)/npm/dev export YARN_ENABLE_TELEMETRY=false + export NEXT_TELEMETRY_DISABLED=1 PATH_add $NODE_PATH/bin PATH_add node_modules/.bin diff --git a/home/config/nvim/init.fnl b/home/config/nvim/init.fnl index c12d37d..de8ce17 100644 --- a/home/config/nvim/init.fnl +++ b/home/config/nvim/init.fnl @@ -8,7 +8,6 @@ (set o.showmode false) (set o.modeline false) (set o.ruler false) - (set o.lazyredraw true) (set o.cursorline true) (set o.list true) (set o.listchars {:tab "»·" diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl index 26fa7fb..77954d6 100644 --- a/home/config/nvim/nifoc/keymap.fnl +++ b/home/config/nvim/nifoc/keymap.fnl @@ -1,13 +1,13 @@ (let [mod {} keymap vim.keymap substitute (require :substitute) - telescope (require :telescope) telescope-builtin (require :telescope.builtin) telescope-themes (require :telescope.themes) telescope-nifoc (require :nifoc.telescope) telescope-toggleterm (require :telescope-toggleterm) telescope-ivy (telescope-themes.get_ivy) telescope-dropdown (telescope-themes.get_dropdown) + noice (require :noice) npairs (require :nvim-autopairs) gitsigns (require :gitsigns) repl (require :nifoc.repl) @@ -53,7 +53,7 @@ (keymap.set :n :dlr :LspRestart {:desc "Restart LSP"}) (keymap.set :n :dt :TSPlaygroundToggle {:desc "Toggle Treetsitter Playground"}) - (keymap.set :n :dn telescope.extensions.notify.notify + (keymap.set :n :dn #(noice.cmd :telescope) {:desc "Display Notifications"}) ;; Other Mappings (keymap.set :n : ":nohlsearch" {:silent true}) diff --git a/home/config/nvim/plugins/cmp.fnl b/home/config/nvim/plugins/cmp.fnl index abdcac1..b43d913 100644 --- a/home/config/nvim/plugins/cmp.fnl +++ b/home/config/nvim/plugins/cmp.fnl @@ -46,7 +46,6 @@ : (cmp.mapping.confirm {:select true})}) :completion {:keyword_length 2 :completeopt "menu,menuone,noinsert"} - :window {:documentation (cmp.config.window.bordered {:border :rounded})} :snippet {:expand (fn [args] (luasnip.lsp_expand args.body))} :formatting {:format (lspkind.cmp_format {:mode :symbol_text diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index 7673a4f..1a29e90 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -14,11 +14,6 @@ (set client.server_capabilities.documentRangeFormattingProvider false) (custom-attach client bufnr)) - ;; Custom handler - (tset vim.lsp.handlers :textDocument/hover - (vim.lsp.with vim.lsp.handlers.hover {:border :rounded})) - (tset vim.lsp.handlers :textDocument/signatureHelp - (vim.lsp.with vim.lsp.handlers.signature_help {:border :rounded})) ;; Servers (let [capabilities (cmp.default_capabilities) flags {:allow_incremental_sync true :debounce_text_changes 700} diff --git a/home/config/nvim/plugins/noice.fnl b/home/config/nvim/plugins/noice.fnl new file mode 100644 index 0000000..f4ed2a3 --- /dev/null +++ b/home/config/nvim/plugins/noice.fnl @@ -0,0 +1,6 @@ +(let [noice (require :noice)] + (noice.setup {:lsp {:override {:vim.lsp.util.convert_input_to_markdown_lines true + :vim.lsp.util.stylize_markdown true + :cmp.entry.get_documentation true}} + :presets {:lsp_doc_border true}})) + diff --git a/home/config/nvim/plugins/notify.fnl b/home/config/nvim/plugins/notify.fnl deleted file mode 100644 index d5feefd..0000000 --- a/home/config/nvim/plugins/notify.fnl +++ /dev/null @@ -1,4 +0,0 @@ -(let [notify (require :notify)] - (notify.setup {}) - (set vim.notify notify)) - diff --git a/home/config/nvim/plugins/treesitter.fnl b/home/config/nvim/plugins/treesitter.fnl index 713a88c..fd11561 100644 --- a/home/config/nvim/plugins/treesitter.fnl +++ b/home/config/nvim/plugins/treesitter.fnl @@ -31,11 +31,13 @@ :typescript :vim :yaml] - rainbow-parsers [:fennel]] + rainbow-parsers [:fennel] + disable-parsers [:tsx]] (nifoc-treesitter.setup) (treesitter-config.setup {:ensure_installed [] :sync_install true - :highlight {:enable true} + :auto_install false + :highlight {:enable true :disable disable-parsers} :indent {:enable true} :textobjects {:select {:enable true :keymaps {:af "@function.outer" @@ -47,7 +49,7 @@ (not (vim.tbl_contains rainbow-parsers parser))) install-parsers)} - :matchup {:enable true} + :matchup {:enable true :disable disable-parsers} :autopairs {:enable true} :autotag {:enable true} :playground {:enable true} diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index 4dab261..8c6cf06 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -70,39 +70,4 @@ in programs = { zoxide.enable = true; }; - - # Source: https://github.com/nix-community/home-manager/issues/1341#issuecomment-1190875080 - home.activation.copyApplications = - let - apps = pkgs.buildEnv { - name = "home-manager-applications"; - paths = config.home.packages; - pathsToLink = "/Applications"; - }; - in - lib.hm.dag.entryAfter [ "writeBoundary" ] '' - baseDir="$HOME/Applications/Home Manager Apps" - $DRY_RUN_CMD mkdir -p "$baseDir" - - for appFile in ${apps}/Applications/*; do - appFileChecksum="$(find "$appFile/Contents/MacOS" -type f -exec md5 -q {} \; | md5 -q)" - target="$baseDir/$(basename "$appFile")" - - if [ -d "$target" ]; then - targetChecksum="$(find "$target/Contents/MacOS" -type f -exec md5 -q {} \; | md5 -q)" - else - targetChecksum="0" - fi - - if [ "$appFileChecksum" = "$targetChecksum" ]; then - echo "Application not changed: $(basename "$appFile")" - else - echo -n "Coyping application $(basename "$appFile"): " - $DRY_RUN_CMD rm -rf "$target" - $DRY_RUN_CMD cp ''${VERBOSE_ARG:+-v} -fHRL "$appFile" "$baseDir" - $DRY_RUN_CMD chmod ''${VERBOSE_ARG:+-v} -R +w "$target" - echo 'Done' - fi - done - ''; } diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 246c240..fed7f4e 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -308,9 +308,12 @@ in type = "fennel"; } + nvim-notify + nui-nvim + { - plugin = nvim-notify; - config = builtins.readFile ../../config/nvim/plugins/notify.fnl; + plugin = noice-nvim; + config = builtins.readFile ../../config/nvim/plugins/noice.fnl; type = "fennel"; } ]) ++ (with pkgs.vimPlugins; [ diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 50e61ac..4500c0e 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -36,12 +36,12 @@ rec { }; nvim-web-devicons = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-10-17"; + version = "2022-11-06"; src = pkgs.fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "9061e2d355ecaa2b588b71a35e7a11358a7e51e1"; - sha256 = "04qzvk4cpvs1yariwr5mw9034vfx182drdpz2iwplr5dqlmkv64j"; + rev = "520776f30a3b39ed56402bffbdae57549e778b40"; + sha256 = "177gsxp2s2qkn6xr5rz9y45mns31v35g6dc93azj0h3dpa2ds2km"; fetchSubmodules = false; }; }; @@ -58,12 +58,12 @@ rec { }; yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "yanky.nvim"; - version = "2022-10-05"; + version = "2022-11-08"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "39bef9fe84af59499cdb88d8e8fb69f3175e1265"; - sha256 = "051mr4asnb3rzp0p1g6zaxyxmxljzj1v4wgyxx9h04zx0n5j10r8"; + rev = "b43ed12a3d4f2814a6648137def522125d8e374d"; + sha256 = "02kp7xdvyk2h0dvypcpqfjn5i1qnrm8379mf872sav09bsr9wzlf"; fetchSubmodules = false; }; }; @@ -80,45 +80,45 @@ rec { }; substitute-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "substitute.nvim"; - version = "2022-09-26"; + version = "2022-11-02"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "1eb56f6494642cf72cf1868312e26ac3d86621be"; - sha256 = "1x952d1ym9636gdmwg3grcbw4cb72gxjz2xpvlwpqzv4vhi2r2li"; + rev = "bc818091dfffa5bc72504a39f0996a3976bfc87b"; + sha256 = "1indz5f705f0f96r4l438x2zpwfj4mzxzckz4jfgzkp6cdgs76dl"; fetchSubmodules = false; }; }; leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-10-23"; + version = "2022-11-05"; src = pkgs.fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "847a1dcfb1a3a576860151754d95fb3b0014663e"; - sha256 = "16dg98qs0531hfcvg6mfb643nivgsx6q4jz8yl2cqd89c0mkfgq4"; + rev = "dda4ed60f90ae889f459887449a43c4de29609bd"; + sha256 = "1vg3aawik80g59kvaf0n97hc6k3f7bkh43xw94dz3f3gs1yiks8b"; fetchSubmodules = false; }; }; dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-10-26"; + version = "2022-11-02"; src = pkgs.fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "55f24e76a978c73c63d22951b0700823f21253b7"; - sha256 = "0lkc0589fpf32c13hmzpi04skw0jp2hsl022d385znxm7x51n1v3"; + rev = "7ff76dd8248efeabb322fec87b22d33c129536fe"; + sha256 = "1g94pxa1frc5ym506vdvfpsk7qby2wzhdv3fby5c09a1vnkz7npz"; fetchSubmodules = false; }; }; nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-28"; + version = "2022-11-08"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0e1b73b41507a46d414de97e18a3acbd915dab82"; - sha256 = "0y7r9ba3hca0mb0a72vsqbhcw14cadjglz37vd2jw3kp34a6ynsr"; + rev = "d37fc85a4060352bcd4d8cbed0907cba442deb90"; + sha256 = "0hf5raqbj4ygvvqhvshrdyvfrch4wjz8ca62vzq584pb6jqpdwzc"; fetchSubmodules = false; }; passthru.withPlugins = @@ -135,12 +135,12 @@ rec { }; nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-09-30"; + version = "2022-11-04"; src = pkgs.fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "1ec3f880585c644ddd50a51502c59f4e36f03e62"; - sha256 = "03403mx5rdknsaia8br0ymc9y53kv8jnnlawfrwralxm1fsrml5h"; + rev = "064fd6c0a15fae7f876c2c6dd4524ca3fad96750"; + sha256 = "1b7z8xyiplb9rjkdqwijnypjqrssrz5lr1wnl5vk1pyb6dnxspzg"; fetchSubmodules = false; }; }; @@ -157,12 +157,12 @@ rec { }; telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-10-26"; + version = "2022-11-06"; src = pkgs.fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "97847309cbffbb33e442f07b8877d20322a26922"; - sha256 = "16haarhd71n6p0ndkl67casbk3ysbxbnsm9dkqaa4cjizdqckbj0"; + rev = "cc77713294892c5bbce26adee665114250624e6b"; + sha256 = "15570726pdndzagpp2g4w83wrgj0sifbbmirpc9d3fwdnys5gxqz"; fetchSubmodules = false; }; }; @@ -182,23 +182,23 @@ rec { }; project-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-09-18"; + version = "2022-10-29"; src = pkgs.fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "628de7e433dd503e782831fe150bb750e56e55d6"; - sha256 = "0p7j5hh45rdricrryy87m7p26wdg6fs07gbyjhrvzxvbsmfbzn9s"; + rev = "685bc8e3890d2feb07ccf919522c97f7d33b94e4"; + sha256 = "0s734kpy3hslb7n6y94cv08clvxh5qp6br1ns3178y99ysv36vkx"; fetchSubmodules = false; }; }; todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-10-28"; + version = "2022-11-08"; src = pkgs.fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "41dd70e581ff4a4c3512c5e1f3d063b00f68cc16"; - sha256 = "0nrasdi8l2mx2v4irf02a7yca7scs7x6q9qma3ajaxxv99qsddpp"; + rev = "f244aa391774b29878db580eff63a9e26dc5f084"; + sha256 = "1awd6008lzmhwc285ldzglmjmzqiianfn32d5siy9lhlri915v33"; fetchSubmodules = false; }; }; @@ -226,12 +226,12 @@ rec { }; nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-26"; + version = "2022-11-07"; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2315a397fd5057e3a74a09a240f606af28447ebf"; - sha256 = "1rqy3lcxy8lxi041g7s5j0nvmbch6s43r6agnwspqm1ag1i7pin0"; + rev = "f40eae01b8e353e9d6e61792567c7d3b9856fd20"; + sha256 = "0qb42zdss3429nvsid7faysbhvzs6xp3cg4v1jmh228yr2hqgghs"; fetchSubmodules = false; }; }; @@ -248,34 +248,34 @@ rec { }; nvim-navic = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-10-25"; + version = "2022-11-02"; src = pkgs.fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navic"; - rev = "9f7f0b797096ee852106c4fd47b6b13d0ebb364e"; - sha256 = "1zqbs170ppmjh3njsg24z5ic965ga0plrbjam88qys1ap0gdph2v"; + rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0"; + sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip"; fetchSubmodules = false; }; }; vim-illuminate = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-10-04"; + version = "2022-11-02"; src = pkgs.fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "0603e75fc4ecde1ee5a1b2fc8106ed6704f34d14"; - sha256 = "01361ss6g7kcap7hjma9ij8xa75zlvy878s4p7r5sxxbdwwpqarg"; + rev = "fb83d835eac50baeef49aac20c524a80727db0ac"; + sha256 = "0xk5hhsb3gv3yrfcr3gnxj9g9bcdab8nlfi06q5c7nqgy4fryp6n"; fetchSubmodules = false; }; }; nvim-lint = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-10-26"; + version = "2022-11-04"; src = pkgs.fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "844bb7828557052da765b9b0fa5ab0574eb7187a"; - sha256 = "13aczdfdxx7r0sambfhh8awa2azskxlyaks6vsy2jhii8698vhw9"; + rev = "9812a18621e00286cb82008b9407e561ed801b03"; + sha256 = "07dlk8s1lfa297ry2ybnipnibn3gr7akmkiryg6s1ysjpaddkdn3"; fetchSubmodules = false; }; }; @@ -292,12 +292,12 @@ rec { }; LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "LuaSnip"; - version = "2022-10-14"; + version = "2022-11-01"; src = pkgs.fetchFromGitHub { owner = "L3MON4D3"; repo = "LuaSnip"; - rev = "663d54482b11bca1ce94f56993b9f6ab485a13dc"; - sha256 = "1lp93qqmhj2bvgsa2dji91spdilpr8lz2kbrm7cvqdz4x418bq7y"; + rev = "619796e2477f7233e5fdff456240676a08482684"; + sha256 = "0s4r8y0wadwj1via61kqx711skcj7cyd56qgy0p1bdkz09ash5mh"; fetchSubmodules = false; }; }; @@ -314,23 +314,23 @@ rec { }; nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-10-22"; + version = "2022-10-29"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "cdb77665bbf23bd2717d424ddf4bf98057c30bb3"; - sha256 = "1yyg4ja7vsf1wwjydq6hx6zdgq1pdbklagzh09nh14p98kw4rdqj"; + rev = "9bb8ee6e2d6ab3c8cc53323b79f05886bc722faa"; + sha256 = "1z7b53yxamph255rvrs5a4pq5hbqa0nbwpdh1xy8fvfc71gap80n"; fetchSubmodules = false; }; }; cmp-nvim-lsp = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-10-15"; + version = "2022-10-29"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "3cf38d9c957e95c397b66f91967758b31be4abe6"; - sha256 = "0l0cqrarrp3rj3pmjivjgh8f1cd3grrkz6pnzpwpwxj9amv6k6p2"; + rev = "78924d1d677b29b3d1fe429864185341724ee5a2"; + sha256 = "1gzn4v70wa61yyw9vfxb8m8kkabz0p35nja1l26cfhl71pnkqrka"; fetchSubmodules = false; }; }; @@ -391,12 +391,12 @@ rec { }; cmp-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-10-02"; + version = "2022-10-29"; src = pkgs.fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "5f695e4173ad74a4c8dbbfd8990286464bf69293"; - sha256 = "1l32k8fdmpg8lfh1qqmahash957izz9zr6gfjvfs5s4if0fl3f2r"; + rev = "b40178b780d547bcf131c684bc5fd41af17d05f2"; + sha256 = "076x4rfcvy81m28dpjaqcxrl3q9mhfz7qbwgkqsyndrasibsmlzr"; fetchSubmodules = false; }; }; @@ -424,12 +424,12 @@ rec { }; neoformat = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-10-23"; + version = "2022-11-05"; src = pkgs.fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b08bd3a914777ff62ae2d7c17df9549c4b1dd778"; - sha256 = "12fm51xi8dnqvizvy59vda7nvkr4mv9g6ipz3w7f0kf5r2avqrd2"; + rev = "bb32035068b66004f79933ff09edeac273d38c1a"; + sha256 = "1c98y3z9ik1vzydkx2cyn7rvm4smp2i8qjxjpksxcxpf9zk7xrc7"; fetchSubmodules = false; }; }; @@ -457,12 +457,12 @@ rec { }; vim-matchup = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-10-27"; + version = "2022-11-08"; src = pkgs.fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "09576fd767cc55ca934a95f9bdcf91aa12c32cd0"; - sha256 = "08909dsf8gll8j3rky6zf9i4jlcp2cfkwmy15xmcm6avcy1ziagg"; + rev = "bc091fd9c3aa1cacf7b3374f5b1592be3beabd13"; + sha256 = "1q8pda363nvvfciaw24cjdfh1miy3cx95b7khlak5rsij8v4n21g"; fetchSubmodules = false; }; }; @@ -490,12 +490,12 @@ rec { }; heirline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2022-10-26"; + version = "2022-11-04"; src = pkgs.fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "13232e66e6e57a1ff41f957c5ad7bc90dcef3d4c"; - sha256 = "1k2jkhwradh0kb5mfclkhijcxahpf2b2cjqna2m94pis817fx7g7"; + rev = "7bd719094a6b712e02b99e40aacd07c8eae871e2"; + sha256 = "0fas2hdcf7ddvcwsh8q7pc9a5cj0xsb0677jzpq9z9ph71b0d66f"; fetchSubmodules = false; }; }; @@ -523,12 +523,12 @@ rec { }; toggleterm-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-10-27"; + version = "2022-11-03"; src = pkgs.fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "8f302c9a05ff53fc3f891cbf09c5f959b10392a3"; - sha256 = "1nvq4zridnz0pr9j9ivcl4b5w8srli8szhjy6ry22vw9c5xllzx3"; + rev = "3ba683827c623affb4d9aa518e97b34db2623093"; + sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41"; fetchSubmodules = false; }; }; @@ -545,23 +545,45 @@ rec { }; gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-28"; + version = "2022-11-08"; src = pkgs.fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "6321c884b1a462918b1a7c7c016bcc2f0944832c"; - sha256 = "0s2frxp25pf7fig25g5p99pq4hbhhhqlm7727h3lcwnjy60jfb59"; + rev = "9d73a30e9cc524ab3d1c7095c74de9fb87684461"; + sha256 = "1nbr1cr8zc05gqjhxjf8pvscbmy41kcqlkkqcrhmw6m94nzckz8j"; + fetchSubmodules = false; + }; + }; + nui-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + pname = "nui.nvim"; + version = "2022-10-27"; + src = pkgs.fetchFromGitHub { + owner = "MunifTanjim"; + repo = "nui.nvim"; + rev = "d12a6977846b2fa978bff89b439e509320854e10"; + sha256 = "1ghj8kjv2skh2hd9m6sghvj6pya8d9jvr5m9l9q1r0sg1i5x1kjy"; fetchSubmodules = false; }; }; nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-10-17"; + version = "2022-11-08"; src = pkgs.fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "5e8d4942976bbc45e3adb8f4beb81964a79cfd02"; - sha256 = "1rxpgx52714sf01kwps9ii0if1q6b32hbc80yzwwpbjs8snmkj58"; + rev = "ba270debc292cf173f5907ab67325947334c6dd8"; + sha256 = "1zwmzvy900xdqzp7p8dicp7gr6x7256j30y9aqq1s06lskkg9w31"; + fetchSubmodules = false; + }; + }; + noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + pname = "noice.nvim"; + version = "2022-11-08"; + src = pkgs.fetchFromGitHub { + owner = "folke"; + repo = "noice.nvim"; + rev = "edc8df60a16bb0f2709110b29fef98c6cc616d42"; + sha256 = "0gydjg5aa0wcjpayls4gvknrrjzc787id31p3v0ch5glqxvkc7hl"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index fa95cc9..f4badf0 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -78,4 +78,6 @@ - src: akinsho/toggleterm.nvim - src: axieax/urlview.nvim - src: lewis6991/gitsigns.nvim +- src: MunifTanjim/nui.nvim - src: rcarriga/nvim-notify +- src: folke/noice.nvim