Merge branch 'master' of git.joshfabean.com:fabean/Dotfiles

.config/fish/config.fish

@@ -15,6 +15,7 @@ alias ggpush='git push origin (git_current_branch)'
 alias docker-composer='docker-compose'
 alias docker-start='systemctl start docker'
 alias docker-stop='systemctl stop docker'
+alias mux='tmuxinator'
 
 function vpn-start
   sudo systemctl start openvpn-client@$1

.config/nvim/init.vim

@@ -36,8 +36,6 @@ Plug 'digitaltoad/vim-jade'
 "PHP
 Plug 'StanAngeloff/php.vim', {'for': 'php'}
 Plug 'lumiliet/vim-twig'
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plug 'padawan-php/deoplete-padawan', { 'for': 'php' }
 Plug 'roxma/LanguageServer-php-neovim',  {'do': 'composer install && composer run-script parse-stubs', 'for': 'php'}
 Plug 'SirVer/ultisnips' | Plug 'phux/vim-snippets'
 "Git plugin
@@ -55,7 +53,6 @@ Plug 'sbdchd/neoformat'
 function! DoRemote(arg)
   UpdateRemotePlugins
 endfunction
-Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') }
 
 call plug#end()
 
@@ -102,43 +99,6 @@ set statusline+=%*
 " let g:deoplete#sources = get(g:,'deoplete#sources',{})
 " let g:deoplete#sources.php = ['padawan', 'ultisnips', 'tags', 'buffer', 'LanguageClient']
 
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#enable_ignore_case = 1
-let g:deoplete#enable_smart_case = 1
-let g:deoplete#enable_camel_case = 1
-let g:deoplete#enable_refresh_always = 1
-let g:deoplete#file#enable_buffer_path = 1
-let g:deoplete#max_abbr_width = 0
-let g:deoplete#max_menu_width = 0
-let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
-let g:deoplete#omni#input_patterns.java = [
-    \'[^. \t0-9]\.\w*',
-    \'[^. \t0-9]\->\w*',
-    \'[^. \t0-9]\::\w*',
-    \]
-
-call deoplete#custom#source('buffer', 'mark', 'ℬ')
-call deoplete#custom#source('ternjs', 'mark', '')
-call deoplete#custom#source('omni', 'mark', '⌾')
-call deoplete#custom#source('file', 'mark', 'file')
-call deoplete#custom#source('jedi', 'mark', '')
-call deoplete#custom#source('typescript', 'mark', '')
-call deoplete#custom#source('neosnippet', 'mark', '')
-call deoplete#custom#source('java', 'mark', '')
-call deoplete#custom#source('javacomplete2', 'mark', '')
-
-call deoplete#custom#source('typescript',  'rank', 630)
-
-set completefunc=autoprogramming#complete
-let g:deoplete#auto_complete_delay = 50
-let g:deoplete#ignore_sources = get(g:,'deoplete#ignore_sources',{})
-let g:deoplete#ignore_sources.java = ['omni']
-let g:deoplete#ignore_sources.php = ['omni']
-let g:deoplete#omni#functions = get(g:,'deoplete#omni#functions',{})
-call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy'])
-inoremap <expr><C-h> deoplete#mappings#smart_close_popup()."\<C-h>"
-inoremap <expr><BS> deoplete#mappings#smart_close_popup()."\<C-h>"
-inoremap <expr><C-x><C-o> deoplete#mappings#manual_complete()
 
 function! GutentagsFilter(path) abort
     if fnamemodify(a:path, ':e') == 'java'

.config/sway/golem-sway

@@ -3,7 +3,7 @@
 set $mod Mod4
 set $alt Mod1
 
-font pango:FiraCode, FontAwesome 12
+font pango:FiraCode, FontAwesome 12, Noto
 
 bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbmap -option caps:escape
 
@@ -20,9 +20,9 @@ bindsym $mod+q kill
 bindsym $mod+$alt+s exec swaylock
 
 exec swayidle -w \
-  timeout 300 'swaylock'
+  timeout 600 'swaylock'
 exec swayidle -w \
-  timeout 600 'swaymsg "output * dpms off"'\
+  timeout 1200 'swaymsg "output * dpms off"'\
     resume 'swaymsg "output * dpms on"'
 #  before-sleep 'swaylock'
 
@@ -219,20 +219,21 @@ bindsym $mod+Control+Left resize shrink width 5 px or 5 ppt
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-  position top
-  status_command i3blocks
-  font pango:Liberation 10, FontAwesome 12
-  strip_workspace_numbers yes
-
-  colors {
-    separator #586e75
-    background #0c1014
-    statusline #aea79f
-    focused_workspace #091f2e #091f2e #ffffff
-    active_workspace #073642 #073642 #ffffff
-    inactive_workspace #0c1014 #0c1014 #aea79f
-    urgent_workspace #77216f #77216f #ffffff
-  }
+   swaybar_command waybar
+#  position top
+#  status_command i3blocks
+#  font pango:Liberation 10, FontAwesome 12
+#  strip_workspace_numbers yes
+#
+#  colors {
+#    separator #586e75
+#    background #0c1014
+#    statusline #aea79f
+#    focused_workspace #091f2e #091f2e #ffffff
+#    active_workspace #073642 #073642 #ffffff
+#    inactive_workspace #0c1014 #0c1014 #aea79f
+#    urgent_workspace #77216f #77216f #ffffff
+#  }
 }
 
 # class                 border  backgr. text    indicator child_border

.i3blocks.conf

@@ -10,7 +10,7 @@ command=/usr/lib/i3blocks/$BLOCK_NAME
 
 [ssid]
 #command=echo " $(iw dev wlp4s0 link | grep SSID | cut -d " " -f 2-)"
-command=/usr/lib/i3blocks/iface
+command=/usr/lib/i3blocks/iface/iface
 color=#00FF00
 separator=false
 interval=10
@@ -45,10 +45,12 @@ interval=5
 
 [memory]
 label=
-command=free -m | awk 'NR==2{printf "%.1fG", $3/1024 }'
+#command=free -m | awk 'NR==2{printf "%.1fG", $3/1024 }'
+command=/usr/lib/i3blocks/memory/memory | awk 'RN==1{print $1}'
 interval=30
 
 [temperature]
+command=/usr/lib/i3blocks/temperature/temperature
 label=
 interval=30