From ecb5ae8f16a783252872159391cf7dc06089c6dd Mon Sep 17 00:00:00 2001 From: Ivan Dimitrov Date: Thu, 13 Jul 2023 20:36:13 +0300 Subject: [PATCH] neovim config --- cfg/nvim/custom/README.md | 3 -- cfg/nvim/custom/chadrc.lua | 20 -------- cfg/nvim/custom/configs/lspconfig.lua | 17 ------- cfg/nvim/custom/configs/null-ls.lua | 27 ----------- cfg/nvim/custom/configs/overrides.lua | 68 --------------------------- cfg/nvim/custom/highlights.lua | 19 -------- cfg/nvim/custom/init.lua | 7 --- cfg/nvim/custom/mappings.lua | 12 ----- cfg/nvim/custom/plugins.lua | 65 ------------------------- cfg/nvim/init.lua | 12 +++++ configuration.nix | 1 - home.nix | 13 ++--- 12 files changed, 17 insertions(+), 247 deletions(-) delete mode 100644 cfg/nvim/custom/README.md delete mode 100644 cfg/nvim/custom/chadrc.lua delete mode 100644 cfg/nvim/custom/configs/lspconfig.lua delete mode 100644 cfg/nvim/custom/configs/null-ls.lua delete mode 100644 cfg/nvim/custom/configs/overrides.lua delete mode 100644 cfg/nvim/custom/highlights.lua delete mode 100644 cfg/nvim/custom/init.lua delete mode 100644 cfg/nvim/custom/mappings.lua delete mode 100644 cfg/nvim/custom/plugins.lua create mode 100644 cfg/nvim/init.lua diff --git a/cfg/nvim/custom/README.md b/cfg/nvim/custom/README.md deleted file mode 100644 index a6ef0d1..0000000 --- a/cfg/nvim/custom/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Example_config - -This can be used as an example custom config for NvChad, this branch is a minimal one. Do check the feature_full branch if you need all the ease in your config. diff --git a/cfg/nvim/custom/chadrc.lua b/cfg/nvim/custom/chadrc.lua deleted file mode 100644 index 154c455..0000000 --- a/cfg/nvim/custom/chadrc.lua +++ /dev/null @@ -1,20 +0,0 @@ ----@type ChadrcConfig -local M = {} - --- Path to overriding theme and highlights files -local highlights = require "custom.highlights" - -M.ui = { - theme = "onedark", - theme_toggle = { "onedark", "one_light" }, - - hl_override = highlights.override, - hl_add = highlights.add, -} - -M.plugins = "custom.plugins" - --- check core.mappings for table structure -M.mappings = require "custom.mappings" - -return M diff --git a/cfg/nvim/custom/configs/lspconfig.lua b/cfg/nvim/custom/configs/lspconfig.lua deleted file mode 100644 index 3da6adc..0000000 --- a/cfg/nvim/custom/configs/lspconfig.lua +++ /dev/null @@ -1,17 +0,0 @@ -local on_attach = require("plugins.configs.lspconfig").on_attach -local capabilities = require("plugins.configs.lspconfig").capabilities - -local lspconfig = require "lspconfig" - --- if you just want default config for the servers then put them in a table -local servers = { "html", "cssls", "tsserver", "clangd", "rnix" } - -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - } -end - --- --- lspconfig.pyright.setup { blabla} diff --git a/cfg/nvim/custom/configs/null-ls.lua b/cfg/nvim/custom/configs/null-ls.lua deleted file mode 100644 index 8f15ecc..0000000 --- a/cfg/nvim/custom/configs/null-ls.lua +++ /dev/null @@ -1,27 +0,0 @@ -local present, null_ls = pcall(require, "null-ls") - -if not present then - return -end - -local b = null_ls.builtins - -local sources = { - - -- webdev stuff - b.formatting.deno_fmt, -- choosed deno for ts/js files cuz its very fast! - b.formatting.prettier.with { filetypes = { "html", "markdown", "css" } }, -- so prettier works only on these filetypes - - -- Lua - b.formatting.stylua, - - -- cpp - b.formatting.clang_format, - - b.formatting.alejandra -} - -null_ls.setup { - debug = true, - sources = sources, -} diff --git a/cfg/nvim/custom/configs/overrides.lua b/cfg/nvim/custom/configs/overrides.lua deleted file mode 100644 index 5101409..0000000 --- a/cfg/nvim/custom/configs/overrides.lua +++ /dev/null @@ -1,68 +0,0 @@ -local M = {} - -M.treesitter = { - ensure_installed = { - "vim", - "lua", - "html", - "css", - "javascript", - "typescript", - "tsx", - "c", - "markdown", - "markdown_inline", - "nix", - }, - indent = { - enable = true, - -- disable = { - -- "python" - -- }, - }, -} - -M.mason = { - ensure_installed = { - -- lua stuff - "lua-language-server", - "stylua", - - -- web dev stuff - "css-lsp", - "html-lsp", - "typescript-language-server", - "deno", - "prettier", - - -- c/cpp stuff - "clangd", - "clang-format", - - -- NixOS stuff - "rnix-lsp" - }, -} - -M.ui = { - transparency = true, - theme = "catppuccin" -} - --- git support in nvimtree -M.nvimtree = { - git = { - enable = true, - }, - - renderer = { - highlight_git = true, - icons = { - show = { - git = true, - }, - }, - }, -} - -return M diff --git a/cfg/nvim/custom/highlights.lua b/cfg/nvim/custom/highlights.lua deleted file mode 100644 index ebf2dfb..0000000 --- a/cfg/nvim/custom/highlights.lua +++ /dev/null @@ -1,19 +0,0 @@ --- To find any highlight groups: " Telescope highlights" --- Each highlight group can take a table with variables fg, bg, bold, italic, etc --- base30 variable names can also be used as colors - -local M = {} - ----@type Base46HLGroupsList -M.override = { - Comment = { - italic = true, - }, -} - ----@type HLTable -M.add = { - NvimTreeOpenedFolderName = { fg = "green", bold = true }, -} - -return M diff --git a/cfg/nvim/custom/init.lua b/cfg/nvim/custom/init.lua deleted file mode 100644 index 608a8d9..0000000 --- a/cfg/nvim/custom/init.lua +++ /dev/null @@ -1,7 +0,0 @@ --- local autocmd = vim.api.nvim_create_autocmd - --- Auto resize panes when resizing nvim window --- autocmd("VimResized", { --- pattern = "*", --- command = "tabdo wincmd =", --- }) diff --git a/cfg/nvim/custom/mappings.lua b/cfg/nvim/custom/mappings.lua deleted file mode 100644 index 9ce068a..0000000 --- a/cfg/nvim/custom/mappings.lua +++ /dev/null @@ -1,12 +0,0 @@ ----@type MappingsTable -local M = {} - -M.general = { - n = { - [";"] = { ":", "enter command mode", opts = { nowait = true } }, - }, -} - --- more keybinds! - -return M diff --git a/cfg/nvim/custom/plugins.lua b/cfg/nvim/custom/plugins.lua deleted file mode 100644 index 2ed8db8..0000000 --- a/cfg/nvim/custom/plugins.lua +++ /dev/null @@ -1,65 +0,0 @@ -local overrides = require("custom.configs.overrides") - ----@type NvPluginSpec[] -local plugins = { - - -- Override plugin definition options - - { - "neovim/nvim-lspconfig", - dependencies = { - -- format & linting - { - "jose-elias-alvarez/null-ls.nvim", - config = function() - require "custom.configs.null-ls" - end, - }, - }, - config = function() - require "plugins.configs.lspconfig" - require "custom.configs.lspconfig" - end, -- Override to setup mason-lspconfig - }, - - -- override plugin configs - { - "williamboman/mason.nvim", - opts = overrides.mason - }, - - { - "nvim-treesitter/nvim-treesitter", - opts = overrides.treesitter, - }, - - { - "nvim-tree/nvim-tree.lua", - opts = overrides.nvimtree, - }, - - -- Install a plugin - { - "max397574/better-escape.nvim", - event = "InsertEnter", - config = function() - require("better_escape").setup() - end, - }, - - -- To make a plugin not be loaded - -- { - -- "NvChad/nvim-colorizer.lua", - -- enabled = false - -- }, - - -- All NvChad plugins are lazy-loaded by default - -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` - -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example - -- { - -- "mg979/vim-visual-multi", - -- lazy = false, - -- } -} - -return plugins diff --git a/cfg/nvim/init.lua b/cfg/nvim/init.lua new file mode 100644 index 0000000..c184427 --- /dev/null +++ b/cfg/nvim/init.lua @@ -0,0 +1,12 @@ +vim.wo.number = true + +local nmap = function(keys, cmd) vim.keymap.set('n', keys, cmd, {noremap = true, silent = true}) end + +nmap('','BufferNext') +nmap('','BufferPrevious') + +require("nvim-tree").setup() +nmap('', 'NvimTreeToggle') + +require("catppuccin").setup({flavour = "mocha", transparent_background = true}) +vim.cmd.colorscheme "catppuccin" diff --git a/configuration.nix b/configuration.nix index fc4f755..232fb80 100644 --- a/configuration.nix +++ b/configuration.nix @@ -57,7 +57,6 @@ libgccjit libmtp lolcat - lua mako mlocate mupdf diff --git a/home.nix b/home.nix index 57d90f1..519ff43 100644 --- a/home.nix +++ b/home.nix @@ -41,6 +41,8 @@ viAlias = true; extraPackages = with pkgs; [ alejandra + lua + luaformatter lua-language-server libclang rnix-lsp @@ -51,11 +53,10 @@ nvim-tree-lua telescope-nvim catppuccin-nvim + nvim-web-devicons + barbar-nvim ]; - extraLuaConfig = '' - require("nvim-tree").setup() - vim.cmd.colorscheme "catppuccin" - ''; + extraLuaConfig = lib.fileContents ./cfg/nvim/init.lua; }; zsh = { enable = true; @@ -90,10 +91,6 @@ }; }; xdg.configFile = { - "nvim/lua/custom" = { - source = ./cfg/nvim/custom; - recursive = true; - }; "sway/config" = { source = ./cfg/sway/config; };