From 219f0482386812e1d00a661300b5eb9ef2b0d6a5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 14 Apr 2024 15:04:47 +0300 Subject: [PATCH] configuration.nix: remove redundant `vim` parrent attributes --- configuration.nix | 73 +++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/configuration.nix b/configuration.nix index c3431af..3f8ea96 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,20 +18,18 @@ inputs: let }; mainConfig = isMaximal: { - config = { - vim = { - viAlias = true; - vimAlias = true; - debugMode = { - enable = false; - level = 20; - logFile = "/tmp/nvim.log"; - }; + config.vim = { + viAlias = true; + vimAlias = true; + debugMode = { + enable = false; + level = 20; + logFile = "/tmp/nvim.log"; }; - vim.spellcheck.vim-dirtytalk.enable = true; + spellcheck.vim-dirtytalk.enable = true; - vim.lsp = { + lsp = { formatOnSave = true; lspkind.enable = false; lightbulb.enable = true; @@ -43,14 +41,14 @@ inputs: let nvim-docs-view.enable = isMaximal; }; - vim.debugger = { + debugger = { nvim-dap = { enable = true; ui.enable = true; }; }; - vim.languages = { + languages = { enableLSP = true; enableFormat = true; enableTreesitter = true; @@ -83,7 +81,7 @@ inputs: let }; }; - vim.visuals = { + visuals = { enable = true; nvimWebDevicons.enable = true; scrollBar.enable = true; @@ -107,70 +105,71 @@ inputs: let }; }; - vim.statusline = { + statusline = { lualine = { enable = true; theme = "catppuccin"; }; }; - vim.theme = { + theme = { enable = true; name = "catppuccin"; style = "mocha"; transparent = false; }; - vim.autopairs.enable = true; - vim.autocomplete = { + autopairs.enable = true; + + autocomplete = { enable = true; type = "nvim-cmp"; }; - vim.filetree = { + filetree = { nvimTree = { enable = true; }; }; - vim.tabline = { + tabline = { nvimBufferline.enable = true; }; - vim.treesitter.context.enable = true; + treesitter.context.enable = true; - vim.binds = { + binds = { whichKey.enable = true; cheatsheet.enable = true; }; - vim.telescope.enable = true; + telescope.enable = true; - vim.git = { + git = { enable = true; gitsigns.enable = true; gitsigns.codeActions = false; # throws an annoying debug message }; - vim.minimap = { + minimap = { minimap-vim.enable = false; codewindow.enable = isMaximal; # lighter, faster, and uses lua for configuration }; - vim.dashboard = { + dashboard = { dashboard-nvim.enable = false; alpha.enable = isMaximal; }; - vim.notify = { + notify = { nvim-notify.enable = true; }; - vim.projects = { + projects = { project-nvim.enable = isMaximal; }; - vim.utility = { + utility = { ccc.enable = isMaximal; vim-wakatime.enable = isMaximal; icon-picker.enable = isMaximal; @@ -186,21 +185,21 @@ inputs: let }; }; - vim.notes = { + notes = { obsidian.enable = false; # FIXME: neovim fails to build if obsidian is enabled orgmode.enable = false; mind-nvim.enable = isMaximal; todo-comments.enable = true; }; - vim.terminal = { + terminal = { toggleterm = { enable = true; lazygit.enable = true; }; }; - vim.ui = { + ui = { borders.enable = true; noice.enable = true; colorizer.enable = true; @@ -222,26 +221,26 @@ inputs: let }; }; - vim.assistant = { + assistant = { copilot = { enable = isMaximal; cmp.enable = isMaximal; }; }; - vim.session = { + session = { nvim-session-manager.enable = false; }; - vim.gestures = { + gestures = { gesture-nvim.enable = false; }; - vim.comments = { + comments = { comment-nvim.enable = true; }; - vim.presence = { + presence = { neocord.enable = true; }; };