Commit accured changed

11 files changed, 89 insertions, 34 deletions

diff --git a/base/Xresources b/base/Xresources
index fa0ebad..2a80b98 100644
--- a/base/Xresources
+++ b/base/Xresources
@@ -12,18 +12,20 @@ Xft.lcdfilter: lcddefault
 Rxvt.background: #1a1a1a
 Rxvt.foreground: grey
 Rxvt.scrollBar: false
-Rxvt.font: xft:Inconsolata:size=12:autohint=true
+Rxvt.font: xft:Inconsolata:size=10:autohint=true
 Rxvt.fade: 5
 Rxvt.termName: xterm
 
 URxvt*urgentOnBell: true
 URxvt*transparent: true
 URxvt*shading: 20
+URxvt.iso14755: false
+URxvt.iso14755_52: false
 
 XTerm*background: rgb:1a/1a/1a
 XTerm*foreground: grey
 XTerm*scrollBar: false
-XTerm*faceName: xft:Inconsolata:size=12:autohint=true
+XTerm*faceName: xft:Inconsolata:size=7:autohint=true
 XTerm*bellIsUrgent: true
 XTerm*eightBitInput: false
 XTerm*metaSendsEscape: true
diff --git a/base/bashrc b/base/bashrc
index d07906e..36bc1c6 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -7,7 +7,7 @@
 
 # don't put duplicate lines in the history. See bash(1) for more options
 # ... or force ignoredups and ignorespace
-HISTCONTROL=ignoredups:ignorespace
+HISTCONTROL=ignoredups
 
 # append to the history file, don't overwrite it
 shopt -s histappend
@@ -129,3 +129,4 @@ fi
 if [ -f ~/.host-specific/bash_aliases ]; then
     source ~/.host-specific/bash_aliases
 fi
+
diff --git a/base/config/i3/autostart.d/10_xautolock b/base/config/i3/autostart.d/10_xautolock
index 92cc30b..b72d673 100644
--- a/base/config/i3/autostart.d/10_xautolock
+++ b/base/config/i3/autostart.d/10_xautolock
@@ -1,3 +1,2 @@
-#exec --no-startup-id xautolock -time 5 -locker lock -corners 0-00
-exec --no-startup-id gnome-screensaver
-
+exec --no-startup-id xset s 180 120
+exec --no-startup-id xss-lock -n dim-screen.sh -l lock
diff --git a/base/config/i3/config.d/00_base_config b/base/config/i3/config.d/00_base_config
index 67f3943..c373851 100644
--- a/base/config/i3/config.d/00_base_config
+++ b/base/config/i3/config.d/00_base_config
@@ -6,7 +6,7 @@ set $mod Mod4
 floating_modifier $mod
 
 ## Visual Settings
-font xft:Inconsolata 10
+font xft:Inconsolata 8
 hide_edge_borders both
 
 ## Bindings to start programs
@@ -51,9 +51,9 @@ bindsym $mod+f        fullscreen
 ## Bindings to control workspaces
 
 ### Switch Workspaces
-bindsym $mod+1     workspace number 1
-bindsym $mod+2     workspace number 2
-bindsym $mod+3     workspace number 3
+bindsym $mod+1     workspace number "1: mail"
+bindsym $mod+2     workspace number "2: web"
+bindsym $mod+3     workspace number "3: dev"
 bindsym $mod+4     workspace number 4
 bindsym $mod+5     workspace number 5
 bindsym $mod+6     workspace number 6
@@ -65,9 +65,9 @@ bindsym $mod+Left  workspace prev_on_output
 bindsym $mod+Right workspace next_on_output
 
 ### Move container to workspace
-bindsym $mod+Shift+exclam      move workspace number 1
-bindsym $mod+Shift+at          move workspace number 2
-bindsym $mod+Shift+numbersign  move workspace number 3
+bindsym $mod+Shift+exclam      move workspace number "1: mail"
+bindsym $mod+Shift+at          move workspace number "2: web"
+bindsym $mod+Shift+numbersign  move workspace number "3: dev"
 bindsym $mod+Shift+dollar      move workspace number 4
 bindsym $mod+Shift+percent     move workspace number 5
 bindsym $mod+Shift+asciicircum move workspace number 6
@@ -81,9 +81,24 @@ bindsym $mod+Shift+Right       move workspace next
 ### Move workspace to different monitor
 bindsym $mod+Mod1+Left         move workspace to output left
 bindsym $mod+Mod1+Right        move workspace to output right
+bindsym $mod+Mod1+Up         move workspace to output up
+bindsym $mod+Mod1+Down        move workspace to output down
 
 workspace_auto_back_and_forth yes
-workspace_layout stacking
+workspace_layout default
+
+### Workspace monitor assignments
+
+workspace "1: mail" output eDP-1
+workspace "2: web" output DP-1
+workspace "3: dev" output DP-1
+workspace 4 output DP-1
+workspace 5 output DP-1
+workspace 6 output DP-1
+workspace 7 output DP-1
+workspace 8 output DP-1
+workspace 9 output DP-1
+workspace 10 output DP-1
 
 ### Scratchpad
 bindsym $mod+Shift+minus  move scratchpad
