mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-22 21:30:51 +00:00
style: formatting
This commit is contained in:
parent
3e4d409041
commit
2899981c1e
11 changed files with 43 additions and 65 deletions
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./alpha
|
||||
./dashboard-nvim
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./config.nix
|
||||
./git.nix
|
||||
|
|
|
@ -21,43 +21,41 @@ in {
|
|||
|
||||
config =
|
||||
mkIf cfg.enable
|
||||
(
|
||||
{
|
||||
vim.startPlugins =
|
||||
if (cfg.gitsigns.enable)
|
||||
then ["gitsigns-nvim"]
|
||||
else [];
|
||||
{
|
||||
vim.startPlugins =
|
||||
if (cfg.gitsigns.enable)
|
||||
then ["gitsigns-nvim"]
|
||||
else [];
|
||||
|
||||
vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere ''
|
||||
-- GitSigns setup
|
||||
require('gitsigns').setup {
|
||||
keymaps = {
|
||||
noremap = true,
|
||||
vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere ''
|
||||
-- GitSigns setup
|
||||
require('gitsigns').setup {
|
||||
keymaps = {
|
||||
noremap = true,
|
||||
|
||||
['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
|
||||
['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
|
||||
['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
|
||||
['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
|
||||
|
||||
['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
|
||||
['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
|
||||
['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
|
||||
['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
|
||||
['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
|
||||
['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
|
||||
['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
|
||||
['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
|
||||
['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
|
||||
['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
|
||||
['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
|
||||
['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
|
||||
['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
|
||||
['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
|
||||
['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
|
||||
['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
|
||||
['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
|
||||
['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
|
||||
['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
|
||||
['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
|
||||
['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
|
||||
['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
|
||||
['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
|
||||
['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
|
||||
['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
|
||||
['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
|
||||
['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
|
||||
['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
|
||||
|
||||
-- Text objects
|
||||
['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
|
||||
['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
|
||||
},
|
||||
}
|
||||
'');
|
||||
}
|
||||
);
|
||||
-- Text objects
|
||||
['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
|
||||
['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
|
||||
},
|
||||
}
|
||||
'');
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
# nvim lsp support
|
||||
./config.nix
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./glow
|
||||
./config.nix
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./minimap-vim
|
||||
./codewindow
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./lualine
|
||||
];
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./theme.nix
|
||||
./config.nix
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./tidal.nix
|
||||
./config.nix
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./treesitter.nix
|
||||
./context.nix
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
...
|
||||
}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./config.nix
|
||||
./visuals.nix
|
||||
|
|
Loading…
Reference in a new issue