From b9949cd068f1b27bcd8c9e7518fe7b98e06f7ae2 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 01:29:21 +0100 Subject: Updating irssi settings. --- .irssi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.irssi b/.irssi index cde99ac..dc7cbe0 160000 --- a/.irssi +++ b/.irssi @@ -1 +1 @@ -Subproject commit cde99accbfdb6de6c7fd3c6e99b2d1bf8d37dd1c +Subproject commit dc7cbe0eb2a1f983b2bc28870a90a29afae31b1f -- cgit v1.2.3-70-g09d2 From cef4675b2d177d0d0a1c24a1154a77ea636f9f59 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:07:17 +0100 Subject: .compton.conf: Adding MPlayer to comptons exclude lists. --- .config/compton.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.config/compton.conf b/.config/compton.conf index dc15cc4..378058e 100644 --- a/.config/compton.conf +++ b/.config/compton.conf @@ -45,7 +45,8 @@ blur-background-exclude = [ "window_type = 'desktop'", "name *= 'VLC'", "name *= 'Firefox'", - "name *= 'Vimperator'" + "name *= 'Vimperator'", + "name *= 'MPlayer'" ]; # Exclude conditions for background blur. @@ -58,7 +59,8 @@ fade-out-step = 0.03; # Opacity change between steps while fading out. (defaul fade-exclude = [ "name *= 'VLC'", "name *= 'Firefox'", - "name *= 'Vimperator'" + "name *= 'Vimperator'", + "name *= 'MPlayer'" ]; # Exclude conditions for fading. # Other @@ -85,7 +87,8 @@ unredir-if-possible = false; # Unredirect all windows if a full-screen opaque w focus-exclude = [ "name *= 'VLC'", "name *= 'Firefox'", - "name *= 'Vimperator'" + "name *= 'Vimperator'", + "name *= 'MPlayer'" ]; # A list of conditions of windows that should always be considered # focused. detect-transient = true; # Use WM_TRANSIENT_FOR to group windows, and consider windows in -- cgit v1.2.3-70-g09d2 From fdcb79986ee62e4f96a003fa54b29e0502c6877e Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:08:08 +0100 Subject: .tmux.conf: Updating colours, incorporating tpm, removing powerline stuff. --- .tmux.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index bf77490..4a87909 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -62,16 +62,16 @@ set -g status-fg white set -g status-bg colour234 set -g pane-border-fg colour245 set -g pane-active-border-fg colour39 -set -g message-fg colour16 +set -g message-fg white set -g message-bg colour221 set -g message-attr bold # set status-interval to 2 for tmux-mem-cpu-load -set -g status-interval 2 -set -g status-left '#[fg=colour235,bg=colour252,bold] #(hostname) #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀' -set -g status-right "#[fg=colour235,bg=colour252]⮀#[fg=colour235,bg=colour252,bold] CPU:#{cpu_percentage} #{cpu_icon} Battery:#{battery_percentage} #{battery_icon}#[fg=colour252,bg=colour39]⮀#[fg=colour39,bg=colour234]⮀#[fg=colour39,bg=colour234] %H:%M ⮂" -set -g window-status-format "#[fg=colour235,bg=colour252,bold] #I #W " -set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]⮀" +set -g status-interval 1 +set -g status-left '#[fg=colour235,bg=colour252,bold] #(hostname) #[fg=colour245,bg=colour238,bold] #(whoami) (#S) ' +set -g status-right '#[fg=colour23,bg=colour234]|>#[fg=white,bg=colour234]#{cpu_percentage} #{cpu_icon} #{battery_percentage} #{battery_icon}#[fg=colour23,bg=colour234]<||>#[fg=white,bg=colour234] %H:%M:%S #[fg=colour23,bg=colour234]<|' +set -g window-status-format '#[fg=colour235,bg=colour252,bold] #I: #W ' +set -g window-status-current-format '#[fg=black,bg=colour23,noreverse,bold] #I: #W ' # No escape time for vi mode set -sg escape-time 0 -- cgit v1.2.3-70-g09d2 From 6ad6ecf882153a4c8fe460991f7b6ce59b0a2ff8 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:10:12 +0100 Subject: pavucontrol.ini: Removing, as it's going to be rewritten each call anyways. --- .config/pavucontrol.ini | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .config/pavucontrol.ini diff --git a/.config/pavucontrol.ini b/.config/pavucontrol.ini deleted file mode 100644 index 5931a51..0000000 --- a/.config/pavucontrol.ini +++ /dev/null @@ -1,3 +0,0 @@ -[window] -width=960 -height=600 -- cgit v1.2.3-70-g09d2 From 48450296bb0bb71ac7e8b78b729df51001b057cf Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:11:01 +0100 Subject: termite/config: Switching to Inconsolata (made available through powerline-fonts-git). --- .config/termite/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/termite/config b/.config/termite/config index b1158e3..16d01da 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -7,7 +7,7 @@ allow_bold = true dynamic_title = true urgent_on_bell = true clickable_url = true -font = Monospace 9 +font = Inconsolata 10 scrollback_lines = 10000 search_wrap = true icon_name = terminal -- cgit v1.2.3-70-g09d2 From 38e2adaa54ca6e5a08184822eabc738894a73fce Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:12:33 +0100 Subject: .vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise. --- .vdirsyncer/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vdirsyncer/config b/.vdirsyncer/config index e8ec980..7f04a07 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -4,7 +4,7 @@ # http://vdirsyncer.readthedocs.org/ for the rest of them. [general] # A folder where vdirsyncer can store some metadata about each pair. -status_path = ~/.vdirsyncer/status/ +status_path = "~/.vdirsyncer/status/" password_command = pass2vdirsyncer # CARDDAV @@ -36,7 +36,7 @@ conflict_resolution = "b wins" # A storage references actual data on a remote server or on the local disk. # Similar to repositories in OfflineIMAP. type = filesystem -path = ~/.contacts/ +path = "~/.contacts/" fileext = .vcf [storage dave_contacts_remote] @@ -60,7 +60,7 @@ b = dave_calendar_remote collections = ["contact_birthdays", "private", "unix-pool", "courses", "live", "concerts", "d228"] [storage dave_calendar_local] type = filesystem -path = ~/.calendars/ +path = "~/.calendars/" fileext = .ics [storage dave_calendar_remote] type = caldav -- cgit v1.2.3-70-g09d2 From 57e415a858c86bb21d85a28cac93fbab7156963f Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:21:43 +0100 Subject: .vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters. --- .vim/addons-settings.vim | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.vim/addons-settings.vim b/.vim/addons-settings.vim index 77a36aa..234ede3 100644 --- a/.vim/addons-settings.vim +++ b/.vim/addons-settings.vim @@ -80,24 +80,25 @@ autocmd BufRead,BufNewFile *.js set ft=javascript syntax=jquery " ================ lightline settings ================ let g:lightline = { - \ 'colorscheme': 'wombat', - \ 'active': { - \ 'left': [ [ 'mode' ], - \ [ 'fugitive', 'readonly', 'filename', 'modified' ] ] - \ }, - \ 'component': { - \ 'readonly': '%{&readonly?"⭤":""}', - \ 'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}' - \ }, - \ 'component_visible_condition': { - \ 'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())' - \ }, - \ 'separator': { 'left': '⮀', 'right': '⮂' }, - \ 'subseparator': { 'left': '⮁', 'right': '⮃' } - \ } + \ 'colorscheme': 'solarized', + \ 'active': { + \ 'left': [ [ 'mode' ], + \ [ 'fugitive', 'readonly', 'filename', 'modified' ] ] + \ }, + \ 'component': { + \ 'readonly': '%{&readonly?"x":""}', + \ 'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}' + \ }, + \ 'component_visible_condition': { + \ 'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())' + \ }, + \ 'separator': { 'left': '', 'right': '' }, + \ 'subseparator': { 'left': '|', 'right': '|' } + \ } set laststatus=2 + " ================ nerdtree-tabs settings ================ " Auto open nerd tree on startup let g:nerdtree_tabs_open_on_gui_startup = 0 -- cgit v1.2.3-70-g09d2 From ef381139ca73f54241361b765b1425b286dd5226 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:31:22 +0100 Subject: .irssi: Updating .irssi submodule to latest commit. --- .irssi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.irssi b/.irssi index dc7cbe0..3e5e75e 160000 --- a/.irssi +++ b/.irssi @@ -1 +1 @@ -Subproject commit dc7cbe0eb2a1f983b2bc28870a90a29afae31b1f +Subproject commit 3e5e75ef876861969f8f180881d2e177893dbbc9 -- cgit v1.2.3-70-g09d2 From 1c2eee2f51ded88b73ff9654f900ae76bf5f78d1 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:40:50 +0100 Subject: .zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1 --- .zprezto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zprezto b/.zprezto index d43bcb9..c34098a 160000 --- a/.zprezto +++ b/.zprezto @@ -1 +1 @@ -Subproject commit d43bcb972091878efa3692100e8479fb887332f5 +Subproject commit c34098af20cafdf016f68f3e7f612ed60ca93aa1 -- cgit v1.2.3-70-g09d2 From ee3595f9db37e9d28f1d5e85762e788f93b8a9f4 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:48:24 +0100 Subject: .gitignore: Adding some now unneeded stuff that will popup from time to time. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 1b10e17..0c32385 100644 --- a/.gitignore +++ b/.gitignore @@ -97,6 +97,7 @@ svn/ .config/asunder .config/aurvote .config/autostart/ +.config/autorandr/ .config/awesome/ .config/brasero/ .config/calibre/ @@ -114,6 +115,7 @@ svn/ .config/geeqie/ .config/ghb/ .config/goobox/ +.config/gsmartcontrol/ .config/gtk-2.0/ .config/guitarix/ .config/htop/ @@ -138,6 +140,7 @@ svn/ .config/nautilus-actions/ .config/nautilus/ .config/octave/ +.config/pavucontrol.ini .config/pd-extended/ .config/pulse/ .config/pure-data/ @@ -338,6 +341,7 @@ svn/ .vimperator/ .vimpressrc .viminfo +.viminfo.tmp .vmoviedb/ .wine .wireshark/ -- cgit v1.2.3-70-g09d2 From c377702f4c9cb27df06ae534c185ed25ab9c6262 Mon Sep 17 00:00:00 2001 From: David Runge Date: Wed, 11 Mar 2015 17:54:16 +0100 Subject: .irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule). --- .gitignore | 4 +--- .gitmodules | 4 ---- .irssi | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 160000 .irssi diff --git a/.gitignore b/.gitignore index 0c32385..14138d8 100644 --- a/.gitignore +++ b/.gitignore @@ -208,9 +208,7 @@ svn/ .hydrogen .icedtea/ .inkscape/ -.irssi/config.* -.irssi/logs/ -.irssi/away.log +.irssi/ .iscan_preference .jackdrc .java/ diff --git a/.gitmodules b/.gitmodules index 2dfb368..958a616 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = .zprezto url = https://github.com/sorin-ionescu/prezto branch = master -[submodule ".irssi"] - path = .irssi - url = git@sleepmap.de:irssi - branch = master [submodule ".password-store"] path = .password-store url = git@sleepmap.de:password-store diff --git a/.irssi b/.irssi deleted file mode 160000 index 3e5e75e..0000000 --- a/.irssi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e5e75ef876861969f8f180881d2e177893dbbc9 -- cgit v1.2.3-70-g09d2