diff options
| author | Filip Andrzej Wandzio <dscr@duck.com> | 2024-04-29 21:47:02 +0000 |
|---|---|---|
| committer | Filip Andrzej Wandzio <dscr@duck.com> | 2024-04-29 21:47:02 +0000 |
| commit | 9973865685cbf6524de9d2d74dfa2a0b9c00fb8c (patch) | |
| tree | cbd7455f9859f7cffb633834e3b573885209255a /lua/config/editor.lua | |
| parent | 354bdafcd6bbc2f6a63ccbf21fb741f41dbd340b (diff) | |
| parent | 00ded90580ba40155adfb90d4f9aab8318140199 (diff) | |
| download | neovim-9973865685cbf6524de9d2d74dfa2a0b9c00fb8c.tar.gz neovim-9973865685cbf6524de9d2d74dfa2a0b9c00fb8c.zip | |
Merge pull request 'test' (#1) from test into master
Reviewed-on: https://codeberg.org/philw/nvim/pulls/1
Diffstat (limited to '')
| -rw-r--r-- | lua/config/editor.lua | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/lua/config/editor.lua b/lua/config/editor.lua index eec0e08..0649006 100644 --- a/lua/config/editor.lua +++ b/lua/config/editor.lua | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | local js_based_languages = { "typescript", "javascript", "typescriptreact", "javascriptreact" } | ||
| 2 | local option = vim.opt | 1 | local option = vim.opt |
| 3 | local keymap = vim.keymap | 2 | local keymap = vim.keymap |
| 4 | 3 | ||
| 5 | local telescope = require("telescope.builtin") | ||
| 6 | local autotag = require("nvim-ts-autotag").setup() | ||
| 7 | |||
| 8 | --Basic Editor Setup | 4 | --Basic Editor Setup |
| 9 | option.nu = true | 5 | option.nu = true |
| 10 | option.tabstop = 2 | 6 | option.tabstop = 2 |
| @@ -21,13 +17,15 @@ option.laststatus = 0 | |||
| 21 | option.signcolumn = "number" | 17 | option.signcolumn = "number" |
| 22 | option.autoindent = true | 18 | option.autoindent = true |
| 23 | option.clipboard = "unnamedplus" | 19 | option.clipboard = "unnamedplus" |
| 24 | option.termguicolors = true | 20 | option.termguicolors = false |
| 21 | option.fillchars = 'eob: ' | ||
| 25 | 22 | ||
| 26 | -- Setup Editor Theme | 23 | -- Setup Editor Theme |
| 27 | vim.cmd.colorscheme("tokyonight") | ||
| 28 | vim.cmd([[ | 24 | vim.cmd([[ |
| 29 | highlight GitGutterAdd ctermbg=none | 25 | highlight GitGutterAdd ctermbg=none |
| 30 | highlight GitGutterAdd guibg=none | 26 | highlight GitGutterAdd guibg=none |
| 27 | highlight NonText guifg=none | ||
| 28 | highlight EndOfBuffer ctermfg=none ctermbg=none | ||
| 31 | highlight Normal ctermbg=none | 29 | highlight Normal ctermbg=none |
| 32 | highlight Normal guibg=none | 30 | highlight Normal guibg=none |
| 33 | highlight signcolumn ctermbg=none | 31 | highlight signcolumn ctermbg=none |
| @@ -62,7 +60,6 @@ highlight DiagnosticVirtualTextHint ctermbg=none | |||
| 62 | highlight DiagnosticVirtualTextHint guibg=none | 60 | highlight DiagnosticVirtualTextHint guibg=none |
| 63 | ]]) | 61 | ]]) |
| 64 | 62 | ||
| 65 | |||
| 66 | -- run specific commands after different file extensions | 63 | -- run specific commands after different file extensions |
| 67 | vim.cmd([[ | 64 | vim.cmd([[ |
| 68 | augroup RunPfOnSave | 65 | augroup RunPfOnSave |
| @@ -83,21 +80,7 @@ vim.g.gitgutter_set_sign_backgrounds = 1 | |||
| 83 | --Keybinds | 80 | --Keybinds |
| 84 | vim.g.mapleader = " " | 81 | vim.g.mapleader = " " |
| 85 | keymap.set("n", "<leader>e", vim.cmd.Ex) | 82 | keymap.set("n", "<leader>e", vim.cmd.Ex) |
| 86 | keymap.set("n", "<leader>f", telescope.find_files, {}) | ||
| 87 | keymap.set("n", "<leader>fg", telescope.live_grep, {}) | ||
| 88 | keymap.set("n", "<leader>fb", telescope.buffers, {}) | ||
| 89 | keymap.set("n", "<leader>fh", telescope.help_tags, {}) | ||
| 90 | keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) | 83 | keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) |
| 91 | keymap.set("n", "<leader>a", "ggVG") | 84 | keymap.set("n", "<leader>a", "ggVG") |
| 92 | keymap.set("v", "J", ":m '>+1<CR>gv=gv") | 85 | keymap.set("v", "J", ":m '>+1<CR>gv=gv") |
| 93 | keymap.set("v", "K", ":m '<-2<CR>gv=gv") | 86 | keymap.set("v", "K", ":m '<-2<CR>gv=gv") |
| 94 | |||
| 95 | --Treesitter | ||
| 96 | require("nvim-treesitter.configs").setup({ | ||
| 97 | ensure_installed = { "javascript", "typescript", "rust", "c", "lua", "vim" }, | ||
| 98 | sync_install = false, | ||
| 99 | auto_install = true, | ||
| 100 | highlight = { | ||
| 101 | enable = true, | ||
| 102 | }, | ||
| 103 | }) | ||
