From b2feebebaeff27677dc5338330ee65b4fecd8935 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Sat, 1 Nov 2025 13:09:07 +0100 Subject: [PATCH] up --- flake.lock | 38 +++++++++++----------- modules/home/neovim/default.nix | 2 -- modules/home/neovim/mappings.nix | 24 ++++++++++++++ modules/home/neovim/plugins/supermaven.nix | 13 -------- modules/home/neovim/plugins/toggleterm.nix | 20 ------------ 5 files changed, 43 insertions(+), 54 deletions(-) delete mode 100644 modules/home/neovim/plugins/supermaven.nix delete mode 100644 modules/home/neovim/plugins/toggleterm.nix diff --git a/flake.lock b/flake.lock index 185ec17..8175794 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1758543057, - "narHash": "sha256-lw3V2jOGYphUFHYQ5oARcb6urlbNpUCLJy1qhsGdUmc=", + "lastModified": 1761551821, + "narHash": "sha256-N3Zj73TAxclhLGgADbPVwcVrhYIBKUgAxjfQuOXre6s=", "owner": "Homebrew", "repo": "brew", - "rev": "5b236456eb93133c2bd0d60ef35ed63f1c0712f6", + "rev": "8f6719274133c5bcc24c058c5a6bcbb3b0cd48b3", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.6.12", + "ref": "4.6.19", "repo": "brew", "type": "github" } @@ -151,11 +151,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1761904043, - "narHash": "sha256-or9H6mRE2bjYI3TBpvNBeumvzEwXC0ZIoD398yJeRw0=", + "lastModified": 1761995424, + "narHash": "sha256-GdPQz0w7Yb9tUT6BXju+5WRSxMDkfYLa0/9suCA6zf8=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "1e188631f1b8563752f6f0c65f85f29eb5f9e8c6", + "rev": "552f85b2064669726ac864dd029b65d4e43fdd55", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1761901391, - "narHash": "sha256-q2v0Joa12ZB3wJ4FFwcRPNi6p5nTQwXwpyOt9uPEKq8=", + "lastModified": 1761993727, + "narHash": "sha256-AiVRdD4c1DfaREr5bD6QWNzxAsOTGc9BcLGYhfeDKHg=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "c9a0cb8e272bd24d2da9fb59c99e573e4cb63b2a", + "rev": "6693e30e79771beb077d722430144c06bcc55b6c", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1758598228, - "narHash": "sha256-qr60maXGbZ4FX5tejPRI3nr0bnRTnZ3AbbbfO6/6jq4=", + "lastModified": 1761927470, + "narHash": "sha256-KsFDGRGD8j1R6TvJ4HkebKsh3HXLY0XazanLrhO3wqE=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "f36e5db56e117f7df701ab152d0d2036ea85218c", + "rev": "3cae36b3a17b09a66435291619dce8cf2c4728ca", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761904617, - "narHash": "sha256-p3uL3UCbH6vZPNzsfsvRwag6IOqhrDy5Muadqzr2bRY=", + "lastModified": 1761995367, + "narHash": "sha256-DwQ0lrxLVPHvqLIBxLD9dbGvCjQ7R5/30y3tjFQ4if4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48a5887cb3a5e12b4e393f885ed3595a8ce61b4c", + "rev": "72df5def7bb668852b5ae8c3874be47243e551f7", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1761829429, - "narHash": "sha256-VuFa5OzKyYl4XvQwaWS9ZfhVrtpCYPE3Dgy83kDPf30=", + "lastModified": 1761947009, + "narHash": "sha256-yutWdFO7EkJGdQOquwHvyWZ+3KpPowzy+v1xb8IA/K4=", "owner": "nix-community", "repo": "nixvim", - "rev": "0420aa712f01b08b4d9f36b1a46b2f26c720aa80", + "rev": "fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225", "type": "github" }, "original": { diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix index e199c5a..a73a047 100644 --- a/modules/home/neovim/default.nix +++ b/modules/home/neovim/default.nix @@ -12,8 +12,6 @@ ./plugins/mini.nix ./plugins/neogit.nix ./plugins/oil.nix - ./plugins/supermaven.nix - ./plugins/toggleterm.nix ./plugins/treesitter.nix ]; diff --git a/modules/home/neovim/mappings.nix b/modules/home/neovim/mappings.nix index 9b6591d..1d59e8a 100644 --- a/modules/home/neovim/mappings.nix +++ b/modules/home/neovim/mappings.nix @@ -75,6 +75,18 @@ action = ":Pick grep_live"; options.desc = "Grep"; } + { + mode = "n"; + key = "fm"; + action = ":Pick git_hunks"; + options.desc = "Modified hunks (all)"; + } + { + mode = "n"; + key = "fM"; + action = ":Pick git_hunks path='%'"; + options.desc = "Modified hunks (buffer)"; + } { mode = "n"; key = "fr"; @@ -93,6 +105,18 @@ action = ":Pick lsp scope='document_symbol'"; options.desc = "Symbols (LSP, buffer)"; } + { + mode = "n"; + key = "fv"; + action = ":Pick visit_paths cwd=\"\""; + options.desc = "Visit paths (all)"; + } + { + mode = "n"; + key = "fV"; + action = ":Pick visit_paths"; + options.desc = "Visit paths (cwd)"; + } # g - git { mode = "n"; diff --git a/modules/home/neovim/plugins/supermaven.nix b/modules/home/neovim/plugins/supermaven.nix deleted file mode 100644 index 33ba586..0000000 --- a/modules/home/neovim/plugins/supermaven.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - programs.nixvim.plugins = { - supermaven = { - enable = true; - settings = { - keymaps = { - accept_suggestion = ""; - clear_suggestions = ""; - }; - }; - }; - }; -} diff --git a/modules/home/neovim/plugins/toggleterm.nix b/modules/home/neovim/plugins/toggleterm.nix deleted file mode 100644 index 7ccd20a..0000000 --- a/modules/home/neovim/plugins/toggleterm.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - programs.nixvim.plugins.toggleterm = { - enable = true; - settings = { - open_mapping = null; - direction = "float"; - float_opts = { - border = "curved"; - winblend = 3; - }; - size = 20; - hide_numbers = true; - shade_terminals = true; - shading_factor = 2; - start_in_insert = true; - close_on_exit = true; - shell = "fish"; - }; - }; -}