diff --git a/modules/dashboard/default.nix b/modules/dashboard/default.nix index 122c06a..c63ad3e 100644 --- a/modules/dashboard/default.nix +++ b/modules/dashboard/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./alpha ./dashboard-nvim diff --git a/modules/git/default.nix b/modules/git/default.nix index cf4c2d0..6336b41 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./config.nix ./git.nix diff --git a/modules/git/git.nix b/modules/git/git.nix index ea3e2dd..e9af83b 100644 --- a/modules/git/git.nix +++ b/modules/git/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 gn'] = { expr = true, "&diff ? \'\' : 'Gitsigns next_hunk'"}, - ['n gp'] = { expr = true, "&diff ? \'\' : 'Gitsigns prev_hunk'"}, + ['n gn'] = { expr = true, "&diff ? \'\' : 'Gitsigns next_hunk'"}, + ['n gp'] = { expr = true, "&diff ? \'\' : 'Gitsigns prev_hunk'"}, - ['n gs'] = 'Gitsigns stage_hunk', - ['v gs'] = ':Gitsigns stage_hunk', - ['n gu'] = 'Gitsigns undo_stage_hunk', - ['n gr'] = 'Gitsigns reset_hunk', - ['v gr'] = ':Gitsigns reset_hunk', - ['n gR'] = 'Gitsigns reset_buffer', - ['n gp'] = 'Gitsigns preview_hunk', - ['n gb'] = 'lua require"gitsigns".blame_line{full=true}', - ['n gS'] = 'Gitsigns stage_buffer', - ['n gU'] = 'Gitsigns reset_buffer_index', - ['n gts'] = ':Gitsigns toggle_signs', - ['n gtn'] = ':Gitsigns toggle_numhl', - ['n gtl'] = ':Gitsigns toggle_linehl', - ['n gtw'] = ':Gitsigns toggle_word_diff', + ['n gs'] = 'Gitsigns stage_hunk', + ['v gs'] = ':Gitsigns stage_hunk', + ['n gu'] = 'Gitsigns undo_stage_hunk', + ['n gr'] = 'Gitsigns reset_hunk', + ['v gr'] = ':Gitsigns reset_hunk', + ['n gR'] = 'Gitsigns reset_buffer', + ['n gp'] = 'Gitsigns preview_hunk', + ['n gb'] = 'lua require"gitsigns".blame_line{full=true}', + ['n gS'] = 'Gitsigns stage_buffer', + ['n gU'] = 'Gitsigns reset_buffer_index', + ['n gts'] = ':Gitsigns toggle_signs', + ['n gtn'] = ':Gitsigns toggle_numhl', + ['n gtl'] = ':Gitsigns toggle_linehl', + ['n gtw'] = ':Gitsigns toggle_word_diff', - -- Text objects - ['o ih'] = ':Gitsigns select_hunk', - ['x ih'] = ':Gitsigns select_hunk' - }, - } - ''); - } - ); + -- Text objects + ['o ih'] = ':Gitsigns select_hunk', + ['x ih'] = ':Gitsigns select_hunk' + }, + } + ''); + }; } diff --git a/modules/lsp/default.nix b/modules/lsp/default.nix index 2c6474f..8f093cb 100644 --- a/modules/lsp/default.nix +++ b/modules/lsp/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ # nvim lsp support ./config.nix diff --git a/modules/markdown/default.nix b/modules/markdown/default.nix index e49e416..e975149 100644 --- a/modules/markdown/default.nix +++ b/modules/markdown/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./glow ./config.nix diff --git a/modules/minimap/default.nix b/modules/minimap/default.nix index 454c2f3..6a03b01 100644 --- a/modules/minimap/default.nix +++ b/modules/minimap/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./minimap-vim ./codewindow diff --git a/modules/statusline/default.nix b/modules/statusline/default.nix index bfe34d5..82e3dd2 100644 --- a/modules/statusline/default.nix +++ b/modules/statusline/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./lualine ]; diff --git a/modules/theme/default.nix b/modules/theme/default.nix index f30e814..02f4f37 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./theme.nix ./config.nix diff --git a/modules/tidal/default.nix b/modules/tidal/default.nix index 6af2c59..da6dd5a 100644 --- a/modules/tidal/default.nix +++ b/modules/tidal/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./tidal.nix ./config.nix diff --git a/modules/treesitter/default.nix b/modules/treesitter/default.nix index dc4260c..30d51d5 100644 --- a/modules/treesitter/default.nix +++ b/modules/treesitter/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./treesitter.nix ./context.nix diff --git a/modules/visuals/default.nix b/modules/visuals/default.nix index 20a1f49..9efdde7 100644 --- a/modules/visuals/default.nix +++ b/modules/visuals/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./config.nix ./visuals.nix