Vimrc fix

This commit is contained in:
Daan Vanoverloop 2019-11-04 08:36:43 +01:00
parent 87000b607c
commit 0d908b1679
12 changed files with 83 additions and 37 deletions

View File

@ -1,16 +1,29 @@
return { return {
widgets = { widgets = {
left = { top = {
left = {
},
mid = {
},
right = {
"volume",
"clock"
}
}, },
mid = { bottom = {
"mpd" left = {
},
right = { },
"memory", mid = {
"cpu", "mpd"
"volume", },
"clock" right = {
"memory",
"cpu",
"thermal",
}
} }
}, },
volume = { volume = {

View File

@ -237,9 +237,9 @@ mode "resize" {
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"
# Pulse Audio controls # Pulse Audio controls
bindsym XF86AudioRaiseVolume exec --no-startup-id sh -c "pactl set-sink-mute 0 false && pactl set-sink-volume 0 +5%" bindsym XF86AudioRaiseVolume exec --no-startup-id sh -c "pactl set-sink-mute 1 false && pactl set-sink-volume 1 +5%"
bindsym XF86AudioLowerVolume exec --no-startup-id sh -c "pactl set-sink-mute 0 false && pactl set-sink-volume 0 -5%" bindsym XF86AudioLowerVolume exec --no-startup-id sh -c "pactl set-sink-mute 1 false && pactl set-sink-volume 1 -5%"
bindsym XF86AudioMute exec --no-startup-id sh -c "pactl set-sink-mute 0 toggle" bindsym XF86AudioMute exec --no-startup-id sh -c "pactl set-sink-mute 1 toggle"
# Workspace assignment # Workspace assignment

Binary file not shown.

View File

@ -1,7 +1,8 @@
sw_volume: 25 sw_volume: 25
audio_device_state:1:pulse audio audio_device_state:1:pulse audio
state: stop state: pause
current: 0 current: 5
time: 226.287000
random: 0 random: 0
repeat: 0 repeat: 0
single: 0 single: 0
@ -10,11 +11,19 @@ crossfade: 0
mixrampdb: 0.000000 mixrampdb: 0.000000
mixrampdelay: -1.000000 mixrampdelay: -1.000000
playlist_begin playlist_begin
0:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 01 A Three-Legged Workhorse.flac 0:Frightened Rabbit - P. Of A P.A. (2016) DE/01. Death Dream.mp3
1:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 02 Villa del Refugio.flac 1:Frightened Rabbit - P. Of A P.A. (2016) DE/02. Get Out.mp3
2:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 03 Threads.flac 2:Frightened Rabbit - P. Of A P.A. (2016) DE/03. I Wish I Was Sober.mp3
3:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 04 Leather Wings.flac 3:Frightened Rabbit - P. Of A P.A. (2016) DE/04. Woke Up Hurting.mp3
4:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 05 The Mighty Rio Grande.flac 4:Frightened Rabbit - P. Of A P.A. (2016) DE/05. Little Drum.mp3
5:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 06 They Move on Tracks of Never-Ending Light.flac 5:Frightened Rabbit - P. Of A P.A. (2016) DE/06. Still Want To Be Here.mp3
6:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 07 Burial on the Presidio Banks.flac 6:Frightened Rabbit - P. Of A P.A. (2016) DE/07. An Otherwise Disappointing Life.mp3
7:Frightened Rabbit - P. Of A P.A. (2016) DE/08. Break.mp3
8:Frightened Rabbit - P. Of A P.A. (2016) DE/09. Blood Under The Bridge.mp3
9:Frightened Rabbit - P. Of A P.A. (2016) DE/10. 400 Bones.mp3
10:Frightened Rabbit - P. Of A P.A. (2016) DE/11. Lump Street.mp3
11:Frightened Rabbit - P. Of A P.A. (2016) DE/12. Die Like A Rich Boy.mp3
12:Frightened Rabbit - P. Of A P.A. (2016) DE/13. The Wreck.mp3
13:Frightened Rabbit - P. Of A P.A. (2016) DE/14. Wait 'Til The Morning.mp3
14:Frightened Rabbit - P. Of A P.A. (2016) DE/15. A Lick Of Paint.mp3
playlist_end playlist_end

View File

@ -53,9 +53,7 @@ font-5 = "Font Awesome 5 Brands:pixelsize=12;1"
modules-left = i3 workspaces-xmonad modules-left = i3 workspaces-xmonad
modules-center = xwindow modules-center = xwindow
;weather update installed ;weather update installed
modules-right = temperature xbacklight volume wlan battery date modules-right = temperature xbacklight memory volume wlan battery date
tray-postion = right
override-redirect = false override-redirect = false

View File

@ -5,11 +5,11 @@ killall polybar
if type "xrandr"; then if type "xrandr"; then
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
MONITOR=$m polybar --reload bar1 & MONITOR=$m polybar --reload bar1 &
MONITOR=$m polybar --reload touchbar & #MONITOR=$m polybar --reload touchbar &
done done
else else
polybar --reload bar1 & polybar --reload bar1 &
polybar --reload touchbar & #polybar --reload touchbar &
fi fi
sleep 1 sleep 1

@ -1 +0,0 @@
Subproject commit d556a43c1af6a4e4075e875934e250f589df0dee

@ -1 +1 @@
Subproject commit 80c242c3c5394fd5143b5d7e2741989ba04ae46a Subproject commit bc82a1c7b6d8517d4e9224a254968e0f0b334fdf

@ -1 +1 @@
Subproject commit 1c803b36f632c151c755456b68101153f407ec5e Subproject commit 63c59208c1f9eef7068a944f5c3033bd1a348b97

@ -1 +0,0 @@
Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172

29
.vimrc
View File

@ -15,7 +15,7 @@ call plug#begin()
Plug 'Shougo/deoplete.nvim' Plug 'Shougo/deoplete.nvim'
Plug 'roxma/nvim-yarp' Plug 'roxma/nvim-yarp'
Plug 'roxma/vim-hug-neovim-rpc' Plug 'roxma/vim-hug-neovim-rpc'
Plug 'tbodt/deoplete-tabnine', { 'do': './install.sh' } "Plug 'tbodt/deoplete-tabnine', { 'do': './install.sh' }
Plug 'jpalardy/vim-slime' Plug 'jpalardy/vim-slime'
Plug 'autozimu/LanguageClient-neovim', { Plug 'autozimu/LanguageClient-neovim', {
\ 'branch': 'next', \ 'branch': 'next',
@ -27,6 +27,10 @@ call plug#end() " required
filetype plugin indent on " required filetype plugin indent on " required
let g:deoplete#enable_at_startup = 1 let g:deoplete#enable_at_startup = 1
let g:LanguageClient_serverCommands = {
\ 'lua': ['lua-lsp'],
\ }
let g:LanguageClient_autoStart = 1
set tags+=./.tags set tags+=./.tags
@ -34,9 +38,22 @@ set tags+=./.tags
set switchbuf=useopen,usetab set switchbuf=useopen,usetab
let g:session = 0
fu! AutoSaveSess()
if g:session == 1
call SaveSess()
endif
endfunction
fu! SaveSess() fu! SaveSess()
execute 'NERDTreeTabsClose'
execute 'mksession! ' . getcwd() . '/.session.vim' execute 'mksession! ' . getcwd() . '/.session.vim'
let g:session = 1
endfunction
fu! RemoveSess()
shell "rm " . getcwd() . "/.session.vim"
endfunction endfunction
fu! RestoreSess() fu! RestoreSess()
@ -50,15 +67,19 @@ if filereadable(getcwd() . '/.session.vim')
execute 'sb ' . file execute 'sb ' . file
endif endif
endfor endfor
let g:session = 1
endif endif
endfunction endfunction
:command Savesess call SaveSess()
:command Restoresess call RestoreSess()
:command Removesess call RemoveSess()
" Save session on quitting Vim " Save session on quitting Vim
autocmd VimLeave * NERDTreeTabsClose autocmd VimLeave * call AutoSaveSess()
autocmd VimLeave * call SaveSess()
" Restore session on starting Vim " Restore session on starting Vim
autocmd VimEnter * nested call RestoreSess() "autocmd VimEnter * nested call RestoreSess()
"---------------------- "----------------------

13
.zshrc
View File

@ -1,5 +1,6 @@
# If you come from bash you might have to change your $PATH. # If you come from bash you might have to change your $PATH.
export PATH=$HOME/bin:/usr/local/bin:$PATH export PATH=$HOME/bin:/usr/local/bin:$PATH
export PATH="$PATH:$HOME/go/bin:$HOME/.cargo/bin"
export ZSH=/usr/share/oh-my-zsh export ZSH=/usr/share/oh-my-zsh
@ -50,6 +51,11 @@ export ZSH=/usr/share/oh-my-zsh
#POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(${P9K__RIGHT}) #POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(${P9K__RIGHT})
#POWERLEVEL9K_SHOW_CHANGESET=true #POWERLEVEL9K_SHOW_CHANGESET=true
#
if [[ $TERM == xterm-termite ]]; then
. /etc/profile.d/vte.sh
__vte_osc7
fi
HYPHEN_INSENSITIVE="true" HYPHEN_INSENSITIVE="true"
COMPLETION_WAITING_DOTS="true" COMPLETION_WAITING_DOTS="true"
@ -176,12 +182,12 @@ c() {
alias ga="git add ." alias ga="git add ."
alias gc="git commit -m" alias gc="git commit -m"
alias gac="git commit -a -m"
alias gpsh="git push" alias gpsh="git push"
alias gpll="git pull" alias gpll="git pull"
gacp() { gacp() {
ga && gac $1 &&
gc $1 &&
gpsh gpsh
} }
@ -198,7 +204,7 @@ alias v="vi"
# Scripts # Scripts
alias rotate="~/.config/i3/rotate.sh" alias rotate="~/.config/i3/rotate.sh"
alias tp='source tp' #alias tp='source tp'
alias ant="JAVA_HOME=/usr/lib/jvm/java-11-openjdk ant" alias ant="JAVA_HOME=/usr/lib/jvm/java-11-openjdk ant"
@ -220,3 +226,4 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
eval $(thefuck --alias) eval $(thefuck --alias)
alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan' alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan' alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
source /home/daan/.local/bin/tp