From 465308cd6dc9d2c0fbf9849a95025460fc0dffaa Mon Sep 17 00:00:00 2001 From: Guusvanmeerveld Date: Sat, 11 Jun 2022 16:44:48 +0200 Subject: [PATCH] Updates to vim, readme and other --- README.md | 25 ++++++++++++++++++---- config/.zshrc | 8 +++++++ config/init.vim | 44 +++++++++++++++++++++++++++----------- config/micro/bindings.json | 4 ---- config/micro/settings.json | 7 ------ config/picom.conf | 2 +- config/vscodium.json | 18 ++++++++++++++++ dotfiles | 1 - install.conf.yaml | 4 ---- 9 files changed, 79 insertions(+), 34 deletions(-) delete mode 100644 config/micro/bindings.json delete mode 100644 config/micro/settings.json diff --git a/README.md b/README.md index 498f247..54e1f61 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,30 @@ ## Install -### Essential Packages + Applications +```bash +./dotfiles install +``` + +## Add a package to the install list + +```bash +./dotfiles add {package_name} +``` + +example: + +```bash +./dotfiles add ungoogled-chromium +``` + +## Edit a config file ```bash -sh packs+apps.sh +./dotfiles edit {file_name} ``` -### Essential packages only +example: + ```bash -sh packs.sh +./dotfiles edit bspwmrc ``` diff --git a/config/.zshrc b/config/.zshrc index 8b07760..4c04f75 100644 --- a/config/.zshrc +++ b/config/.zshrc @@ -16,6 +16,14 @@ plugins=(git colorize docker yarn vscode sudo alias-finder archlinux zsh-histdb # Oh-my-zsh source $ZSH/oh-my-zsh.sh +# Fzf variables +if type rg &> /dev/null; then + export FZF_DEFAULT_COMMAND='rg --files' + export FZF_DEFAULT_OPTS='-m --height 50% --border' +fi + +export EDITOR="nvim" + # Keybinds bindkey "^z" undo bindkey "^y" redo diff --git a/config/init.vim b/config/init.vim index 7c56fed..99ad9ed 100644 --- a/config/init.vim +++ b/config/init.vim @@ -1,17 +1,31 @@ command Ws w|so% +let mapleader = " " + " Simple keybinds -nnoremap :w -nnoremap :q -inoremap :w +nnoremap :w +nnoremap :q +inoremap :w + +nnoremap :10Term + +nnoremap :m-2 +nnoremap :m+1 -nnoremap :10Term +" Easy split navigation +nnoremap w +nnoremap h +nnoremap j +nnoremap k +nnoremap l :set tabstop=4 :set relativenumber -:set timeout timeoutlen=20 ttimeoutlen=20 +:set timeout timeoutlen=500 ttimeoutlen=500 + +:set clipboard=unnamedplus let s:fontsize = 12 @@ -36,25 +50,30 @@ Plug 'airblade/vim-gitgutter' Plug 'tpope/vim-fugitive' Plug 'mattn/emmet-vim' Plug 'Valloric/YouCompleteMe' -Plug 'terryma/vim-multiple-cursors' +Plug 'mg979/vim-visual-multi' Plug 'prettier/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production' } Plug 'sainnhe/sonokai' Plug 'ryanoasis/vim-devicons' Plug 'vimlab/split-term.vim' Plug 'sirver/UltiSnips' Plug 'honza/vim-snippets' -Plug 'lambdalisue/suda.vim' " Plug 'thaerkh/vim-workspace' Plug 'Raimondi/delimitMate' + call plug#end() " Fzf -nnoremap :Files +nnoremap p :Files +nnoremap f :Rg " Prettier settings let g:prettier#autoformat = 1 let g:prettier#autoformat_require_pragma = 0 +" Vim eunuch setting +nnoremap e :SudoEdit +nnoremap s :SudoWrite + " Workspace settings " let g:workspace_autocreate = 1 @@ -63,13 +82,12 @@ let g:prettier#autoformat_require_pragma = 0 let NERDTreeMinimalUI = 1 let NERDTreeDirArrows = 1 +let NERDTreeShowHidden = 1 -nnoremap :NERDTreeToggle -nnoremap :NERDTreeFind -nnoremap :NERDTree +nnoremap :NERDTreeToggle -nnoremap ] :tabn -nnoremap [ :tabp +nnoremap ] :tabn +nnoremap [ :tabp " Lightline config set noshowmode diff --git a/config/micro/bindings.json b/config/micro/bindings.json deleted file mode 100644 index 5f524c5..0000000 --- a/config/micro/bindings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Alt-/": "lua:comment.comment", - "CtrlUnderscore": "lua:comment.comment" -} diff --git a/config/micro/settings.json b/config/micro/settings.json deleted file mode 100644 index 0dec876..0000000 --- a/config/micro/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "colorscheme": "material-tc", - "mkparents": true, - "saveundo": true, - "tabmovement": true, - "tabsize": 2 -} diff --git a/config/picom.conf b/config/picom.conf index f1f45e1..b0b9aa9 100644 --- a/config/picom.conf +++ b/config/picom.conf @@ -3,7 +3,7 @@ popup_menu = { shadow = false; }; utility = { shadow = false; }; backend = "glx"; -vsync = "opengl-swc"; +vsync = "true"; glx-copy-from-front = true; glx-swap-method = 2; diff --git a/config/vscodium.json b/config/vscodium.json index 5336556..160fbab 100644 --- a/config/vscodium.json +++ b/config/vscodium.json @@ -31,5 +31,23 @@ }, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "diffEditor.ignoreTrimWhitespace": false, + "typescript.updateImportsOnFileMove.enabled": "always", + "redhat.telemetry.enabled": false, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "terminal.integrated.env.linux": { + "EDITOR": "codium" } } diff --git a/dotfiles b/dotfiles index 78eeadc..5f9d3a2 100755 --- a/dotfiles +++ b/dotfiles @@ -2,7 +2,6 @@ export ROOT=~/dotfiles export DOTFILES=$ROOT -export EDITOR=micro case $1 in edit) diff --git a/install.conf.yaml b/install.conf.yaml index 397fa24..441b3cd 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -19,10 +19,6 @@ ~/gpg.conf: config/gpg.conf ~/.ssh/config: config/ssh - # Micro - ~/.config/micro/settings.json: config/micro/settings.json - ~/.config/micro/bindings.json: config/micro/bindings.json - # NVim ~/.config/nvim/init.vim: config/init.vim