Gabe/nix-config
1
0
Fork 0
Code Issues 15 Pull requests Packages Projects Releases Wiki Activity

nixvim fixed which-key.

Browse source
This commit is contained in:
Gabe Venberg 2024-07-31 10:26:59 -05:00
parent 3153a2314d
commit b650a618ad
6 changed files with 59 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
flake.lock
View file

@ -28,22 +28,17 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1721902368, "lastModified": 1722113426,
"narHash": "sha256-noQ5SghRPe0jzQEbFQb3fYbV6LZEzr7lIRQoxlU7fyI=", "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "cf8c7405479cfde7ea4dc815e195391d2328df10", "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722028105, "lastModified": 1722217815,
"narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=", "narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5b01cea8b5753de9c2febd27203c530be14745ff", "rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +198,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722067813, "lastModified": 1722407237,
"narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=", "narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27", "rev": "58cef3796271aaeabaed98884d4abaab5d9d162d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721719500, "lastModified": 1722082646,
"narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +251,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1722017959, "lastModified": 1722332872,
"narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +278,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722012218, "lastModified": 1722253092,
"narHash": "sha256-Rnjo49C5/slnmcQW9c57IdiHJZ3YEFmUn3as/NIPD4E=", "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "ac026940beb42f74c5666f6ed3989aca41eddeea", "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,11 +294,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721924956, "lastModified": 1722185531,
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ad6a14c6bf098e98800b091668718c336effc95", "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,11 +343,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1722016645, "lastModified": 1722431209,
"narHash": "sha256-YQA4oenJwjWVzX+we6Zzv08im5q2n7dVhJ12Nw8wQio=", "narHash": "sha256-qBxvnoQuzhCHTej5JMw1EpjavufRgpMNP9klpO7mbI4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "162ae6354bbf2af5c33b09aa90e9d8d11f14462e", "rev": "8945b3b5e336a42972448e2f07ed5bc465a40c83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721548975, "lastModified": 1722144272,
"narHash": "sha256-agCbztdk1f7nCUz03R6xdbivuBRuqubP2RHW+MNuRTg=", "narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "551b031e2bc0bcc9584347a8da6312e57169661d", "rev": "16565307c267ec219c2b5d3494ba66df08e7d403",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -406,11 +401,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1721688883, "lastModified": 1722114803,
"narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
modules/home-manager/nvim/gitsigns.nix
View file

@ -9,9 +9,12 @@
plugins.gitsigns = { plugins.gitsigns = {
enable = true; enable = true;
}; };
plugins.which-key.registrations = { plugins.which-key.settings.spec = [
"<leader>g" = "+git"; {
}; __unkeyed-1 = "<leader>g";
group = "+git";
}
];
keymaps = [ keymaps = [
{ {
action = ":Gitsigns toggle_current_line_blame<CR>"; action = ":Gitsigns toggle_current_line_blame<CR>";

9
modules/home-manager/nvim/keybinds.nix
View file

@ -9,9 +9,12 @@
globals = { globals = {
mapleader = ";"; mapleader = ";";
}; };
plugins.which-key.registrations = { plugins.which-key.settings.spec = [
"<leader>c" = "+check"; {
}; __unkeyed-1 = "<leader>c";
group = "+check";
}
];
keymaps = [ keymaps = [
{ {
action = ":setlocal spell!<CR>"; action = ":setlocal spell!<CR>";

9
modules/home-manager/nvim/lsp/default.nix
View file

@ -34,9 +34,12 @@
plugins.cmp.settings.sources = [ plugins.cmp.settings.sources = [
{name = "nvim_lsp";} {name = "nvim_lsp";}
]; ];
plugins.which-key.registrations = { plugins.which-key.settings.spec = [
"<leader>l" = "+lsp"; {
}; __unkeyed-1 = "<leader>l";
group = "+lsp";
}
];
keymaps = [ keymaps = [
{ {
action = helpers.mkRaw "vim.lsp.buf.declaration"; action = helpers.mkRaw "vim.lsp.buf.declaration";

14
modules/home-manager/nvim/telescope.nix
View file

@ -9,10 +9,16 @@
plugins.telescope = { plugins.telescope = {
enable = true; enable = true;
}; };
plugins.which-key.registrations = { plugins.which-key.settings.spec = [
"<leader>f" = "+telescope"; {
"<leader>fg" = "+telescope git"; __unkeyed-1 = "<leader>f";
}; group = "+telescope";
}
{
__unkeyed-1 = "<leader>fg";
group = "+telescope git";
}
];
keymaps = [ keymaps = [
{ {
action = ":Telescope find_files<CR>"; action = ":Telescope find_files<CR>";

13
modules/home-manager/nvim/which-key.nix
View file

@ -10,18 +10,7 @@
timeout = true; timeout = true;
timeoutlen = 300; timeoutlen = 300;
}; };
plugins.which-key = { plugins.which-key.enable = true;
enable = true;
# TODO: remvoe this once https://github.com/nix-community/nixvim/issues/1901 is fixed.
package = pkgs.vimPlugins.which-key-nvim.overrideAttrs (oldAttrs: {
src = pkgs.fetchFromGitHub {
owner = oldAttrs.src.owner;
repo = oldAttrs.src.repo;
rev = "0539da005b98b02cf730c1d9da82b8e8edb1c2d2"; # v2.1.0
hash = "sha256-gc/WJJ1s4s+hh8Mx8MTDg8pGGNOXxgKqBMwudJtpO4Y=";
};
});
};
}; };
}; };
} }