misc work fixes

This commit is contained in:
Barak Michener 2019-01-29 16:02:37 -08:00
parent b1f0fba89a
commit 9a13fa283d
11 changed files with 131 additions and 37 deletions

View file

@ -2,41 +2,41 @@
<channel name="displays" version="1.0">
<property name="Default" type="empty">
<property name="eDP1" type="string" value="1. LGD 14&quot;">
<property name="eDP1" type="string" value="Laptop">
<property name="Active" type="bool" value="false"/>
<property name="Resolution" type="string" value="2560x1440"/>
<property name="RefreshRate" type="double" value="59.997716"/>
<property name="Rotation" type="int" value="0"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="false"/>
<property name="Position" type="empty">
<property name="X" type="int" value="0"/>
<property name="Y" type="int" value="0"/>
</property>
</property>
<property name="DP2" type="string" value="3. Hewlett Packard 27&quot;">
<property name="Active" type="bool" value="true"/>
<property name="Resolution" type="string" value="3840x2160"/>
<property name="RefreshRate" type="double" value="30.000000"/>
<property name="Rotation" type="int" value="0"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="false"/>
<property name="Position" type="empty">
<property name="X" type="int" value="3840"/>
<property name="Y" type="int" value="0"/>
</property>
</property>
<property name="DP1" type="string" value="2. HPN 27&quot;">
<property name="Active" type="bool" value="true"/>
<property name="Resolution" type="string" value="3840x2160"/>
<property name="RefreshRate" type="double" value="59.996625"/>
<property name="Rotation" type="int" value="0"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="true"/>
<property name="Position" type="empty">
<property name="X" type="int" value="0"/>
<property name="Y" type="int" value="0"/>
</property>
</property>
<property name="DP2" type="string" value="2. Hewlett Packard 27&quot;">
<property name="Active" type="bool" value="true"/>
<property name="Resolution" type="string" value="3840x2160"/>
<property name="RefreshRate" type="double" value="59.996625"/>
<property name="Rotation" type="int" value="0"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="false"/>
<property name="Position" type="empty">
<property name="X" type="int" value="0"/>
<property name="Y" type="int" value="0"/>
</property>
</property>
<property name="DP1" type="string" value="2. Hewlett Packard 27&quot;">
<property name="Active" type="bool" value="true"/>
<property name="Resolution" type="string" value="3840x2160"/>
<property name="RefreshRate" type="double" value="59.996625"/>
<property name="Rotation" type="int" value="0"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="false"/>
<property name="Position" type="empty">
<property name="X" type="int" value="0"/>
<property name="Y" type="int" value="0"/>
</property>
</property>
</property>
</channel>

View file

@ -5,7 +5,8 @@
<property name="shortcuts-icon-size" type="empty"/>
<property name="last-view" type="string" value="ThunarIconView"/>
<property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_NORMAL"/>
<property name="last-window-width" type="int" value="1916"/>
<property name="last-window-height" type="int" value="2131"/>
<property name="last-window-width" type="int" value="1276"/>
<property name="last-window-height" type="int" value="2156"/>
<property name="last-window-maximized" type="bool" value="false"/>
<property name="last-separator-position" type="int" value="170"/>
</channel>

View file

@ -23,11 +23,76 @@
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
</property>
<property name="workspace1" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace2" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace3" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace4" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace5" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace6" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
</property>
<property name="monitor1" type="empty">
<property name="image-path" type="empty"/>
<property name="image-style" type="empty"/>
<property name="image-show" type="empty"/>
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace1" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace2" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace3" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace4" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace5" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
<property name="workspace6" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-teal.jpg"/>
</property>
</property>
</property>
</property>

View file

@ -10,6 +10,7 @@
<value type="int" value="12"/>
<value type="int" value="2"/>
<value type="int" value="3"/>
<value type="int" value="5"/>
<value type="int" value="1"/>
<value type="int" value="4"/>
<value type="int" value="10"/>
@ -40,6 +41,7 @@
<property name="names-visible" type="array">
<value type="string" value="network"/>
<value type="string" value="networkmanager applet"/>
<value type="string" value="vlc"/>
<value type="string" value="blueman-applet"/>
<value type="string" value="remmina"/>
<value type="string" value="google-chrome"/>
@ -73,8 +75,14 @@
<property name="plugin-11" type="string" value="clock">
<property name="digital-format" type="string" value="%d %b, %H:%M:%S"/>
</property>
<property name="plugin-12" type="string" value="pager"/>
<property name="plugin-12" type="string" value="pager">
<property name="rows" type="uint" value="1"/>
</property>
<property name="plugin-1" type="string" value="power-manager-plugin"/>
<property name="plugin-5" type="string" value="pulseaudio">
<property name="enable-keyboard-shortcuts" type="bool" value="true"/>
<property name="mpris-players" type="string" value="vlc;vlc.instance21619;vlc.instance21775;vlc.instance21847"/>
</property>
</property>
<property name="configver" type="int" value="2"/>
</channel>

View file

@ -48,7 +48,7 @@
<property name="title_vertical_offset_inactive" type="empty"/>
<property name="urgent_blink" type="empty"/>
<property name="use_compositing" type="empty"/>
<property name="workspace_count" type="int" value="7"/>
<property name="workspace_count" type="int" value="6"/>
<property name="workspace_names" type="array">
<value type="string" value="1"/>
<value type="string" value="2"/>
@ -59,6 +59,10 @@
<value type="string" value="10"/>
<value type="string" value="Workspace 8"/>
<value type="string" value="Workspace 9"/>
<value type="string" value="10"/>
<value type="string" value="1"/>
<value type="string" value="1"/>
<value type="string" value="1"/>
</property>
<property name="wrap_resistance" type="empty"/>
<property name="wrap_windows" type="empty"/>

View file

@ -3,7 +3,7 @@
<channel name="xsettings" version="1.0">
<property name="Net" type="empty">
<property name="ThemeName" type="string" value="Arc"/>
<property name="IconThemeName" type="string" value="elementary-xfce"/>
<property name="IconThemeName" type="string" value="elementary-xfce-dark"/>
<property name="DoubleClickTime" type="empty"/>
<property name="DoubleClickDistance" type="empty"/>
<property name="DndDragThreshold" type="empty"/>

View file

@ -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

View file

@ -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"

View file

@ -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;

19
.vimrc
View file

@ -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 o<Esc>p
" 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 <silent> j gj
nnoremap k gk
xnoremap j gj
xnoremap k gk
@ -649,6 +655,9 @@ inoremap <C-e> <C-O>$
"tnoremap <C-h> <C-\><C-n><C-w>h
"endif
" Make it easier to clear highlighting, with no functionality penalty
nnoremap <CR> :noh<CR><CR>
" Better fold mappings
nnoremap <silent> <Space> @=(foldlevel('.')?'za':'l')<CR>
vnoremap <Space> zf

2
.zshrc
View file

@ -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