From 21e85821064dd444ed9a35e342c2ea220c50a6f6 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Fri, 4 Sep 2020 15:30:05 +0700 Subject: Update 2020-09-04 --- awesome/.config/awesome/rc.lua | 8 ++++--- debian/.bashrc | 6 ++--- debian/.profile | 1 + dev/.gitconfig | 2 ++ vim/.vim/vimrc | 54 ++++++++++++++++++++++-------------------- 5 files changed, 39 insertions(+), 32 deletions(-) diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index 5509504..328e6c0 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -57,7 +57,7 @@ local python2 = terminal .. " -e python2" local guile = terminal .. " -e guile" local clojure = terminal .. " -e clojure" local emacs = "emacs" -local netrw = terminal .. " -e vim -cEx" +local netrw = terminal .. " -e vim" local slock_suspend = "slock systemctl --ignore-inhibitors suspend" -- Audacious media player @@ -477,6 +477,8 @@ local globalkeys = awful.util.table.join( {description = "open Tor Browser", group = "launcher"}), awful.key({modkey}, "t", spawner"thunderbird", {description = "open Thunderbird", group = "launcher"}), + awful.key({modkey}, "m", spawner"nheko", + {description = "open nheko", group = "launcher"}), awful.key({modkey, "Shift"}, "g", spawner"gimp", {description = "open GIMP", group = "launcher"}), awful.key({modkey}, "r", spawner(ranger), @@ -491,8 +493,6 @@ local globalkeys = awful.util.table.join( {description = "open Clojure interpreter", group = "launcher"}), awful.key({modkey}, "g", spawner(guile), {description = "open Guile interpreter", group = "launcher"}), - awful.key({modkey}, "z", spawner"zathura", - {description = "open zathura document viewer", group = "launcher"}), awful.key({modkey}, "d", spawner"diodon", {description = "open clipboard manager", group = "launcher"}), awful.key({modkey}, "s", spawner"slock", @@ -586,6 +586,8 @@ local clientkeys = awful.util.table.join( c:raise() end, {description = "toggle fullscreen", group = "client"}), + awful.key({modkey, "Control"}, "d", spawner"kdocker", + {description = "select a window to be docked", group = "client"}), awful.key({modkey}, "q", function (c) c:kill() end, {description = "close", group = "client"}), awful.key({modkey, "Control"}, "q", spawner"xkill", diff --git a/debian/.bashrc b/debian/.bashrc index 7e85dd8..7dc78a4 100644 --- a/debian/.bashrc +++ b/debian/.bashrc @@ -82,9 +82,8 @@ fi export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' # some more ls aliases -alias ll='ls -l' -alias la='ls -A' -#alias l='ls -CF' +alias ll='exa -l' +alias la='exa -a' # Alias definitions. # You may want to put all your additions into a separate file like @@ -93,6 +92,7 @@ alias la='ls -A' alias l='$(fc -ln -1) | less -r' alias r=ranger alias v='vim $(fzf)' +alias fd=fdfind alias cdid='cd $HOME/Sources/pip/src/pip/_internal' alias pwip='python3 $HOME/Sources/pip/src/pip' alias gcc='gcc -Wall -Wextra -pedantic -O2 -lm' diff --git a/debian/.profile b/debian/.profile index d7f8549..990d130 100644 --- a/debian/.profile +++ b/debian/.profile @@ -11,6 +11,7 @@ export GOPATH="$HOME/.local/share/go" export PATH="$HOME/.local/bin:$GOPATH/bin:$HOME/.cargo/bin:$HOME/.luarocks/bin:$PATH" export MANPATH="$HOME/.local/share/man:$MANPATH" +export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src" export XMODIFIERS=@im=ibus export QT_QPA_PLATFORMTHEME=qt5ct diff --git a/dev/.gitconfig b/dev/.gitconfig index 8dbc3af..3c0864c 100644 --- a/dev/.gitconfig +++ b/dev/.gitconfig @@ -16,3 +16,5 @@ ui = auto [pull] rebase = true +[init] + defaultBranch = main diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 5432532..75ba1d7 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -15,22 +15,24 @@ set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1 set omnifunc=syntaxcomplete#Complete set diffopt+=algorithm:patience -autocmd! -autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal -autocmd BufNewFile,BufRead *.sql setlocal filetype=mysql -autocmd BufNewFile,BufRead *.m setlocal filetype=octave -autocmd FileType asm,c,h,go,glsl - \ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 -autocmd FileType vim,sh,lua,tex,cmake,cpp,mysql,html,octave,pascal - \ setlocal shiftwidth=2 -autocmd FileType rst setlocal shiftwidth=3 -autocmd FileType java setlocal omnifunc=javacomplete#Complete -autocmd BufWinEnter * - \ if &filetype ==# 'python' || &filetype ==# 'cython' - \ | let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) | - \ else - \ | let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) | - \ endif +augroup vimrc + autocmd! + autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal + autocmd BufNewFile,BufRead *.sql setlocal filetype=mysql + autocmd BufNewFile,BufRead *.m setlocal filetype=octave + autocmd FileType asm,c,h,go,glsl + \ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 + autocmd FileType vim,sh,lua,tex,cmake,cpp,mysql,html,octave,pascal + \ setlocal shiftwidth=2 + autocmd FileType rst setlocal shiftwidth=3 + autocmd FileType java setlocal omnifunc=javacomplete#Complete + autocmd BufWinEnter * + \ if &filetype ==# 'python' || &filetype ==# 'cython' + \ | let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) | + \ else + \ | let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) | + \ endif +augroup END let g:netrw_banner = 0 let g:netrw_liststyle = 3 @@ -42,16 +44,16 @@ let g:jedi#smart_auto_mappings = 0 let g:polyglot_disabled = ['latex'] call plug#begin('~/.vim/plugged') -Plug 'https://github.com/vim/killersheep.git' -Plug 'https://github.com/sheerun/vim-polyglot.git' -Plug 'https://github.com/srcery-colors/srcery-vim.git' -Plug 'https://github.com/knsh14/vim-github-link.git' -Plug 'https://github.com/tpope/vim-abolish.git' -Plug 'https://github.com/alx741/vinfo.git' -Plug 'https://github.com/lervag/vimtex.git', {'for': 'tex'} -Plug 'https://github.com/kovisoft/slimv.git', {'for': 'lisp'} -Plug 'https://github.com/anntzer/vim-cython.git', {'for': 'cython'} -Plug 'https://github.com/artur-shaik/vim-javacomplete2.git', {'for': 'java'} +Plug 'https://github.com/vim/killersheep' +Plug 'https://github.com/francoiscabrol/ranger.vim' +Plug 'https://github.com/sheerun/vim-polyglot' +Plug 'https://github.com/srcery-colors/srcery-vim' +Plug 'https://github.com/knsh14/vim-github-link' +Plug 'https://github.com/lervag/vimtex', {'for': 'tex'} +Plug 'https://github.com/kovisoft/slimv', {'for': 'lisp'} +Plug 'https://github.com/anntzer/vim-cython', {'for': 'cython'} +Plug 'https://github.com/racer-rust/vim-racer', {'for': 'rust'} +Plug 'https://github.com/rhysd/rust-doc.vim', {'for': 'rust'} call plug#end() source /usr/share/doc/fzf/examples/fzf.vim -- cgit 1.4.1