diff --git a/flake.lock b/flake.lock index 1bd7fa7..4b9d2b9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,18 @@ "nodes": { "devshell": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -43,11 +44,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -61,11 +62,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -91,11 +92,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -134,11 +135,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -155,11 +156,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1719845423, + "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "ec12b88104d6c117871fad55e931addac4626756", "type": "github" }, "original": { @@ -192,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -217,15 +218,14 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725478117, - "narHash": "sha256-Ly0DgmYniwBtQ+3aW4JO9ETJq9nbPemlISxC6MEDyB8=", + "lastModified": 1720864742, + "narHash": "sha256-NVkF91eZPav7zbcMR+7mUzOdMKgIEBJSwtFU2rv1OpY=", "owner": "nix-community", "repo": "nixvim", - "rev": "2ef974182ef62a6a6992118f0beb54dce812ae9b", + "rev": "195978e6272702ea5d6e9b837d083c411dc5d688", "type": "github" }, "original": { @@ -266,28 +266,6 @@ "type": "gitlab" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", - "owner": "NuschtOS", - "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "nix-formatter-pack": "nix-formatter-pack", @@ -318,11 +296,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", "type": "github" }, "original": { diff --git a/plugins/oil.nix b/plugins/oil.nix index 683ae3a..fdb0f46 100644 --- a/plugins/oil.nix +++ b/plugins/oil.nix @@ -4,13 +4,13 @@ _: { keymaps = [ { key = "O"; - action = "Oil"; + action = "function() require('oil').toggle_float() end"; options.desc = "Toggle oil floating window"; mode = "n"; } { key = "to"; - action.__raw = "function() require('oil').toggle_float() end"; + action = "function() require('oil').toggle_float() end"; options.desc = "Toggle oil floating window"; mode = "n"; } diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix index c966506..946f361 100644 --- a/plugins/treesitter.nix +++ b/plugins/treesitter.nix @@ -22,8 +22,6 @@ enable = true; keymaps = lib.mkForce { }; }; - - settings.highlight.enable = true; }; rootOpts = { diff --git a/plugins/which-key.nix b/plugins/which-key.nix index 8215e8e..6126a05 100644 --- a/plugins/which-key.nix +++ b/plugins/which-key.nix @@ -5,48 +5,31 @@ { opts = { enable = true; - + icons.group = ""; + window.border = "single"; # Disable which-key when in neo-tree or telescope + disable.filetypes = [ + "TelescopePrompt" + "neo-tree" + "neo-tree-popup" + ]; - settings = { - icons.group = ""; - window.border = "single"; - - # Customize section names (prefixed mappings) - spec = [ - { __unkeyed = "b"; group = "Buffers"; icon = icons.Tab; } - { __unkeyed = "bs"; group = "Sort Buffers"; icon = icons.Sort;} - { __unkeyed = "d"; group = "Debugger"; icon = icons.Debugger;} - { __unkeyed = "f"; group = "Find"; icon = icons.Search;} - { __unkeyed = "g"; group = "Git"; icon = icons.Git;} - { __unkeyed = "l"; group = "Language Tools"; icon = icons.ActiveLSP;} - { __unkeyed = "m"; group = " Markdown"; } - { __unkeyed = "s"; group = "Session"; icon = icons.Session;} - { __unkeyed = "t"; group = "Terminal"; icon = icons.Terminal;} - { __unkeyed = "u"; group = "UI/UX"; icon = icons.Window;} - ]; - - disable.ft = [ - "TelescopePrompt" - "neo-tree" - "neo-tree-popup" - ]; + # Customize section names (prefixed mappings) + registrations = { + "b".name = "${icons.Tab} Buffers"; + "bs".name = "${icons.Sort} Sort Buffers"; + "d".name = "${icons.Debugger} Debugger"; + "f".name = "${icons.Search} Find"; + "g".name = "${icons.Git} Git"; + "l".name = "${icons.ActiveLSP} Language Tools"; + "m".name = " Markdown"; + "s".name = "${icons.Session} Session"; + "t".name = "${icons.Terminal} Terminal"; + "u".name = "${icons.Window} UI/UX"; + ";".name = "Arrow buffers"; # This should move to arrow.nix when moving to which-key.add() + "m".name = "Arrow marks"; # This should move to arrow.nix when moving to which-key.add( }; - - - # registrations = { - # "b".name = "${icons.Tab} Buffers"; - # "bs".name = "${icons.Sort} Sort Buffers"; - # "d".name = "${icons.Debugger} Debugger"; - # "f".name = "${icons.Search} Find"; - # "g".name = "${icons.Git} Git"; - # "l".name = "${icons.ActiveLSP} Language Tools"; - # "m".name = " Markdown"; - # "s".name = "${icons.Session} Session"; - # "t".name = "${icons.Terminal} Terminal"; - # "u".name = "${icons.Window} UI/UX"; - # }; }; # Enable catppuccin colors