Some addition from work

This commit is contained in:
Geoffrey Frogeye 2017-07-26 09:42:41 +02:00
parent fbd96948fa
commit 107fcc21aa
7 changed files with 591 additions and 543 deletions

View file

@ -1,18 +1,18 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # The parser is also very primitive, and not human-friendly.
fields=0 48 17 18 38 39 40 2 46 47 49 1 fields=0 48 17 18 38 39 40 2 46 47 49 1
sort_key=46 sort_key=47
sort_direction=1 sort_direction=1
hide_threads=0 hide_threads=0
hide_kernel_threads=0 hide_kernel_threads=1
hide_userland_threads=0 hide_userland_threads=1
shadow_other_users=0 shadow_other_users=0
show_thread_names=0 show_thread_names=0
show_program_path=0 show_program_path=0
highlight_base_name=0 highlight_base_name=1
highlight_megabytes=0 highlight_megabytes=0
highlight_threads=1 highlight_threads=1
tree_view=0 tree_view=1
header_margin=0 header_margin=0
detailed_cpu_time=0 detailed_cpu_time=0
cpu_count_from_zero=0 cpu_count_from_zero=0

View file

@ -368,6 +368,7 @@ exec --no-startup-id numlockx on # Activate Num lock
#exec --no-startup-id compton -b # Compositing manager #exec --no-startup-id compton -b # Compositing manager
exec --no-startup-id unclutter # Hide mouse cursor after some time exec --no-startup-id unclutter # Hide mouse cursor after some time
exec --no-startup-id dunst # Notifications exec --no-startup-id dunst # Notifications
exec --no-startup-id keynav # Keyboard cursor controller
#exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager #exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager
exec --no-startup-id mpd # Music Player Daemon exec --no-startup-id mpd # Music Player Daemon

View file

@ -112,11 +112,11 @@ tab-move +
gr gr
tab-next tab-next
J L
<ctrl-pgdown> <ctrl-pgdown>
tab-prev tab-prev
K H
<ctrl-pgup> <ctrl-pgup>
tab-clone tab-clone
@ -131,24 +131,24 @@ reload -f
<ctrl-f5> <ctrl-f5>
back back
H J
<back> <back>
back -t back -t
th tj
back -w back -w
wh wj
forward forward
L K
<forward> <forward>
forward -t forward -t
tl tk
forward -w forward -w
wl wk
fullscreen fullscreen
<f11> <f11>
@ -454,6 +454,12 @@ run-macro
wq wq
ZZ ZZ
tab-focus -1
g$
tab-pin
<ctrl-p>
[insert] [insert]
# Keybindings for insert mode. # Keybindings for insert mode.
# Since normal keypresses are passed through, only special keys are # Since normal keypresses are passed through, only special keys are

File diff suppressed because it is too large Load diff

4
scripts/docker-rm Executable file
View file

@ -0,0 +1,4 @@
#!/usr/bin/env sh
docker kill $(docker ps -q)
docker container prune -f
docker network prune -f

View file

@ -231,12 +231,12 @@ if [ $GUI == 1 ]; then
# Desktop manager # Desktop manager
inst i3 i3lock i3status dunst unclutter xautolock feh numlockx scrot xterm xclip inst i3 i3lock i3status dunst unclutter xautolock feh numlockx scrot xterm xclip
if [ $ARCH == 1 ]; then if [ $ARCH == 1 ]; then
altInst polybar-git ttf-font-awesome autorandr-git altInst polybar-git ttf-font-awesome autorandr-git keynav-enhanced
else else
echo "TODO compile polybar-git autorandr-git" echo "TODO compile polybar-git autorandr-git"
fi fi
if [ $DEBIAN == 1 ]; then if [ $DEBIAN == 1 ]; then
inst suckless-tools inst suckless-tools keynav
if [ $ADMIN == 0 ]; then if [ $ADMIN == 0 ]; then
debloc altern dmenu xft debloc altern dmenu xft
fi fi
@ -257,7 +257,7 @@ if [ $GUI == 1 ]; then
rm -rf $TMP_DIR rm -rf $TMP_DIR
elif [ $ARCH == 1 ]; then elif [ $ARCH == 1 ]; then
inst qutebrowser qt5-webengine inst qutebrowser qt5-webengine python-opengl
fi fi
# Screen filter # Screen filter

