diff --git a/.bashrc b/.bashrc index c543034..dec6805 100644 --- a/.bashrc +++ b/.bashrc @@ -19,7 +19,12 @@ unset color_prompt force_color_prompt # gitg branch views, line from https://gitlab.com/dhole/dot_files/blob/master/.bash_aliases#L39 alias gitg="git log --color --graph --abbrev-commit --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%ar)%C(cyan) %an<%ae>%Creset'" -# nvim alias +# ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# nvim & tmux alias alias n='nvim' alias t='tmux' @@ -34,3 +39,5 @@ export PATH="$HOME/.cargo/bin:$PATH" # python alias python='/usr/bin/python3.6' alias pip='/usr/bin/pip3' + +export EDITOR=nvim diff --git a/README.md b/README.md index 8f2dc71..4a02498 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,13 @@ config files - install https://github.com/junegunn/vim-plug - inside neovim, execute: `:PlugInstall` - `.bashrc` - - in `~/home` directory + - in `~/home/.bashrc` directory - execute `source .bashrc` - Tmux: `.tmux.conf` - - in `~/home` directory + - in `~/home/.tmux.conf` directory - Keyboard remap `.Xmodmap` - - in `~/home` + - in `~/home/.Xmodmap` - changes will be applied each session start - to apply changes in the current session use `xmodmap ~/.Xmodmap` +- Redshift `redshift.conf` + - in `~/.conf/redshift.conf` diff --git a/init.vim b/init.vim index 365a47f..b4d38d7 100644 --- a/init.vim +++ b/init.vim @@ -8,6 +8,7 @@ Plug 'airblade/vim-gitgutter' Plug 'Raimondi/delimitMate' Plug 'scrooloose/syntastic' Plug 'scrooloose/nerdcommenter' +Plug 'majutsushi/tagbar' " go Plug 'fatih/vim-go' " Amazing combination of features. @@ -94,6 +95,7 @@ let g:airline_theme='one' let g:airline#extensions#syntastic#enabled = 1 let g:airline#extensions#branch#enabled = 1 let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#buffer_nr_show = 1 let g:airline#extensions#tagbar#enabled = 1 let g:airline_skip_empty_sections = 1 @@ -128,6 +130,10 @@ noremap k noremap l noremap h +" scroll +set scrolloff=5 " keep at least 5 lines above/below +set sidescrolloff=5 " keep at least 5 lines left/right + " syntastic let g:syntastic_always_populate_loc_list=1 @@ -169,3 +175,4 @@ let g:go_highlight_extra_types = 1 "" esc mapping inoremap jk +tnoremap jk diff --git a/redshift.conf b/redshift.conf new file mode 100644 index 0000000..22cd34b --- /dev/null +++ b/redshift.conf @@ -0,0 +1,57 @@ +; Global settings for redshift +[redshift] +; Set the day and night screen temperatures +temp-day=5700 +; temp-night=3500 +temp-night=4500 + +; Enable/Disable a smooth transition between day and night +; 0 will cause a direct change from day to night screen temperature. +; 1 will gradually increase or decrease the screen temperature. +transition=1 + +; Set the screen brightness. Default is 1.0. +;brightness=0.9 +; It is also possible to use different settings for day and night +; since version 1.8. +;brightness-day=0.7 +;brightness-night=0.4 +; Set the screen gamma (for all colors, or each color channel +; individually) +gamma=0.8 +;gamma=0.8:0.7:0.8 +; This can also be set individually for day and night since +; version 1.10. +;gamma-day=0.8:0.7:0.8 +;gamma-night=0.6 + +; Set the location-provider: 'geoclue', 'geoclue2', 'manual' +; type 'redshift -l list' to see possible values. +; The location provider settings are in a different section. +location-provider=manual + +; Set the adjustment-method: 'randr', 'vidmode' +; type 'redshift -m list' to see all possible values. +; 'randr' is the preferred method, 'vidmode' is an older API. +; but works in some cases when 'randr' does not. +; The adjustment method settings are in a different section. +adjustment-method=randr + +; Configuration of the location-provider: +; type 'redshift -l PROVIDER:help' to see the settings. +; ex: 'redshift -l manual:help' +; Keep in mind that longitudes west of Greenwich (e.g. the Americas) +; are negative numbers. +[manual] +lat=48.8 +lon=2.3 + +; Configuration of the adjustment-method +; type 'redshift -m METHOD:help' to see the settings. +; ex: 'redshift -m randr:help' +; In this example, randr is configured to adjust screen 1. +; Note that the numbering starts from 0, so this is actually the +; second screen. If this option is not specified, Redshift will try +; to adjust _all_ screens. +; [randr] +; screen=1