Merge branch 'master' of github.com:urbainvaes/dotfiles

13 files changed, 33 insertions, 16 deletions

diff --git a/Xresources/.Xresources/base b/Xresources/.Xresources/base
index b9ff079..ea87784 100644
--- a/Xresources/.Xresources/base
+++ b/Xresources/.Xresources/base
@@ -28,7 +28,7 @@ URxvt.resize-font.bigger: C-plus
 
 ! Appearance
 /* URxvt*font: xft:DejaVu Sans Mono:size=12 */
-URxvt*font: xft:monaco:size=11.5
+URxvt*font: xft:monaco:size=12
 URxvt*scrollBar: false
 URxvt*internalBorder: 0
 URxvt.fading: 35
diff --git a/bin/.local/bin/workspace b/bin/.local/bin/workspace
index ad378ef..4f2ab67 100755
--- a/bin/.local/bin/workspace
+++ b/bin/.local/bin/workspace
@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
-# List of workspaces
+# List of workspaces: (id, number, name)
 workspaces=$(i3-msg -t get_workspaces | awk 'BEGIN {
                                                         RS="(},{)|(\\[{)|(}\\])";
-                                                        FPAT="([^,:]+)|([^,]+{[^}]+})|(\"[^\"]+\")"
+                                                        FPAT="([^,:\"]+)|([^,\"]+:[^,\"]+)|([^,]+{[^}]+})"
                                              }
                                              $0 !~ "^\\s*$" {
                                              gsub(/"/, "", $4)
-                                             print $2, $4, $8, $11
+                                             print $4, $6
+
                                              }' | sort)
 
 act_on_container() {
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 28fd656..e51e8ac 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -1,7 +1,7 @@
 # Modifier
 set $mod Mod4
 
-font pango:DejaVu Sans Mono, Awesome 8
+font pango:DejaVu Sans Mono, Awesome 9
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -190,6 +190,8 @@ bindsym XF86AudioMute         exec amixer -D pulse sset Master 0%
 # Display
 bindsym XF86MonBrightnessUp   exec light -A 10
 bindsym XF86MonBrightnessDown exec light -U 10
+bindsym Prior exec light -A 10
+bindsym Next exec light -U 10
 bindsym Shift+XF86AudioRaiseVolume exec light -A 10
 bindsym Shift+XF86AudioLowerVolume exec light -U 10
 
diff --git a/i3/.config/i3blocks/bin/battery b/i3/.config/i3blocks/bin/battery
index 378ee3f..0286809 100755
--- a/i3/.config/i3blocks/bin/battery
+++ b/i3/.config/i3blocks/bin/battery
@@ -5,7 +5,6 @@ if [ ! -d /sys/class/power_supply/BAT0 ]; then
     exit
 fi
 
-current_now=$(cat /sys/class/power_supply/BAT0/current_now)
 charge_now=$(cat /sys/class/power_supply/BAT0/charge_now)
 charge_full=$(cat /sys/class/power_supply/BAT0/charge_full)
 bat_status=$(cat /sys/class/power_supply/BAT0/status)
@@ -16,7 +15,7 @@ if [ "$bat_status" = "Full" ]; then
 fi
 
 if [ "$bat_status" = "Discharging" ]; then
-    tot_minutes_remaining=$(( charge_now*60/current_now ))
+    # tot_minutes_remaining=$(( charge_now*60/current_now ))
 
     if [[ $charge_percent -lt 20 ]]; then
         icon=""
@@ -36,14 +35,16 @@ if [ "$bat_status" = "Discharging" ]; then
     fi
 
 elif [ "$bat_status" = "Charging" ]; then
-    tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now ))
+    # current_now=$(cat /sys/class/power_supply/BAT0/current_now)
+    # tot_minutes_remaining=$(( (charge_full-charge_now)*60/current_now ))
 
     icon=
     color="lightblue"
 fi
 
