diff --git a/config/core.nix b/config/core.nix index 189f31f..f5ac55d 100644 --- a/config/core.nix +++ b/config/core.nix @@ -3,36 +3,7 @@ # Color scheme. colorschemes.catppuccin = { enable = true; - settings = { - flavour = "mocha"; - no_bold = false; - no_italic = false; - no_underline = false; - integrations = { - cmp = true; - neotree = true; - harpoon = true; - gitsigns = true; - which_key = true; - illuminate.enabled = true; - treesitter = true; - treesitter_context = true; - telescope.enabled = true; - indent_blankline.enabled = true; - native_lsp = { - enabled = true; - inlay_hints = { - background = true; - }; - underlines = { - errors = ["underline"]; - hints = ["underline"]; - information = ["underline"]; - warnings = ["underline"]; - }; - }; - }; - }; + settings.flavour = "mocha"; }; # Options. diff --git a/config/default.nix b/config/default.nix index 0cb0312..bfb2f67 100644 --- a/config/default.nix +++ b/config/default.nix @@ -6,20 +6,16 @@ ./core.nix ./direnv.nix ./gitsigns.nix - ./harpoon.nix - ./illuminate.nix ./indent-blankline.nix ./keybindings.nix ./lazygit.nix ./lsp - ./lualine.nix - ./neo-tree.nix - ./nvim-cmp.nix ./project.nix ./rainbow-delimiters.nix ./telescope.nix ./toggleterm.nix ./treesitter.nix + ./neo-tree.nix ./which-key.nix ]; } diff --git a/config/harpoon.nix b/config/harpoon.nix deleted file mode 100644 index 5b42eb6..0000000 --- a/config/harpoon.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - plugins.harpoon = { - enable = true; - }; -} diff --git a/config/illuminate.nix b/config/illuminate.nix deleted file mode 100644 index 9c09276..0000000 --- a/config/illuminate.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: - -{ - plugins.illuminate = { - enable = true; - underCursor = false; - filetypesDenylist = [ - "Outline" - "TelescopePrompt" - "alpha" - "harpoon" - "reason" - ]; - }; -} diff --git a/config/keybindings.nix b/config/keybindings.nix index 35d5bc3..ce9a42c 100644 --- a/config/keybindings.nix +++ b/config/keybindings.nix @@ -57,7 +57,7 @@ options = { remap = true; }; - } + } # Use ESC to exit terminal mode { diff --git a/config/lsp/default.nix b/config/lsp/default.nix index f401b06..ec811e3 100644 --- a/config/lsp/default.nix +++ b/config/lsp/default.nix @@ -2,6 +2,5 @@ imports = [ ./lsp.nix ./lsp-format.nix - ./lspkind.nix ]; } diff --git a/config/lsp/lsp.nix b/config/lsp/lsp.nix index 4af99ad..e846af6 100644 --- a/config/lsp/lsp.nix +++ b/config/lsp/lsp.nix @@ -20,7 +20,6 @@ enable = true; }; }; - inlayHints = true; keymaps = { silent = true; lspBuf = { diff --git a/config/lsp/lspkind.nix b/config/lsp/lspkind.nix deleted file mode 100644 index 69e8f78..0000000 --- a/config/lsp/lspkind.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - plugins.lspkind = { - enable = true; - symbolMap = { - Copilot = ""; - }; - extraOptions = { - maxwidth = 50; - ellipsis_char = "..."; - }; - }; -} diff --git a/config/lualine.nix b/config/lualine.nix deleted file mode 100644 index 015eb2a..0000000 --- a/config/lualine.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - plugins.lualine = { - enable = true; - }; -} diff --git a/config/nvim-cmp.nix b/config/nvim-cmp.nix deleted file mode 100644 index 3f6fc5a..0000000 --- a/config/nvim-cmp.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - plugins = { - cmp = { - enable = true; - autoEnableSources = false; - settings = { - sources = [ - { name = "nvim_lsp"; } - { - name = "buffer"; # text within current buffer - option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; - keywordLength = 3; - } - { - name = "path"; # file system paths - keywordLength = 3; - } - { - name = "luasnip"; # snippets - keywordLength = 3; - } - ]; - mapping = { - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; - "" = "cmp.mapping.select_next_item()"; - "" = "cmp.mapping.select_prev_item()"; - "" = "cmp.mapping.abort()"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })"; - };}; - }; - cmp-nvim-lsp.enable = true; - cmp-path.enable = true; - cmp-buffer.enable = true; - }; -}