From ac19155d96cbce73e42372b27b589d922d93e004 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Sat, 4 Jun 2022 13:45:38 +0100 Subject: Updated to the new path --- terminals.md | 2 +- tmux.md | 9 +- vimrc | 190 ------------------------------------------ wezterm.lua | 4 +- wezterm_tokyonight_storm.toml | 2 +- xterm.md | 2 +- 6 files changed, 9 insertions(+), 200 deletions(-) delete mode 100644 vimrc diff --git a/terminals.md b/terminals.md index b09b932..2485ddf 100644 --- a/terminals.md +++ b/terminals.md @@ -9,7 +9,7 @@ * Xterm - Pros: installed everywhere, good for fallback - Cons: missing features, less configurable, no ligatures - - See: xterm.md and `xresources` + - See: xterm.md and `Xresources` ## Discarded diff --git a/tmux.md b/tmux.md index 3dbea74..b899c34 100644 --- a/tmux.md +++ b/tmux.md @@ -3,16 +3,13 @@ Required: - tmux 2.7+ - - xclip (this is for X, sorry) - - requires a powerline compatible font (tip: install `fonts-powerline` in Debian/Ubuntu) - -This is not vim related, but I find it very useful so I like to keep it with my -vim conf. + - xclip (this is for X) + - requires a powerline compatible font (tip: if you are not using wezterm, install `fonts-powerline` in Debian/Ubuntu) Link you tmux.conf to the version here with: ``` -ln -s ~/.vim/tmux.conf ~/.tmux.conf +ln -s ~/.config/nvim/tmux.conf ~/.tmux.conf ``` Run tmux with `-u2`, or add an alias to your `~/.bashrc`: diff --git a/vimrc b/vimrc deleted file mode 100644 index 68a932a..0000000 --- a/vimrc +++ /dev/null @@ -1,190 +0,0 @@ -" for long lines -set wrap - -" tab business -set tabstop=8 -set softtabstop=4 -set shiftwidth=4 -set expandtab - -set autoindent - -" syntax highlighting -syntax on - -set nohlsearch - -" try to detect filetypes -filetype on - -" enable loading indent file for filetype -filetype plugin indent on - -" line numbers -set number - -" cursor line -set cursorline - -" enable mouse -set mouse=a - -" set term title -set title -set titleold= - -" plugin dependent conf starts - -call plug#begin('~/.vim/plugged') - -" git -Plug 'tpope/vim-fugitive', { 'tag': 'v3.6' } -Plug 'airblade/vim-gitgutter' - -" tmux -Plug 'tmux-plugins/vim-tmux-focus-events' -Plug 'roxma/vim-tmux-clipboard' -Plug 'wincent/terminus' - -" life improvements -Plug 'folke/tokyonight.nvim', { 'branch': 'main' } -Plug 'scrooloose/nerdtree' -Plug 'Chiel92/vim-autoformat' -Plug 'jsfaint/gen_tags.vim' -Plug 'godlygeek/tabular' -Plug 'vimwiki/vimwiki' - -" language support -Plug 'plasticboy/vim-markdown' -Plug 'samsaga2/vim-z80' -Plug 'tomtom/tcomment_vim' - -if has('nvim-0.5') - " status line - Plug 'nvim-lualine/lualine.nvim' - " general lua - Plug 'nvim-lua/popup.nvim' - Plug 'nvim-lua/plenary.nvim' - " scala - Plug 'scalameta/nvim-metals' - if has('nvim-0.5.1') - Plug 'nvim-telescope/telescope.nvim' - end - " auto complete - Plug 'hrsh7th/nvim-cmp' - Plug 'hrsh7th/cmp-nvim-lsp' - Plug 'hrsh7th/cmp-vsnip' - Plug 'hrsh7th/vim-vsnip' - - " for LSP - Plug 'kyazdani42/nvim-web-devicons' - Plug 'folke/trouble.nvim' - - " life improvements - Plug 'ojroques/nvim-bufdel' - - " learning - Plug 'folke/which-key.nvim' -end - -if has('nvim-0.6.1') - " lsp - Plug 'neovim/nvim-lspconfig' - Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} -end - -call plug#end() - -if has('nvim-0.5') -:lua << EOF - -- BufKil - require('bufdel').setup { - next = 'cycle', - quit = false, - } - -- which-key - require("which-key").setup { } -EOF - -end - -set laststatus=2 - -" vim-autoformat (C-F5) -" -noremap :Autoformat -au BufWrite *.py,*.c,*.h,*.cpp :Autoformat - -" enable omnicompletion -set omnifunc=syntaxcomplete#Complete - -" looks nice -set termguicolors -set background=dark - -let g:tokyonight_italic_keywords = 0 - -colorscheme tokyonight - -" toggle spell check -map s :set spell! spelllang=en_gb - -" show tabs and EOL whitespace -:set list listchars=tab:»·,trail:· - -" for tmux, screen, etc -set t_ut= - -" default is too slow -set updatetime=500 - -" re-read the file if changed (if possible) -set autoread -au BufEnter,CursorHold,CursorHoldI * silent! checktime - -" NERDTree -" -map n :NERDTreeToggle -let NERDTreeQuitOnOpen=1 - -" Telescope -" -nnoremap f Telescope find_files -nnoremap B Telescope buffers - -"" gen_tags.vim (requires GNU global, aka gtags) -" disable ctags completely, use it through gtags plugin -let g:loaded_gentags#ctags = 1 - -" vimwiki -" -let g:vimwiki_list = [{'path': '~/textfiles/', - \ 'syntax': 'markdown', 'ext': '.md'}] -let g:vimwiki_global_ext = 0 - -" vim-markdown -" -let g:vim_markdown_folding_disabled = 1 -let g:vim_markdown_frontmatter = 1 -let g:vim_markdown_conceal_code_blocks = 0 -autocmd FileType markdown setlocal conceallevel=2 - -" git gutter to play nice with others -" -let g:gitgutter_sign_allow_clobber = 0 - -" Required for operations modifying multiple buffers like rename. -set hidden - -" better for some messages -set cmdheight=2 -set shortmess+=c -" for lsc erros -set shortmess-=F - -" disable preview when doing auto-complete -set completeopt-=preview - -" Set completeopt to have a better completion experience -set completeopt=menuone,noinsert,noselect - diff --git a/wezterm.lua b/wezterm.lua index 063ae25..c4ad9ac 100644 --- a/wezterm.lua +++ b/wezterm.lua @@ -1,6 +1,8 @@ -- https://wezfurlong.org/wezterm/ -- --- ln ~/.vim/wezterm.lua ~/.config/wezterm/ +-- ln ~/.config/nvim/wezterm.lua ~/.config/wezterm/ +-- mkdir -p ~/.config/wezterm/colors/ +-- ln ~/.config/nvim/wezterm_tokyonight_storm.toml ~/.config/wezterm/colors/ -- -- on X11, add to ~/.Xresources -- diff --git a/wezterm_tokyonight_storm.toml b/wezterm_tokyonight_storm.toml index 167229d..6154319 100644 --- a/wezterm_tokyonight_storm.toml +++ b/wezterm_tokyonight_storm.toml @@ -1,5 +1,5 @@ # mkdir -p $HOME/.config/wezterm/colors -# ln -s $HOME/.vim/wezterm_tokyonight_storm.toml $HOME/.config/wezterm/colors +# ln -s $HOME/.config/nvim/wezterm_tokyonight_storm.toml $HOME/.config/wezterm/colors [colors] foreground = "#c0caf5" background = "#24283b" diff --git a/xterm.md b/xterm.md index 723aac0..a64406b 100644 --- a/xterm.md +++ b/xterm.md @@ -1,4 +1,4 @@ -Copy (or merge) `xresources` to `~/.Xresources`. +Copy (or merge) `Xresources` to `~/.Xresources`. Then load the config: -- cgit v1.2.3