diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml index 26ea308..1c2e786 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -2,41 +2,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml index 9db6b09..ebaedc9 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -5,7 +5,8 @@ - - + + + diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index d062b36..c5924c0 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -23,11 +23,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 9c92c61..df6278c 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -10,6 +10,7 @@ + @@ -40,6 +41,7 @@ + @@ -73,8 +75,14 @@ - + + + + + + + diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml index 223b052..9c98f52 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -48,7 +48,7 @@ - + @@ -59,6 +59,10 @@ + + + + diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml index 9049b38..b4ace6d 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -3,7 +3,7 @@ - + diff --git a/.gitconfig b/.gitconfig index 34c6993..ad0f0b1 100644 --- a/.gitconfig +++ b/.gitconfig @@ -16,6 +16,8 @@ ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" praise = blame + blame = "gblame" + reabsorb = rebase -i --autosquash [diff] renamelimit = 0 diff --git a/.i3/config b/.i3/config index 8c3cb96..7c482e0 100644 --- a/.i3/config +++ b/.i3/config @@ -15,7 +15,7 @@ set $mod Mod1 # is used in the bar {} block below. # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). -font pango:DejaVu Sans Mono 13 +font pango:Droid Sans Mono 11 # Before i3 v4.8, we used to recommend this one as the default: # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 # The font above is very space-efficient, that is, it looks good, sharp and @@ -95,6 +95,8 @@ bindsym $mod+v split h # enter fullscreen mode for the focused container bindsym $mod+f fullscreen +bindsym $mod+b fullscreen toggle global + # change container layout (stacked, tabbed, toggle split) bindsym $mod+s layout stacking @@ -195,6 +197,7 @@ mode "moveworkspace" { } bindsym $mod+t mode "moveworkspace" +bindsym $mod+y move workspace to output left mode "goremote" { bindsym g exec "remmina -c ~/.local/share/remmina/1523485448993.remmina"; mode "default" diff --git a/.mailcap b/.mailcap index 3ba639f..fe3a855 100644 --- a/.mailcap +++ b/.mailcap @@ -1,3 +1,3 @@ -text/html; w3m -I %{charset} -T text/html -cols 150; copiousoutput; +text/html; w3m -I %{charset} -T text/html -cols 150 -o display_link_number=1; copiousoutput; #text/html; pandoc -f html -t markdown; copiousoutput; diff --git a/.vimrc b/.vimrc index 22fde15..5990542 100644 --- a/.vimrc +++ b/.vimrc @@ -100,6 +100,7 @@ Plug 'Shougo/deoplete.nvim' Plug 'zchee/deoplete-clang' Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}} Plug 'zchee/deoplete-jedi' +Plug 'davidhalter/jedi-vim' Plug 'b4winckler/vim-angry' Plug 'tristen/vim-sparkup' Plug 'vim-airline/vim-airline' @@ -153,6 +154,7 @@ Plug 'autozimu/LanguageClient-neovim', { Plug 'ambv/black' Plug 'kana/vim-textobj-user' Plug 'bps/vim-textobj-python' +Plug 'dhruvasagar/vim-zoom' call plug#end() @@ -225,6 +227,9 @@ let g:Tb_MaxSize=0 let g:Tb_MapCTabSwitchBufs = 1 let g:UseGooglePythonSettings = 0 +" * Jedi +let g:jedi#goto_command="gd" + " * Eclim let g:EclimCompletionMethod = 'omnifunc' @@ -242,9 +247,9 @@ let g:airline#extensions#ale#enabled = 1 let g:ale_set_highlights = 0 " * LanguageServer -let g:LanguageClient_serverCommands = { - \ 'python': ['pyls'], - \ } +"let g:LanguageClient_serverCommands = { + "\ 'python': ['pyls'], + "\ } let g:LanguageClient_diagnosticsDisplay = { \1: {'name': 'Error', 'texthl': 'ALEError', 'signText': 'E>', 'signTexthl': 'ALEErrorSign',}, \2: {"name": "Warning", "texthl": "ALEWarning", "signText": "W>", "signTexthl": "ALEWarningSign",}, @@ -383,7 +388,7 @@ let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15' " * Vim-Go let g:go_fmt_command = "goimports" -let g:go_auto_type_info = 1 +"let g:go_auto_type_info = 1 let g:go_updatetime = 300 "let g:go_bin_path = "$HOME/.go/bin" @@ -403,6 +408,7 @@ set statusline+=%{fugitive#statusline()}\ \ set statusline+=%c, "cursor column set statusline+=%l/%L "cursor line/total lines set statusline+=\ %P "percent through file +set statusline+=%{zoom#statusline()}\ " ** SMALL FUNCTIONS THAT DON'T FIT AS PLUGINS *** @@ -607,7 +613,7 @@ nmap P op " Line-based movement is cute, but it's tricky for files with lines that wrap. " Attune more to what you see on the screen instead of where the lines actually " are. -nnoremap j gj +nnoremap j gj nnoremap k gk xnoremap j gj xnoremap k gk @@ -649,6 +655,9 @@ inoremap $ "tnoremap h "endif +" Make it easier to clear highlighting, with no functionality penalty +nnoremap :noh + " Better fold mappings nnoremap @=(foldlevel('.')?'za':'l') vnoremap zf diff --git a/.zshrc b/.zshrc index 40a7b6a..3e4d2a0 100644 --- a/.zshrc +++ b/.zshrc @@ -131,3 +131,5 @@ if [ -f '/home/barak/local/google-cloud-sdk/path.zsh.inc' ]; then source '/home/ # The next line enables shell command completion for gcloud. if [ -f '/home/barak/local/google-cloud-sdk/completion.zsh.inc' ]; then source '/home/barak/local/google-cloud-sdk/completion.zsh.inc'; fi + +if [ -f "$HOME/.zshrc_work" ]; then source "$HOME/.zshrc_work"; fi