diff --git a/fish/fish_user_key_bindings.fish b/fish/fish_user_key_bindings.fish index c5da768..ee6170a 100644 --- a/fish/fish_user_key_bindings.fish +++ b/fish/fish_user_key_bindings.fish @@ -6,3 +6,5 @@ function fish_user_key_bindings bind -M insert \ep __fzf_find_file bind -M insert \ef '__fzf_open --editor' end + +fzf_key_bindings diff --git a/i3/config b/i3/config index 9c5e04f..3ca0ac5 100644 --- a/i3/config +++ b/i3/config @@ -40,12 +40,7 @@ bindsym $mod+Shift+q kill # start program launcher # bindsym $mod+d exec --no-startup-id dmenu_recency -bindsym $mod+d exec --no-startup-id rofi -show run -#-lines 10 -eh 2 -width 30 -padding 800 - - -# launch categorized menu -bindsym $mod+z exec --no-startup-id morc_menu +bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30 -padding 800 ################################################################################################ ## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ## @@ -76,6 +71,7 @@ bindsym $mod+Shift+F9 exec "xrandr --output DP-4 --primary --output DP-2 --off - # Start Applications bindsym $mod+Ctrl+b exec terminal -e 'bmenu' +bindsym $mod+F1 exec glances -w bindsym $mod+F2 exec chromium bindsym $mod+F3 exec thunar bindsym $mod+Shift+F3 exec terminal -e 'ranger' diff --git a/manjaro.md b/manjaro.md index 0eec779..227814b 100644 --- a/manjaro.md +++ b/manjaro.md @@ -10,14 +10,16 @@ * vlc player `sudo pacman -S libmicrodns protobuf vlc` # coding +* dry `yay dry-bin` * cuda `sudo pacman -S cuda` +* cuda-docker `yay nvidia-container-toolkit` * core `sudo pacman -S neovim tmux` * `git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm` * fonts `sudo pacman -S powerline` * fonts `yay nerd-fonts-source-code-pro powerline-fonts-git` * git addons `sudo pacman -S diff-so-fancy` * search `sudo pacman -S the_silver_searcher ripgrep` -* syntax highlighting `sudo pacman -S bat` +* cat replacement `sudo pacman -S bat` * javascript `sudo pacman -S npm nodejs yarn` * c++ `sudo pacman -S ninja` @@ -31,7 +33,6 @@ # python * `pip install torch torchvision` * `pip install plotly flake8 numpy scipy sympy matplotlib seaborn pytorch-lightning ggplot ptvsd tensorboard torchtext ipython matplotlib-label-lines ipympl pytest qbstyles` -* `pip install nodejs kafka` # enable services * `systemctl enable --user onedrive --now` diff --git a/nvim/init.vim b/nvim/init.vim index 550d37b..8d2bf9d 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -23,19 +23,25 @@ Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} Plug 'junegunn/fzf.vim' Plug 'antoinemadec/coc-fzf', {'branch': 'release'} Plug 'sheerun/vim-polyglot' " language syntax +Plug 'tpope/vim-abolish' " better search replace " git Plug 'tpope/vim-fugitive' " markdown Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() } } Plug 'plasticboy/vim-markdown' " markdown helper. " helpers -Plug 'scrooloose/nerdcommenter' " commenting tool +Plug 'tpope/vim-repeat' +Plug 'tpope/vim-commentary' " commenting tool Plug 'tpope/vim-surround' " parentheses helper Plug 'mbbill/undotree' " Persistent undo Plug 'farmergreg/vim-lastplace' " When reopen a buffer, puts the cursor where it was last time -Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim Plug 'haya14busa/vim-asterisk' " better asterisk motions -Plug 'bfredl/nvim-miniyank' " nvim bugfix block copy +Plug 'svermeulen/vim-easyclip' +Plug 'tpope/vim-unimpaired' +Plug 'tpope/vim-sensible' +" tmux +Plug 'roxma/vim-tmux-clipboard' +Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim " aesthetics Plug 'chriskempson/base16-vim' " base16 themes Plug 'chrisbra/Colorizer' " show color codes @@ -69,7 +75,7 @@ let g:seoul256_background=233 colo seoul256 " statusline -set cmdheight=1 +set cmdheight=2 let g:airline_powerline_fonts=1 "let g:airline_theme='molokai' "let g:airline_theme='qwq' @@ -98,8 +104,7 @@ set ignorecase " Case insensitive search set smartcase " ... but case sensitive when uc present " cursor -set scrolljump=5 " Line to scroll when cursor leaves screen -set scrolloff=3 " Minumum lines to keep above and below cursor +set scrolljump=1 " Line to scroll when cursor leaves screen " buffers set splitright " Puts new vsplit windows to the right of the current @@ -119,8 +124,10 @@ set matchtime=5 " Show matching time set fileencodings=utf-8,ucs-bom,gb18030,gbk,gb2312,cp936 set fileformats=unix,dos,mac -" indentation and folds +" indentation set smartindent + +" folds set foldmethod=indent set foldlevelstart=20 " zm/M zr/R increase/increase foldlevel (max) @@ -146,8 +153,11 @@ let g:BASH_Ctrl_j='off' " avoid 'C-j' being overridden to newline let g:BASH_Ctrl_l='off' " avoid 'C-l' being overridden to newline highlight clear SignColumn " SignColumn should match background set shortmess=atOI " No help Uganda information, and overwrite read messages to avoid PRESS ENTER prompts -set listchars=tab:→\ ,eol:↵,trail:·,extends:↷,precedes:↶ +set listchars=tab:→\ ,eol:↵,trail:·,extends:↷,precedes:↶,nbsp:+ set fillchars=vert:│,stl:\ ,stlnc:\ +set clipboard+=unnamed +set list + " ----------------------------------------------------------------------------- " KEYBINDS @@ -156,17 +166,16 @@ let mapleader="\" nnoremap q: nnoremap Q vnoremap v -nnoremap K zz +set pastetoggle= nmap :noh nmap R :so ~/.config/nvim/init.vim nmap E :tabe ~/OneDrive/dotfiles/nvim/init.vim nmap w :cd %:p:h -" nerdcommenter: 'c ', 'cl' aligned and 'cu>' remove " vim-surround: visual 'SA' to wrap in A. Surround 'csAB' to change from A to B, 'dsA' to remove A. Word 'ysiwA' to wrap with A " ***************************** " REMAPPING -set langmap=å(,¨),Å{,^},Ø\\;,ø:,\\;<,:>,æ^ +set langmap=å(,¨),Å{,^},Ø\\;,ø:,æ^ " æ ^ " Ø ; " ø : @@ -182,12 +191,6 @@ nmap cR (coc-refactor) xmap cf (coc-format-selected) nmap cf (coc-format-selected) -" ***************************** -" CLIPBOARD (incl bugfix paste unnamedplus) -set clipboard+=unnamedplus -nmap p (miniyank-autoput) -nmap P (miniyank-autoPut) - " ***************************** " TERMINAL nmap T :terminal @@ -333,12 +336,26 @@ imap imap pumvisible() ? "\" : "\" imap coc#refresh() +" Use K to show documentation in preview window. +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + elseif (coc#rpc#ready()) + call CocActionAsync('doHover') + else + execute '!' . &keywordprg . " " . expand('') + endif +endfunction + " ***************************** " MARKDOWN " vim-markdown let g:vim_markdown_new_list_item_indent=0 -let g:vim_markdown_conceal=0 -let g:vim_markdown_conceal_code_blocks=0 +let g:vim_markdown_auto_insert_bullets=1 +let g:vim_markdown_conceal=1 +let g:vim_markdown_conceal_code_blocks=1 let g:vim_markdown_math=1 let g:vim_markdown_folding_disabled=0 " markdown preview @@ -367,6 +384,9 @@ augroup myAu " A unique name for the group. DO NOT use the same name twice! autocmd BufWritePre * %s/\s\+$//e " Automatically deletes all trailing whitespace on save. autocmd BufReadPost quickfix nmap " quickfix autocmd CompleteDone * if pumvisible() == 0 | pclose | endif " bugfix + autocmd BufNewFile,BufRead *.cfg set syntax=cfg + autocmd FileType python map :CocCommand python.execInTerminal + autocmd FileType python imap :CocCommand python.execInTerminal augroup end " CTRL-A CTRL-Q to select all and build quickfix list diff --git a/root/.tmux.conf b/root/.tmux.conf index 2a8372f..f577c57 100644 --- a/root/.tmux.conf +++ b/root/.tmux.conf @@ -21,6 +21,7 @@ set -g mouse on # clipboard control set -g set-clipboard on set -g history-limit 20000 +set -g focus-events on # screen colors set -g default-terminal "tmux-256color" @@ -64,7 +65,7 @@ bind ø command-prompt bind v copy-mode # clipboard control -bind P paste-buffer +bind p paste-buffer bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard" bind -T copy-mode-vi r send-keys -X rectangle-toggle @@ -76,7 +77,7 @@ bind , command-prompt "rename-window %%" # Clock mode bind t clock-mode -# Show pane info +# Show pane numbers bind i display-panes # Config Reloads