@@ -115,13 +130,34 @@ mode "resize" {
     bindsym Escape mode "default"
 }
 
+### Display Settings
+set $displayMode "Choose [l]aptop or [d]esktop, [e]xtend, [m]irror"
+bindsym $mod+p mode $displayMode
+mode $displayMode {
+    bindsym l exec "\
+        xrandr --output eDP-1 --mode 1920x1080 --primary && \
+        xrandr --output DP-1 --off"; mode "default"
+    bindsym d exec "\
+        xrandr --output DP-1 --auto --primary && \
+        xrandr --output eDP-1 --off"; mode "default"
+    bindsym e exec "\
+        xrandr --output eDP-1 --mode 1920x1080 --primary && \
+        xrandr --output DP-1 --above eDP-1 --mode 1920x1080 \
+        "; mode "default"
+    bindsym m exec "\
+        xrandr --output eDP-1 --mode 1920x1080 --primary && \
+        xrandr --output DP-1 --same-as eDP-1 --auto \
+        "; mode "default"
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
 
 ## i3bar Settings
 bar {
     status_command conky-i3bar
     position bottom
     tray_output primary
-    font xft:Inconsolata 10
+    font xft:Inconsolata 9
 }
 
 
@@ -134,13 +170,17 @@ bindsym $mod+c     exec clipmv
 
 ### Music
 bindsym XF86AudioPlay exec xmms2 toggle
+bindsym $mod+End exec xmms2 toggle
 bindsym XF86AudioNext exec xmms2 next
+bindsym $mod+Home exec xmms2 next
 bindsym XF86AudioPrev exec xmms2 prev
 
 ### Volume
-bindsym XF86AudioRaiseVolume exec "amixer -q set Master 5%+ unmute; amixer -q set Speaker unmute"
-bindsym XF86AudioLowerVolume exec "amixer -q set Master 5%- unmute; amixer -q set Speaker unmute"
-bindsym XF86AudioMute exec amixer -q set Master mute
+bindsym XF86AudioRaiseVolume exec "amixer -D pulse -q set Master 5%+ unmute; amixer -D pulse -q set Speaker unmute"
+bindsym $mod+Prior exec "amixer -D pulse -q set Master 5%+ unmute; amixer -D pulse -q set Speaker unmute"
+bindsym XF86AudioLowerVolume exec "amixer -D pulse -q set Master 5%- unmute; amixer -D pulse -q set Speaker unmute"
+bindsym $mod+Next exec "amixer -D pulse -q set Master 5%- unmute; amixer -D pulse -q set Speaker unmute"
+bindsym XF86AudioMute exec amixer -D pulse -q set Master mute
 
 ### Brightness
 bindsym XF86MonBrightnessUp exec "brightnessctl set +5%"
@@ -149,5 +189,6 @@ bindsym XF86MonBrightnessDown exec "brightnessctl set 5%-"
 ## Specific Window Settings
 for_window [class="Gcalctool"]        floating enable
 for_window [class="Gnome-calculator"] floating enable
-for_window [class="file_progress"] floating enable
+for_window [class="file_progress"]    floating enable
+for_window [title="Unlock Database - KeePassXC"]    floating enable
 
diff --git a/base/conkyrc b/base/conkyrc
index 17ec7e6..035e4ab 100644
--- a/base/conkyrc
+++ b/base/conkyrc
@@ -14,7 +14,6 @@ TEXT
 /home ${fs_free /home} | \
 RAM ${memperc}% | \
 BATT ${battery BAT0} | \
-${execi 300 weatherbar.sh} | \
 ${loadavg 1} | \
 ♪ ${exec pactl list sinks | awk '/Volume: 0:/ {print substr($3, 1, index($3, "%") - 2)}'|head -n 1} | \
 ${time %a %d %b %Y} ${time %H:%M:%S} 
diff --git a/base/conkyrc-json b/base/conkyrc-json
index 5ef86e5..537f274 100644
--- a/base/conkyrc-json
+++ b/base/conkyrc-json
@@ -4,6 +4,7 @@ out_to_console yes
 background no
 max_text_width 0
 use_spacer left
+if_up_strictness address
 
 update_interval 2.0
 cpu_avg_samples 2
@@ -11,11 +12,9 @@ net_avg_samples 2
 
 TEXT
 [
-${if_xmms2_connected}
-${if_match "${xmms2_status}" == "Playing"}
-{ "full_text":"${xmms2_smart}" },
-${endif}
-${endif}
+
+{ "full_text": "${addr wlp58s0}",
+  "color": ${if_up (wlp58s0)}"\#ff0000"${else}"\#00ff00"${endif} },
 
 { "full_text": "✉ ${new_mails $HOME/.maildir/INBOX/}/${mails $HOME/.maildir/INBOX}",
   "color": ${if_match ${new_mails $HOME/.maildir/INBOX/}>0}"\#00ff00"${else}"\#ffffff"${endif} },
@@ -26,15 +25,13 @@ ${endif}
 { "full_text":"RAM ${memperc}%",
   "color":${if_match ${memperc}<90}"\#ffffff"${else}"\#ff0000"${endif} },
 
-{ "full_text":"BATT ${battery BAT0}" }, 
-
-{ "full_text":"${execi 300 weatherbar.sh}" },
+{ "full_text":"🔋 ${battery BAT0}" }, 
 
 { "full_text":"${loadavg 1}" },
 
-{ "full_text":"♪ ${exec pactl list sinks | awk '/Volume: 0:/ {print substr($3, 1, index($3, "%") - 1)}'|head -n 1}" },
+{ "full_text":"♪ ${exec amixer get Master | awk '/Mono/ {print substr($4, 2, index($4, "%") - 1)}'|tail -n 1}" },
 
-{ "full_text":"${time %a %d %b %Y} ${time %H:%M:%S} ${utime %H:%M}",
+{ "full_text":"${time %a %d %b %Y} ${time %H:%M:%S} ${utime %H:%M}Z",
   "short_text":"${time %H:%M:%S}" }
 
 ],
diff --git a/base/gnupg/gpg.conf b/base/gnupg/gpg.conf
index cb74048..e8c1cdd 100644
--- a/base/gnupg/gpg.conf
+++ b/base/gnupg/gpg.conf
@@ -1,6 +1,6 @@
 default-key 08311F3C
 
-keyserver hkps.pool.sks-keyservers.net
+keyserver pool.sks-keyservers.net
 keyserver-options auto-key-retrieve
 
 personal-digest-preferences SHA256
diff --git a/base/mailcap b/base/mailcap
index bb8ca1b..f95fa25 100644
--- a/base/mailcap
+++ b/base/mailcap
@@ -1,7 +1,7 @@
 text/calendar; mutt-ical.py -i -e "jesse@jesterpm.net" %s
 application/ics; mutt-ical.py -i -e "jesse@jesterpm.net" %s
 
-text/html; pandoc -f html -t markdown --reference-links; copiousoutput; compose=vim %s
+text/html; w3m -I %{charset} -T text/html -dump; copiousoutput; description=HTML; compose=vim %s
 
 application/pdf; evince %s; test=test -n "$DISPLAY"
 application/x-bzpdf; evince %s; test=test -n "$DISPLAY"
diff --git a/base/muttrc b/base/muttrc
index 292d2fc..ba0d8d6 100644
--- a/base/muttrc
+++ b/base/muttrc
@@ -17,6 +17,7 @@ set mark_old = no
 unset markers
 set text_flowed=yes
 set display_filter="~/bin/mutt-display-filter.sh"
+set edit_headers=yes
 auto_view text/html
 alternative_order text/plain text/enriched text/html
 
@@ -53,6 +54,14 @@ macro index \es "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt
            <change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
            <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
                  "notmuch: reconstruct thread"
+
+# Contacts
+set query_command= "khard email --parsable '%s'"
+bind editor <Tab> complete-query
+bind editor ^T    complete
+#add email addresses to khard's address book
+macro index,pager A "<pipe-message>khard add-email<return>" "add the sender email address to khard"
+
 # Colors
 #color index brightwhite default ~N 
 #color index brightwhite default ~O
diff --git a/base/urlview b/base/urlview
new file mode 100644
index 0000000..14ee137
--- /dev/null
+++ b/base/urlview
@@ -0,0 +1 @@
+COMMAND firefox
diff --git a/base/xsession b/base/xsession
index 896303f..fbb69ff 100644
--- a/base/xsession
+++ b/base/xsession
@@ -4,6 +4,8 @@ export EDITOR=vim
 export LANG=en_US.utf8
 export LC_ALL=en_US.utf8
 
+systemctl --user import-environment DISPLAY PATH
+
 if [ -f ~/.shell_pathes ]; then
     source ~/.shell_pathes
 fi
@@ -19,17 +21,20 @@ ulimit -c unlimited
 setxkbmap -option compose:menu
 
 # Startup applications
+xrandr --dpi 96
+xrdb -merge $HOME/.Xresources
 #/usr/lib/deja-dup/deja-dup/deja-dup-monitor &
 #/usr/lib/gnome-settings-daemon/gnome-settings-daemon &
 /usr/lib/notification-daemon/notification-daemon &
 (sleep 8; start-pulseaudio-x11) &
-(sleep 60; update-notifier) &
+#(sleep 60; update-notifier) &
 #(sleep 5; gnome-sound-applet) &
 (sleep 5; nm-applet) &
 (sleep 5; system-config-printer-applet) &
 #(sleep 5; nitrogen --restore) &
 #gtk-theme-switch2 -i Ambiance
-xrdb -merge $HOME/.Xresources
+(sleep 10; redshift-gtk) &
+#(sleep 10; dropbox start) &
 
 # Disable bell
 xset -b
@@ -46,4 +51,5 @@ urxvtd -q -f -o
 
 make_i3_config > $HOME/.config/i3/config
 
+
 exec i3