various updates for new installation

diff --git a/.gitmodules b/.gitmodules
index a0e2bbe..0cca69e 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "vim/.vim/bundle/vim-linux-coding-style"]
        path = vim/.vim/bundle/vim-linux-coding-style
        url = https://github.com/vivien/vim-linux-coding-style
+[submodule "vim/.vim/bundle/vim-clean"]
+       path = vim/.vim/bundle/vim-clean
+       url = git@github.com:camilstaps/vim-clean.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index b80f300..c05dc67 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,7 +15,6 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-conflict_resolution = a wins
 collections = ["default"]
 
 [storage contacts_local]
@@ -25,7 +24,7 @@ fileext = .vcf
 
 [storage contacts_remote]
 type = carddav
-url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
+url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart
 auth = digest
 username = mart
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
@@ -34,7 +33,6 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 [pair calendar]
 a = calendar_local
 b = calendar_remote
-conflict_resolution = a wins
 collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]
@@ -44,7 +42,7 @@ fileext = .ics
 
 [storage calendar_remote]
 type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
+url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart
 auth = digest
 username = mart
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
@@ -63,7 +61,7 @@ fileext = .ics
 
 [storage tasks_remote]
 type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart2/default
+url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart2
 auth = digest
 username = mart2
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]

diff --git a/pgp/.gnupg/gpg-agent.conf b/pgp/.gnupg/gpg-agent.conf
index c3e2eda..7c2333f 100644 (file)
--- a/pgp/.gnupg/gpg-agent.conf
+++ b/pgp/.gnupg/gpg-agent.conf
@@ -1,3 +1,3 @@
-pinentry-program /usr/bin/pinentry-qt
+pinentry-program /usr/bin/pinentry-qt4
 default-cache-ttl 3600
 enable-ssh-support

diff --git a/pkgs.sh b/pkgs.sh
index 66fb78a..b78e08a 100644 (file)
--- a/pkgs.sh
+++ b/pkgs.sh
@@ -3,13 +3,12 @@ sudo apt-get install \
        build-essential \
        dunst \
        flashplugin-nonfree \
+       firefox-esr \
        git \
        gv \
        i3-wm \
        i3status \
-       iotop \
        man-db \
-       mpd \
        msmtp \
        mutt  \
        ncmpcpp \
@@ -17,12 +16,9 @@ sudo apt-get install \
        notmuch-mutt \
        offlineimap \
        pass \
-       pavucontrol \
        pinentry-qt \
        psmisc \
-       puddletag \
-       pulseaudio \
-       python3-virtualenv  \
+       rxvt-unicode \
        stow \
        suckless-tools \
        unzip \
@@ -30,4 +26,5 @@ sudo apt-get install \
        virtualbox \
        w3m \
        x11-xserver-utils  \
-       xinit
+       xinit \
+       xautolock

diff --git a/shell/.bashrc b/shell/.bashrc
index 962f332..d8e6bbd 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -6,7 +6,7 @@ export HISTSIZE=NOTHING
 shopt -s histappend
 export PROMPT_COMMAND='history -a'
 
-export TERMINAL=urxvtc
+export TERMINAL=urxvtcd
 export EDITOR=vim
 export TERM=screen
 export BROWSER=firefox

diff --git a/vim/.vim/bundle/vim-clean b/vim/.vim/bundle/vim-clean
new file mode 160000 (submodule)
index 0000000..953e2de
--- /dev/null
+++ b/vim/.vim/bundle/vim-clean
@@ -0,0 +1 @@
+Subproject commit 953e2de868fa5a338c1e3634611de6c137bde7a4

diff --git a/vim/.vim/bundle/vim-syntastic.git b/vim/.vim/bundle/vim-syntastic.git
index 2b84b14..9b45d5c 160000 (submodule)
--- a/vim/.vim/bundle/vim-syntastic.git
+++ b/vim/.vim/bundle/vim-syntastic.git
@@ -1 +1 @@
-Subproject commit 2b84b14cd1ef0d4bb74d91ca08a8818d84d8982d
+Subproject commit 9b45d5c4b46031c29a31ba72fbf1dcb6f0db6d5f

diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index 8921ff8..f225525 100644 (file)
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -1 +1,7 @@
 microcontrollers
+reparandum
+Disfluencies
+disfluency
+disfluencies
+cepstral
+diphone

diff --git a/x/.config/i3/config b/x/.config/i3/config
index 7ef2947..ebfe484 100644 (file)
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -14,11 +14,7 @@ set $font DejaVu Sans Mono
 set $fontsize 12
 
 # lock the screen after 10 minutes
-exec xautolock -locker ~/.local/bin/lock.sh &\
-       dunst &\
-       urxvtd -q -o &\
-       .local/bin/bg &\
-       setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
+exec xautolock -locker ~/.local/bin/lock.sh & dunst & setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
 
 # Toggle playback
 bindsym Pause exec mpc toggle

diff --git a/x/.config/i3status/config b/x/.config/i3status/config
index 04d3a4a..e21a31b 100644 (file)
--- a/x/.config/i3status/config
+++ b/x/.config/i3status/config
@@ -3,8 +3,8 @@ general {
        interval = 3
 }
 
-order += "wireless wlp2s0"
-order += "ethernet enp5s0"
+order += "wireless wlan0"
+order += "ethernet eth0"
 order += "volume master"
 order += "disk /"
 order += "battery 0"
@@ -13,19 +13,19 @@ order += "tztime local"
 battery 0 {
        format = "%status %percentage"
        integer_battery_capacity = true
-       format_down = "No battery"
-       status_chr = "⚇ CHR"
-       status_bat = "⚡ BAT"
-       status_full = "☻ FULL"
+#      format_down = "No battery"
+#      status_chr = "⚇ CHR"
+#      status_bat = "⚡ BAT"
+#      status_full = "☻ FULL"
        path = "/sys/class/power_supply/BAT%d/uevent"
        low_threshold = 10
 }
 
-wireless wlp2s0 {
+wireless wlan0 {
        format_up = "W: (%quality at %essid) %ip"
        format_down = "W: down"
 }
-ethernet enp5s0 {
+ethernet eth0 {
        format_up = "E: %ip"
        format_down = "E: down"
 }