update i3, vim ignore, bashrc everything

diff --git a/.Xresources b/.Xresources
index a244959..5cfd8e5 100644 (file)
--- a/.Xresources
+++ b/.Xresources
@@ -26,9 +26,9 @@ Urxvt.color15: rgb:fc/fc/fc
 Urxvt.colorBD: rgb:fc/fc/fc
 URxvt.fading: 25
 URxvt.font: xft:DejaVu Sans Mono:style=Book:pixelsize=12
-URxvt.boldFont: DejaVu Sans Mono:style=Bold:pixelsize=12
-URxvt.italicFont: DejaVu Sans Mono:style=Oblique:pixelsize=12
-URxvt.boldItalicFont: DejaVu Sans Mono:style=Bold Oblique:pixelsize=12
+URxvt.boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=12
+URxvt.italicFont: xft:DejaVu Sans Mono:style=Oblique:pixelsize=12
+URxvt.boldItalicFont: xft:DejaVu Sans Mono:style=Bold Oblique:pixelsize=12
 URxvt.urgentOnBell: 1
 URxvt.visualBell: 1
 URxvt.loginShell: 1

diff --git a/.bashrc b/.bashrc
index fa7b57d..8502398 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -15,7 +15,7 @@ export HISTCONTROL=ignoreboth
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 
-[ ! -s ~/.config/mpd/pid ] && mpd
+#[ ! -s ~/.config/mpd/pid ] && mpd
 
 source /usr/share/git/completion/git-prompt.sh
 set_prompt(){

diff --git a/.gitmodules b/.gitmodules
index 83a3e34..db6a3a4 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "urxvt-font-size"]
-       path = urxvt-font-size
-       url = https://github.com/majutsushi/urxvt-font-size
 [submodule ".vim/bundle/vim-gnupg"]
        path = .vim/bundle/vim-gnupg
        url = https://github.com/jamessan/vim-gnupg

diff --git a/.notmuch-config b/.notmuch-config
new file mode 100644 (file)
index 0000000..051e095
--- /dev/null
+++ b/.notmuch-config
@@ -0,0 +1,87 @@
+# .notmuch-config - Configuration file for the notmuch mail system
+#
+# For more information about notmuch, see http://notmuchmail.org
+
+# Database configuration
+#
+# The only value supported here is 'path' which should be the top-level
+# directory where your mail currently exists and to where mail will be
+# delivered in the future. Files should be individual email messages.
+# Notmuch will store its database within a sub-directory of the path
+# configured here named ".notmuch".
+#
+[database]
+path=/home/mart/.mutt/mail
+
+# User configuration
+#
+# Here is where you can let notmuch know how you would like to be
+# addressed. Valid settings are
+#
+#      name            Your full name.
+#      primary_email   Your primary email address.
+#      other_email     A list (separated by ';') of other email addresses
+#                      at which you receive email.
+#
+# Notmuch will use the various email addresses configured here when
+# formatting replies. It will avoid including your own addresses in the
+# recipient list of replies, and will set the From address based on the
+# address to which the original email was addressed.
+#
+[user]
+name=Mart Lubbers
+primary_email=mart@martlubbers.net
+
+# Configuration for "notmuch new"
+#
+# The following options are supported here:
+#
+#      tags    A list (separated by ';') of the tags that will be
+#              added to all messages incorporated by "notmuch new".
+#
+#      ignore  A list (separated by ';') of file and directory names
+#              that will not be searched for messages by "notmuch new".
+#
+#              NOTE: *Every* file/directory that goes by one of those
+#              names will be ignored, independent of its depth/location
+#              in the mail store.
+#
+[new]
+tags=unread;inbox;
+ignore=
+
+# Search configuration
+#
+# The following option is supported here:
+#
+#      exclude_tags
+#              A ;-separated list of tags that will be excluded from
+#              search results by default.  Using an excluded tag in a
+#              query will override that exclusion.
+#
+[search]
+exclude_tags=deleted;spam;
+
+# Maildir compatibility configuration
+#
+# The following option is supported here:
+#
+#      synchronize_flags      Valid values are true and false.
+#
+#      If true, then the following maildir flags (in message filenames)
+#      will be synchronized with the corresponding notmuch tags:
+#
+#              Flag    Tag
+#              ----    -------
+#              D       draft
+#              F       flagged
+#              P       passed
+#              R       replied
+#              S       unread (added when 'S' flag is not present)
+#
+#      The "notmuch new" command will notice flag changes in filenames
+#      and update tags, while the "notmuch tag" and "notmuch restore"
+#      commands will notice tag changes and update flags in filenames
+#
+[maildir]
+synchronize_flags=true

diff --git a/.vim/.gitignore b/.vim/.gitignore
new file mode 100644 (file)
index 0000000..a0e76af
--- /dev/null
+++ b/.vim/.gitignore
@@ -0,0 +1 @@
+.netrwhist

diff --git a/i3/bar b/i3/bar
index fe1c8d0..fe35e72 100755 (executable)
--- a/i3/bar
+++ b/i3/bar
@@ -1,6 +1,18 @@
 #!/bin/bash
+item(){
+       echo "{\"full_text\": \"$1\"}$2"
+}
+
+battery(){
+       path=/sys/class/power_supply
+       now=$(($(cat "$path/BAT0/charge_now")*100/$(cat "$path/BAT0/charge_full")))%
+       [ "$(cat "$path/ADP1/online")" -eq "1" ] && charge="(C)"
+       [ "$now" = "100%" ] && now="FULL"
+       echo -n "$now$charge"
+}
+
 while true;
 do
-       date
+       echo "$(battery) | $(date +%x\ %X)"
        sleep 1
 done

diff --git a/i3/config b/i3/config
index 33e644b..e30d661 100644 (file)
--- a/i3/config
+++ b/i3/config
@@ -32,6 +32,9 @@ floating_modifier $mod
 # start a terminal
 bindsym $mod+Return exec i3-sensible-terminal
 
+# lock the screen
+bindsym $mod+l exec xautolock -locknow
+
 # kill focused window
 bindsym $mod+Shift+apostrophe kill
 

diff --git a/urxvt-font-size b/urxvt-font-size
deleted file mode 160000 (submodule)
index 7a91753..0000000
--- a/urxvt-font-size
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a9175386bc559b9d5e2addba78010a7452bd477