-time_remaining=$(printf "%02d:%02d" \
-    $(( tot_minutes_remaining/60 )) \
-    $(( tot_minutes_remaining - (tot_minutes_remaining/60)*60 )))
+# time_remaining=$(printf "%02d:%02d" \
+#     $(( tot_minutes_remaining/60 )) \
+#     $(( tot_minutes_remaining - (tot_minutes_remaining/60)*60 )))
 
-echo "<span color='$color'>$icon</span> $charge_percent% ($time_remaining)"
+# echo "<span color='$color'>$icon</span> $charge_percent% ($time_remaining)"
+echo "<span color='$color'>$icon</span> $charge_percent%"
diff --git a/mutt/.gitignore b/mutt/.gitignore
new file mode 100644
index 0000000..f2abc1a
--- /dev/null
+++ b/mutt/.gitignore
@@ -0,0 +1,3 @@
+.mail/Work/*
+.mail/Personal/*
+.mail/Misc/*
diff --git a/mutt/.mail/Misc/.gitkeep b/mutt/.mail/Misc/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mutt/.mail/Misc/.gitkeep
diff --git a/mutt/.mail/Personal/.gitkeep b/mutt/.mail/Personal/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mutt/.mail/Personal/.gitkeep
diff --git a/mutt/.mail/Work/.gitkeep b/mutt/.mail/Work/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mutt/.mail/Work/.gitkeep
diff --git a/mutt/.mutt/id_personal b/mutt/.mutt/id_personal
index 8c57cd6..feb81bd 100644
--- a/mutt/.mutt/id_personal
+++ b/mutt/.mutt/id_personal
@@ -9,3 +9,5 @@ set trash     = "+Personal/Personal.bin"
 macro index,pager gs "<change-folder> $record<enter>"
 macro index,pager gd "<change-folder> $postponed<enter>"
 macro index,pager gb "<change-folder> $trash<enter>"
+
+# vim: ft=muttrc
diff --git a/mutt/.mutt/id_work b/mutt/.mutt/id_work
index 238cfcb..ac75a03 100644
--- a/mutt/.mutt/id_work
+++ b/mutt/.mutt/id_work
@@ -2,10 +2,14 @@ set from = "u.vaes13@imperial.ac.uk"
 set sendmail="/usr/bin/msmtp -a imperial"
 
 set spoolfile = "+Work/Work"
-set record    = "+Work/Work.sent"
 set postponed = "+Work/Work.drafts"
 set trash     = "+Work/Work.bin"
 
-macro index,pager gs "<change-folder> $record<enter>"
+# Record not necessary because outlook saves messages
+unset record
+
+macro index,pager gs "<change-folder> +Work/Work.sent<enter>"
 macro index,pager gd "<change-folder> $postponed<enter>"
 macro index,pager gb "<change-folder> $trash<enter>"
+
+# vim: ft=muttrc
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index 999f578..ddbe70a 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -61,3 +61,4 @@ unitarily
 multimodal
 Kalman
 i.e.
+Stratonovich
diff --git a/xinit/.xinitrc b/xinit/.xinitrc
index 20b5aee..4a3c018 100755
--- a/xinit/.xinitrc
+++ b/xinit/.xinitrc
@@ -11,12 +11,15 @@ source $HOME/.local/colors.zsh
 xrdb $HOME/.Xresources/$COLORSCHEME
 
 # Background
-feh --bg-fill /home/urbain/Documents/wallpapers/pagoda.jpg
+feh --bg-fill /usr/share/backgrounds/Grand_Canyon_North_Rim_by_Rihards_Vilks.jpg
 
 # Disable screen going to sleep
 xset -dpms
 xset s off
 
+# Disable bell
+xset -b
+
 # SSH agent
 eval $(ssh-agent)
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cc2e1ad..e54be1c 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -172,9 +172,9 @@ alias mca='make clean-all'
 
 # Misc
 alias a='vifm . .'
-alias ff='FreeFem++'
 alias m='cd ~/.mutt/attachments && mutt && cd -'
 alias e='nvim'
+alias f='fzm'
 alias mux='tmuxinator'
 alias email='mbsync -a'
 alias renet='systemctl restart NetworkManager.service'