aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2015-03-11 18:50:47 +0100
committerDavid Runge <dave@sleepmap.de>2015-03-11 18:50:47 +0100
commit378c9f89e43d135f6b8c7ae263643441d1193758 (patch)
tree186d216eab682164d82f5c466e769ee9bf8c1726
parent78d47f7aca8e4f47c0d6714a7cb0095ff1975e07 (diff)
parentc377702f4c9cb27df06ae534c185ed25ab9c6262 (diff)
downloaddotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.gz
dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.bz2
dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.xz
dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.zip
Merge branch 'master' of sleepmap.de:dotfiles
* 'master' of sleepmap.de:dotfiles: .irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule). .gitignore: Adding some now unneeded stuff that will popup from time to time. .zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1 .irssi: Updating .irssi submodule to latest commit. .vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters. .vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise. termite/config: Switching to Inconsolata (made available through powerline-fonts-git). pavucontrol.ini: Removing, as it's going to be rewritten each call anyways. .tmux.conf: Updating colours, incorporating tpm, removing powerline stuff. .compton.conf: Adding MPlayer to comptons exclude lists. Updating irssi settings.
-rw-r--r--.config/compton.conf9
-rw-r--r--.config/pavucontrol.ini3
-rw-r--r--.config/termite/config2
-rw-r--r--.gitignore8
-rw-r--r--.gitmodules4
m---------.irssi0
-rw-r--r--.tmux.conf12
-rw-r--r--.vdirsyncer/config6
-rw-r--r--.vim/addons-settings.vim31
m---------.zprezto0
10 files changed, 37 insertions, 38 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
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
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
diff --git a/.gitignore b/.gitignore
index 1b10e17..14138d8 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/
@@ -205,9 +208,7 @@ svn/
.hydrogen
.icedtea/
.inkscape/
-.irssi/config.*
-.irssi/logs/
-.irssi/away.log
+.irssi/
.iscan_preference
.jackdrc
.java/
@@ -338,6 +339,7 @@ svn/
.vimperator/
.vimpressrc
.viminfo
+.viminfo.tmp
.vmoviedb/
.wine
.wireshark/
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
-Subproject cde99accbfdb6de6c7fd3c6e99b2d1bf8d37dd1
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
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
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
diff --git a/.zprezto b/.zprezto
-Subproject d43bcb972091878efa3692100e8479fb887332f
+Subproject c34098af20cafdf016f68f3e7f612ed60ca93aa