diff options
| -rw-r--r-- | .vimrc | 50 | ||||
| -rw-r--r-- | .xinitrc | 3 | ||||
| -rw-r--r-- | .zprofile | 3 | ||||
| -rw-r--r-- | .zshrc | 22 |
4 files changed, 16 insertions, 62 deletions
@@ -13,6 +13,7 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-repeat' +Plugin 'tpope/vim-fugitive' Plugin 'vim-latex/vim-latex' @@ -29,6 +30,7 @@ else endif Plugin 'agude/vim-eldar' +Plugin 'scrooloose/nerdtree' " Track the engine. Plugin 'SirVer/ultisnips' @@ -52,52 +54,16 @@ set noexpandtab let g:deoplete#enable_at_startup = 1 - -inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" -inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>" - - tnoremap <C-e> <C-\><C-n> " Map C-s noremap <silent> <C-S> :update<CR> -" Make ToBegin and ToEnd -function! InputChar() - let c = getchar() - return type(c) == type(0) ? nr2char(c) : c -endfunction - -function! ToEnd() - let s = InputChar() - if s =~ "\<esc>" || s =~ "\<c-c>" - return - endif - execute "normal! vi". s. "\<Esc>" -endfunction - -function! ToBegin() - call ToEnd() - execute "'<" -endfunction - -nnoremap <silent> ge :call ToEnd()<cr> -nnoremap <silent> gb :call ToBegin()<cr> - map <C-n> :NERDTreeToggle<CR> " Required for operations modifying multiple buffers like rename. set hidden -let g:LanguageClient_serverCommands = { - \ 'rust': ['rustup', 'run', 'stable', 'rls'], - \ } - -"nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR> -"nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR> -"nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR> -"nnoremap <F5> :call LanguageClient_contextMenu()<CR> - " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. let g:UltiSnipsExpandTrigger="<c-b>" @@ -107,16 +73,9 @@ let g:UltiSnipsJumpBackwardTrigger="<c-z>" " If you want :UltiSnipsEdit to split your window. let g:UltiSnipsEditSplit="vertical" - inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>" - -" Run binding -nnoremap <F5> :!terminator -e '"%:p" ;read -n 1'<CR> -set completeopt-=preview - - " File finding set path+=** set wildmenu @@ -124,6 +83,5 @@ set wildmenu let g:netrw_liststyle=3 -" Snippits - -nnoremap ,html :-1read $HOME/.vim/snippets/skeleton.html<CR> +set inccommand=split +autocmd FileType python setlocal completeopt-=preview @@ -1,7 +1,6 @@ setxkbmap -layout us -variant altgr-intl xcape -e "Control_L=Escape" -feh --bg-fill /home/julian/Pictures/up1.jpg -setxkbmap dk +feh --bg-fill /home/julian/Pictures/up2.jpg export _JAVA_AWT_WM_NONREPARENTING=1 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) diff --git a/.zprofile b/.zprofile new file mode 100644 index 0000000..b78f84a --- /dev/null +++ b/.zprofile @@ -0,0 +1,3 @@ +if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then + exec startx +fi @@ -10,7 +10,7 @@ echo "Setting theme" # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="bullet-train" +ZSH_THEME="af-magic" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -55,7 +55,7 @@ echo "Loading plugins" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git sudo zsh-syntax-highlighting) +plugins=(git sudo) echo "Loading zsh" source $ZSH/oh-my-zsh.sh @@ -134,15 +134,9 @@ SUDO_EDITOR=nvim alias vimvimvim="vim" - - -ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor) -ZSH_HIGHLIGHT_PATTERNS=('rm -rf *' 'fg=white,bold,bg=red') -ZSH_HIGHLIGHT_PATTERNS+=('-*$' 'fg=yellow,bold') -ZSH_HIGHLIGHT_PATTERNS+=('-* ' 'fg=yellow,bold') -ZSH_HIGHLIGHT_PATTERNS+=('"*"' 'fg=green,bold') - -ZSH_HIGHLIGHT_STYLES[suffix-alias]=fg=blue,underline,bold -ZSH_HIGHLIGHT_STYLES[precommand]=fg=blue,underline,bold -ZSH_HIGHLIGHT_STYLES[arg0]=fg=white - +# Gem +# Install Ruby Gems to ~/gems +export GEM_HOME=$HOME/gems +export PATH=$HOME/gems/bin:$PATH +PATH=/home/julian/.gem/ruby/2.5.0/bin:$PATH +PATH=/home/julian/.local/bin:$PATH |