From 968222a84f197ab6925141d60cc1ab8aeb56ec7d Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 20 Dec 2022 20:26:57 +0100 Subject: [PATCH] Update deps --- flake.lock | 18 ++++++++-------- home/config/nvim/init.fnl | 3 +-- home/config/nvim/nifoc/keymap.fnl | 2 +- home/config/nvim/plugins/telescope.fnl | 1 + home/programs/nvim/default.nix | 7 +------ home/programs/nvim/plugins.nix | 29 ++++++++++++++++++-------- home/programs/nvim/plugins.yaml | 1 + 7 files changed, 34 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 0ce5fd0..31797dd 100644 --- a/flake.lock +++ b/flake.lock @@ -141,11 +141,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1671405047, - "narHash": "sha256-lvuERXG09/zB1+yiQdEWrkLUtesRI50U9chEFSm7BsQ=", + "lastModified": 1671505418, + "narHash": "sha256-kWK3A7OkZqjI51Ntad25JwAEdx81a2yCmFVqUd2vOMc=", "owner": "neovim", "repo": "neovim", - "rev": "a7332ba9b429f9676723eb88cffb2068f5a95c9b", + "rev": "de90a8bfe5ff4b440597e6d3301bdc3bde01990a", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1671437680, - "narHash": "sha256-gjON/cQFXBivOj9aQjRJifA5RyjIub69GluyYi6MHEk=", + "lastModified": 1671524068, + "narHash": "sha256-cn8sDsbMVEqHyc5vuC1bxxaN+ogmG7mu+9uQAiF/kn0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "2e2af29e763c6b28f62e7990769f5f12d3f9be01", + "rev": "c7d0de1fc663052e51ce0ff11983e7b6222bf225", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "lastModified": 1671458120, + "narHash": "sha256-2+k/OONN4OF21TeoNjKB5sXVZv6Zvm/uEyQIW9OYCg8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "e37ef84b478fa8da0ced96522adfd956fde9047a", "type": "github" }, "original": { diff --git a/home/config/nvim/init.fnl b/home/config/nvim/init.fnl index de8ce17..fe4cf2a 100644 --- a/home/config/nvim/init.fnl +++ b/home/config/nvim/init.fnl @@ -45,8 +45,7 @@ (set o.relativenumber true) (set o.conceallevel 2) (set o.concealcursor :nc) - (set o.updatetime 2000) - (set g.cursorhold_updatetime 250) ; https://github.com/antoinemadec/FixCursorHold.nvim + (set o.updatetime 1000) (o.shortmess:append :cS) (set o.termguicolors true) (set o.mouse :a) diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl index b56856e..5c62840 100644 --- a/home/config/nvim/nifoc/keymap.fnl +++ b/home/config/nvim/nifoc/keymap.fnl @@ -23,7 +23,7 @@ {:desc "Live Grep"}) (keymap.set :n :fn :enew {:desc "New File"}) (keymap.set :n :u :UrlView {:desc "Open UrlView"}) - (keymap.set :n :ut :UndotreeToggle + (keymap.set :n :ut "Telescope undo" {:desc "Toggle Undotree"}) (keymap.set :n :c repl.toggle-shell {:desc "Toggle Shell"}) (keymap.set :n :cs #(telescope-toggleterm.open telescope-dropdown) diff --git a/home/config/nvim/plugins/telescope.fnl b/home/config/nvim/plugins/telescope.fnl index 98af05a..38a75c8 100644 --- a/home/config/nvim/plugins/telescope.fnl +++ b/home/config/nvim/plugins/telescope.fnl @@ -33,6 +33,7 @@ (telescope.load_extension :ui-select) (telescope.load_extension :toggleterm) (telescope.load_extension :yank_history) + (telescope.load_extension :undo) (let [augroup (vim.api.nvim_create_augroup :NifocTelescope {:clear true}) aucmd vim.api.nvim_create_autocmd] (aucmd :FileType {:pattern :TelescopePrompt diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 359f940..f62a746 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -170,6 +170,7 @@ in telescope-ui-select-nvim telescope-toggleterm-nvim + telescope-undo-nvim # LSP { @@ -329,12 +330,6 @@ in config = builtins.readFile ../../config/nvim/plugins/noice.fnl; type = "fennel"; } - ]) ++ (with pkgs.vimPlugins; [ - # Fixes - FixCursorHold-nvim - - # UI - undotree ]); }; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 9917c73..b5f663d 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -112,12 +112,12 @@ rec { }; }; nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { - version = "2022-12-19"; + version = "2022-12-20"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6e37050e50e80e4324202a6b8fbac6c7fb90c546"; - sha256 = "129j7vvv9lr1lcrg95a2p194qlmjh83f536qqcqk9s6s6687ad9c"; + rev = "eedb7b9c69b13afe86461b0742266bb62b811ece"; + sha256 = "1ykrcwawlj6ryx9p3jyb496xnrfxi5a7z5iszz55aw7pcni93sqr"; fetchSubmodules = false; }; }); @@ -212,14 +212,25 @@ rec { fetchSubmodules = false; }; }; + telescope-undo-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + pname = "telescope-undo.nvim"; + version = "2022-12-20"; + src = pkgs.fetchFromGitHub { + owner = "debugloop"; + repo = "telescope-undo.nvim"; + rev = "3be830694f2d8c9705f6cf40a5ffee8a0c2aa6e5"; + sha256 = "01b2ff1z38ghv3rmhl0h1jbx39fvsr6jb6lph5anvkapsm3ig1lg"; + fetchSubmodules = false; + }; + }; nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-19"; + version = "2022-12-20"; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "22c87d6f48c4fb1daf33476450d0b14a64230809"; - sha256 = "1ig3fmj798axcv1694nna6bb97ij0rz0fm7jrfmqjs0p7sll10f9"; + rev = "d597b0f3605f43526f1b6948c6d7ca2919ea32ac"; + sha256 = "11115qsgs0iakdfx5c24b906bskx1h2gaz830psgnd4mf3zdqra5"; fetchSubmodules = false; }; }; @@ -324,12 +335,12 @@ rec { }; nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-12-15"; + version = "2022-12-20"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8bbaeda725d5db6e4e1be2867a64b43bf547cf06"; - sha256 = "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5"; + rev = "8868cf9a09e5f3c2612a22ccb82dcc6d9f0d0d35"; + sha256 = "06vx7ynv7dxllli90fy13m27g3pqp5sp6sj19agf9ksal5gv6glr"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index 3a26117..2e87b30 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -30,6 +30,7 @@ - src: folke/todo-comments.nvim - src: nvim-telescope/telescope-ui-select.nvim - src: "https://git.sr.ht/~havi/telescope-toggleterm.nvim" +- src: debugloop/telescope-undo.nvim # LSP - src: neovim/nvim-lspconfig