From 9c471ef13692e835d582b5fe34f40e8eb230c70d Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Wed, 4 Dec 2024 16:14:34 +0100 Subject: nvim settings aktualisiert --- nvim/autocmd.vim | 4 +-- nvim/init.vim | 5 +++ nvim/keymaps.vim | 2 +- nvim/plugins.vim | 104 +++++++++++++++--------------------------------------- nvim/settings.vim | 5 +-- tmux/tmux.conf | 2 +- 6 files changed, 40 insertions(+), 82 deletions(-) diff --git a/nvim/autocmd.vim b/nvim/autocmd.vim index 5dda3b5..f5db72c 100644 --- a/nvim/autocmd.vim +++ b/nvim/autocmd.vim @@ -1,3 +1,3 @@ autocmd FileType html,css EmmetInstall -autocmd VimEnter * NERDTree | wincmd p -autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif +"autocmd VimEnter * NERDTree | wincmd p +"autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif diff --git a/nvim/init.vim b/nvim/init.vim index cb2425d..da1170a 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -3,3 +3,8 @@ source $HOME/.config/nvim/statusline.vim source $HOME/.config/nvim/autocmd.vim source $HOME/.config/nvim/keymaps.vim source $HOME/.config/nvim/plugins.vim + +" Farbschema +set termguicolors +set background=dark +colorscheme iceberg diff --git a/nvim/keymaps.vim b/nvim/keymaps.vim index f905d51..2c1d65b 100644 --- a/nvim/keymaps.vim +++ b/nvim/keymaps.vim @@ -32,7 +32,7 @@ inoremap pumvisible() ? "\" : "\" inoremap pumvisible() ? "\" : "\" " Funktionstasten -nnoremap :NERDTreeToggle +nnoremap :NvimTreeToggle nnoremap :make nnoremap :MundoToggle nnoremap :TagbarToggle diff --git a/nvim/plugins.vim b/nvim/plugins.vim index 0563fda..b1dfe3a 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -7,8 +7,10 @@ endif " vim-plug call plug#begin() Plug 'mattn/emmet-vim' - Plug 'preservim/nerdtree' - Plug 'Xuyuanp/nerdtree-git-plugin' + + Plug 'nvim-tree/nvim-web-devicons' + Plug 'nvim-tree/nvim-tree.lua' + Plug 'preservim/tagbar' Plug 'romainl/vim-cool' Plug 'simnalamburt/vim-mundo' @@ -37,29 +39,13 @@ call plug#begin() Plug 'nvim-lua/plenary.nvim' Plug 'nvim-telescope/telescope.nvim' - Plug 'catppuccin/nvim', { 'as': 'catppuccin' } - + Plug 'cocopon/iceberg.vim' call plug#end() " EMMET let g:user_emmet_install_global=0 let g:user_emmet_leader_key='' -" NERDTree -let NERDTreeMinimalUI=1 -let NERDTreeShowHidden=0 - -" NERDTree GIT Plugin -let g:NERDTreeGitStatusUntrackedFilesMode='all' -let g:NERDTreeGitStatusShowClean=1 -let g:NERDTreeGitStatusConcealBrackets=1 -let g:NERDTreeDirArrowExpandable='+' -let g:NERDTreeDirArrowCollapsible='-' - -let g:WebDevIconsUnicodeDecorateFolderNodes=1 -let g:DevIconsEnableFoldersOpenClose=1 -let g:WebDevIconsNerdTreeBeforeGlyphPadding='' - " Tagbar let g:tagbar_ctags_bin='/usr/local/bin/uctags' @@ -69,59 +55,25 @@ let g:mundo_width=40 let g:mundo_preview_height=30 lua << EOF +-- nvim-tree +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 -require("catppuccin").setup({ - flavour = "auto", -- latte, frappe, macchiato, mocha - background = { -- :h background - light = "latte", - dark = "mocha", - }, - transparent_background = false, -- disables setting the background color. - show_end_of_buffer = false, -- shows the '~' characters after the end of buffers - term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) - dim_inactive = { - enabled = false, -- dims the background color of inactive window - shade = "dark", - percentage = 0.15, -- percentage of the shade to apply to the inactive window - }, - no_italic = false, -- Force no italic - no_bold = false, -- Force no bold - no_underline = false, -- Force no underline - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = { "italic" }, -- Change the style of comments - conditionals = { "italic" }, - loops = {}, - functions = {}, - keywords = {}, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = {}, - types = {}, - operators = {}, - -- miscs = {}, -- Uncomment to turn off hard-coded styles - }, - color_overrides = {}, - custom_highlights = {}, - default_integrations = true, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - treesitter = true, - notify = false, - mini = { - enabled = true, - indentscope_color = "", - }, - -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations) - }, +require("nvim-tree").setup({ + sort = { + sorter = "case_sensitive", + }, + view = { + width = 30, + }, + renderer = { + group_empty = true, + }, + filters = { + dotfiles = true, + }, }) --- setup must be called before loading -vim.cmd.colorscheme "catppuccin" - require('nvim-treesitter.configs').setup { ensure_installed = { "c", "cpp", "lua", "vim", "vimdoc", "typescript", "python", "html" }, sync_install = false, @@ -258,7 +210,7 @@ require('illuminate').configure({ 'regex', }, -- delay: delay in milliseconds - delay = 100, + delay = 50, -- filetype_overrides: filetype specific overrides. -- The keys are strings to represent the filetype while the values are tables that -- supports the same keys passed to .configure except for filetypes_denylist and filetypes_allowlist @@ -306,17 +258,17 @@ require('illuminate').configure({ }) -- change the highlight style -vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "Visual" }) -vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "Visual" }) -vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "Visual" }) +vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "CursorLine" }) +vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "CursorLine" }) +vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "CursorLine" }) --- auto update the highlight style on colorscheme change vim.api.nvim_create_autocmd({ "ColorScheme" }, { pattern = { "*" }, callback = function(ev) - vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "Visual" }) - vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "Visual" }) - vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "Visual" }) + vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "CursorLine" }) + vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "CursorLine" }) + vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "CursorLine" }) end }) EOF diff --git a/nvim/settings.vim b/nvim/settings.vim index f65e180..6435401 100644 --- a/nvim/settings.vim +++ b/nvim/settings.vim @@ -77,6 +77,7 @@ syntax enable filetype plugin indent on " Farbschema -set termguicolors -" colorscheme default +" set termguicolors +" set background=dark +" colorscheme iceberg diff --git a/tmux/tmux.conf b/tmux/tmux.conf index acc0027..21f8cd4 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,6 +1,6 @@ set -g mouse on set -g default-terminal "tmux-256color" -set -g terminal-features ",xterm*:Tc" +set -g terminal-features ",xterm*:RGB" set -g terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' set -g status on set -g status-left " #[fg=darkblue]#S#[fg=black] | " -- cgit v1.3