26
vimrc
View file

@ -19,6 +19,7 @@ Plugin 'tomasr/molokai'
Plugin 'tpope/vim-surround' Plugin 'tpope/vim-surround'
Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-repeat'
Plugin 'tpope/tpope-vim-abolish'
Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes' Plugin 'vim-airline/vim-airline-themes'
Plugin 'airblade/vim-gitgutter' Plugin 'airblade/vim-gitgutter'
@ -29,10 +30,11 @@ Plugin 'xolox/vim-easytags'
Plugin 'majutsushi/tagbar' Plugin 'majutsushi/tagbar'
Plugin 'wellle/targets.vim' Plugin 'wellle/targets.vim'
Plugin 'Chiel92/vim-autoformat' Plugin 'Chiel92/vim-autoformat'
Plugin 'Valloric/YouCompleteMe' " Plugin 'Valloric/YouCompleteMe'
Plugin 'artur-shaik/vim-javacomplete2' Plugin 'artur-shaik/vim-javacomplete2'
Plugin 'tomtom/tcomment_vim' Plugin 'tomtom/tcomment_vim'
Plugin 'Shougo/denite.nvim' Plugin 'Shougo/denite.nvim'
Plugin 'tomlion/vim-solidity'
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required
@ -44,11 +46,15 @@ nmap <F7> :UndotreeToggle<CR>:UndotreeFocus<CR>
""" CTRLP """ """ CTRLP """
let g:ctrlp_custom_ignore = { let g:ctrlp_custom_ignore = {
\ 'dir': '\v([\/]\.(git|hg|svn)|node_modules|bower_components|__pycache__|vendor|output|buildroot)$', \ 'dir': '\v([\/]\.(git|hg|svn)|log|node_modules|bower_components|__pycache__|vendor|output|buildroot)$',
\ 'file': '\v\.(exe|so|dll)$', \ 'file': '\v\.(exe|so|dll|o|pyc)$',
\ 'link': 'SOME_BAD_SYMBOLIC_LINKS', \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
\ } \ }
let g:ctrlp_map = '<c-p>'
let g:ctrlp_cmd = 'CtrlPMixed'
map <a-p> :CtrlPMRUFiles<CR>
""" TAGBAR """ """ TAGBAR """
nmap <F8> :TagbarToggle<CR> nmap <F8> :TagbarToggle<CR>
@ -68,7 +74,12 @@ let g:airline_theme = 'wombat'
""" YOUCOMPLETEME """ """ YOUCOMPLETEME """
let g:ycm_global_ycm_extra_conf = '~/.config/ycm_extra_conf.py' " let g:ycm_global_ycm_extra_conf = '~/.config/ycm_extra_conf.py'
let g:ycm_global_ycm_extra_conf = '/usr/share/vim/vimfiles/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
let g:ycm_server_python_interpreter = '/usr/bin/python2'
""" AUTOFORMAT """
nmap <F3> :Autoformat<CR>
""" JAVACOMPLETE """ """ JAVACOMPLETE """
@ -135,7 +146,14 @@ if has('persistent_undo')
set undofile set undofile
endif endif
" Allow saving of files as sudo when I forgot to start vim using sudo.
" From https://stackoverflow.com/a/7078429
cmap w!! w !sudo tee > /dev/null %
imap jk <Esc> imap jk <Esc>
imap <Esc> imap <Esc>
map <Enter> o<Esc> map <Enter> o<Esc>
nmap <C-B> :bp<CR>
nmap <C-N> :bn<CR>