Merge branch 'nixbook/master' into zenix/master

This commit is contained in:
tristan 2024-07-31 17:25:16 +01:00
commit d92c611857
2 changed files with 32 additions and 1 deletions

View file

@ -22,7 +22,7 @@ in {
xdg.portal = {
enable = true;
configPackages = [pkgs.hyprland];
extraPortals = [pkgs.xdg-desktop-portal-gtk];
extraPortals = [pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland];
};
services.hypridle = {

View file

@ -20,6 +20,7 @@
{
key = "<C-c>";
action = ''"+y'';
options.desc = "copy to clipboard";
}
{
key = "gl";
@ -29,17 +30,30 @@
key = "gh";
action = "g0";
}
{
key = "<leader>q";
action = ":bd<CR>";
options.desc = "close buffer";
}
{
key = "<leader>ggs";
action = ":Gitsigns stage_hunk<CR>";
options.desc = "git stage hunk";
}
{
key = "<leader>ggr";
action = ":LazyGit<CR>";
options.desc = "git restore hunk";
}
{
key = "<leader>ggb";
action = ":Gitsigns blame<CR>";
options.desc = "show git blame";
}
{
key = "<leader>ggg";
action = ":LazyGit<CR>";
options.desc = "open lazy git";
}
];
@ -77,6 +91,12 @@
};
diagnostic = {
"<leader>e" = "open_float";
"<leader>ca" = "code_action";
"<leader>cr" = "rename";
"gd" = "definition";
};
diagnostic = {
"<leader>ch" = "open_float";
};
};
};
@ -96,6 +116,7 @@
enable = true;
enableTelescope = true;
};
lazygit.enable = true;
which-key.enable = true;
toggleterm = {
@ -107,5 +128,15 @@
enable = true;
extensions.dap-ui.enable = true;
};
harpoon = {
enable = true;
keymaps = {
addFile = "<leader>ha";
toggleQuickMenu = "<leader>hf";
navNext = "<leader>n";
};
};
vim-css-color.enable = true;
};
}