new openbox setupdebian

author: luxagraf <sng@luxagraf> 2021-05-05 20:20:52 -0400
committer: luxagraf <sng@luxagraf> 2021-05-05 20:20:52 -0400
commit: 484d4d8cbaa5145324d80456ab5ddb624f590ddc (patch)
tree: 10de629be1b9b597fe2acb935031c04199a268db
parent: dbb33e4bfbf7b9e7fe3f3a38cc501bc3d3aa4732 (diff)
63 files changed, 550 insertions, 276 deletions
diff --git a/.Xresources b/.Xresources
index f791bc3..3b6076d 100644
--- a/.Xresources
+++ b/.Xresources
@@ -15,153 +15,55 @@ URxvt.boldFont: xft:hack:bold:size=13
 URxvt*font: xft:hack:medium:size=13
 URxvt.letterSpace: -1
 URxvt*depth: 32
+!URxvt*background: rgba:0000/0000/0200/c800
 Urxvt*transparent: true
-URxvt*background: rgba:0000/0000/0200/c800
-Urxvt*shading: 37
+Urxvt*shading: 150
 URxvt*borderless: 1
 URxvt*scrollBar: false
 URxvt*loginShell: true
 Urxvt*secondaryScroll:  true    # Enable Shift-PageUp/Down in screen
 URxvt*saveLines: 8000
-URxvt*termName: rxvt-unicode
-URxvt.perl-ext-common: default,matcher,fullscreen 
-!URxvt.urlLauncher: firefox-aurora
+URxvt*termName: urxvt
 URxvt.matcher.button: 1
-URxvt.keysym.F11: perl:fullscreen:switch
 
-!!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-!!--------- ------- ---- -------  ----------- ---------- ----------- -----------
-!!base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-!!base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-!!base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-!!base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-!!base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-!!base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-!!base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-!!base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-!!yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-!!orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-!!red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-!!magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-!!violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-!!blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-!!cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-!!green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
+!!Source http://github.com/altercation/solarized
 
-!#define S_base03        #002b36
-!#define S_base02        #073642
-!#define S_base01        #586e75
-!#define S_base00        #657b83
-!#define S_base0         #839496
-!#define S_base1         #93a1a1
-!#define S_base2         #eee8d5
-!#define S_base3         #fdf6e3
-!#define S_yellow        #b58900
-!#define S_orange        #cb4b16
-!#define S_red           #dc322f
-!#define S_magenta       #d33682
-!#define S_violet        #6c71c4
-!#define S_blue          #268bd2
-!#define S_cyan          #2aa198
-!#define S_green         #859900
-!
-!*background:            S_base02
-!*foreground:            S_base00
-!*cursorColor:           S_base1
-!*pointerColorBackground:S_base01
-!*pointerColorForeground:S_base1
-!
-!!! black dark/light
-!*color0:                S_base02
-!*color8:                S_base03
-!
-!!! red dark/light
-!*color1:                S_red
-!*color9:                S_orange
-!
-!!! green dark/light
-!*color2:                S_green
-!*color10:               S_base01
-!
-!!! yellow dark/light
-!*color3:                S_yellow
-!*color11:               S_base00
-!
-!!! blue dark/light
-!*color4:                S_blue
-!*color12:               S_base0
-!
-!!! magenta dark/light
-!*color5:                S_magenta
-!*color13:               S_violet
-!
-!!! cyan dark/light
-!*color6:                S_cyan
-!*color14:               S_base1
-!
-!!! white dark/light
-!*color7:                S_base2
-!*color15:               S_base3
-
-
-! xterm 
-xterm.boldFont: xft:hack:bold:size=13
-xterm*font: xft:hack:medium:size=13
-
-! solarized light
-#define S_base03        #002b36
-#define S_base02        #073642
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-
-*background:            S_base3
-*foreground:            S_base00
-*fadeColor:             S_base3
-*cursorColor:           S_base01
-*pointerColorBackground:S_base1
-*pointerColorForeground:S_base01
-
-#define S_yellow        #b58900
-#define S_orange        #cb4b16
-#define S_red           #dc322f
-#define S_magenta       #d33682
-#define S_violet        #6c71c4
-#define S_blue          #268bd2
-#define S_cyan          #2aa198
-#define S_green         #859900
+URxvt*background: [96]#002b36
+*foreground: #657b83
+*fading: 40
+*fadeColor: #002b36
+*cursorColor: #93a1a1
+*pointerColorBackground: #586e75
+*pointerColorForeground: #93a1a1
 
 !! black dark/light
-*color0:                S_base02
-*color8:                S_base03
+*color0: #073642
+*color8: #002b36
 
 !! red dark/light
-*color1:                S_red
-*color9:                S_orange
+*color1: #dc322f
+*color9: #cb4b16
 
 !! green dark/light
-*color2:                S_green
-*color10:               S_base01
+*color2: #859900
+*color10: #586e75
 
 !! yellow dark/light
-*color3:                S_yellow
-*color11:               S_base00
+*color3: #b58900
+*color11: #657b83
 
 !! blue dark/light
-*color4:                S_blue
-*color12:               S_base0
+*color4: #268bd2
+*color12: #839496
 
 !! magenta dark/light
-*color5:                S_magenta
-*color13:               S_violet
+*color5: #d33682
+*color13: #6c71c4
 
 !! cyan dark/light
-*color6:                S_cyan
-*color14:               S_base1
+*color6: #2aa198
+*color14: #93a1a1
 
 !! white dark/light
-*color7:                S_base2
-*color15:               S_base3
+*color7: #eee8d5
+*color15: #fdf6e3
diff --git a/.aliases b/.aliases
index 16d5ae3..26c3cf1 100644
--- a/.aliases
+++ b/.aliases
@@ -2,17 +2,18 @@
 
 alias egrep='egrep --color=auto'
 alias tmux="tmux -2"
-alias v="nvim "
-#alias vim="nvim "
+alias v="vim "
 alias dmenu="dmenu_run "
 #alias thunar="pcmanfm-qt"
+alias mpv="mpv --hwdec=vaapi -v "
 
 # I like feedback
 alias cp='cp -v'
 alias mv='mv -v'
 # i like ls
 alias ls='ls --color -h --group-directories-first'
-alias ll='ls -l'
+alias ll='ls -l --group-directories-first '
+alias lt='ls -lt '
 alias lsh='ls -lh'
 alias la='ls -lah'
 alias count='ls -l | wc -l'
diff --git a/.bashrc b/.bashrc
index bb3dbac..56c6f08 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,28 +1,20 @@
 #basics
 stty -ixon
-#export BROWSER="firefox-developer-edition"
 export MOZ_DBUS_REMOTE=1
-#export BROWSER="qutebrowser"
 alias vivaldi-snapshot="vivaldi-snapshot --use-gl=egl"
-alias chromium="GDK_BACKEND=x11 && chromium"
-export BROWSER="firefox-developer-edition"
-#export BROWSER="chromium"
-export EDITOR="nvim"
+export BROWSER="vivaldi-snapshot"
+export EDITOR="vim"
 # keep dictionaries in ~/bin/
 export STARDICT_DATA_DIR="$HOME/bin/dict/"
 export NOTES_DIR="$HOME/notes"
 export TERM="screen-256color"
 export GREP_COLOR='00;38;5;166'
+export CM_HISTLENGTH=50
 # my scripts on PATH
 export PATH=/usr/local/bin:$PATH
 export PATH=$PATH:$HOME/bin
 export PATH=$PATH:$HOME/bin/bash-scripts
 export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin
-#export QT_QPA_PLATFORM=wayland
-#export QT_PLATFORM_THEME=qt5ct
-#export QT_QPA_PLATFORMTHEME=qt5ct
-#export XDG_SESSION_TYPE=wayland 
-#export GDK_BACKEND=wayland
 
 # Alias definitions
 if [ -f ~/.aliases ]; then
@@ -62,7 +54,7 @@ shopt -s autocd
 shopt -s cdable_vars
 
 export FZF_DEFAULT_OPTS="
---color dark,hl:33,hl+:37,fg+:235,bg+:136,fg+:254
+--color dark,hl:33,hl+:37,fg+:235,bg+:136,fg+:254
 --color info:254,prompt:37,spinner:108,pointer:235,marker:235
    --no-mouse --height 70% -1 --multi --inline-info --preview='[[ \$(file --mime {}) =~ binary ]] && echo {} is a binary file || (bat --style=numbers --color=always {} || cat {}) 2> /dev/null | head -300' --preview-window='right:hidden:wrap' --bind='f3:execute(bat --style=numbers {} || less -f {}),f2:toggle-preview,ctrl-d:half-page-down,ctrl-u:half-page-up,ctrl-a:select-all+accept,ctrl-y:execute-silent(echo {+} | wl-copy),ctrl-x:execute(rm -i {+})+abort'"
 if type rg &> /dev/null; then
@@ -71,8 +63,6 @@ if type rg &> /dev/null; then
 fi
 # Don't use ~ to define your home here, it won't work.
 export wir="$HOME/writing/wired"
-export reg="$HOME/writing/register"
-export ars="$HOME/writing/ars-technica/"
 export l="$HOME/writing/luxagraf/"
 export lux="$HOME/sites/luxagraf.net"
 export d="$HOME/documents"
@@ -126,7 +116,12 @@ function fore(){
 
 #search any folder like you're in nvalt:
 function nv() {
-    find ${2:-~/notes} -maxdepth ${3:-1} -type f -print0 | xargs -0 grep -li $1
+    ${EDITOR:-vim} "$(find ${2:-~/notes} -maxdepth ${3:-1} -type f -print0 | xargs -0 grep -li $1 | fzf --preview="bat {}" --preview-window=right:70%:wrap)";
+}
+
+#search any folder like you're in nvalt but have ripgrep at your disposal
+function fn() {
+    ${EDITOR:-vim} "$(rg -l $1 ${2:-~/notes} | fzf --preview="bat {}" --preview-window=right:70%:wrap)";
 }
 # same thing, but context 
 function nvl(){
@@ -137,10 +132,12 @@ function nvl(){
 function fnt(){
     find ~/notes ~/documents/bookmarks ~/documents/reading\ notes -type f -maxdepth 2 -print0 | xargs -0 grep -$2i $1
 }
-
+function fntt(){
+    ${EDITOR:-nvim} "$(rg -l $1 ~/notes/ ~/documents/bookmarks/ ~/documents/reading\ notes/ | fzf --preview="bat {}" --preview-window=right:70%:wrap)";
+}
 #fuzzy find
 function f() {
-    rg -l $1 ${2:-.} | fzf --preview="bat {}" --preview-window=right:70%:wrap
+    ${EDITOR:-nvim} "$(rg -l $1 ${2:-.} | fzf --preview="bat {}" --preview-window=right:70%:wrap)";
 }
 
 #fuzzy find file names only
@@ -410,6 +407,13 @@ fshow() {
                 {}
 FZF-EOF"
 }
+#dirsize - finds directory sizes and lists them for the current directory
+ds () {
+	du -shx -- * .[a-zA-Z0-9_]* 2>/dev/null | grep -E '^ *[0-9.]*[MG]' | sort -n >/tmp/list
+	grep -E '^ *[0-9.]*M' /tmp/list
+	grep -E '^ *[0-9.]*G' /tmp/list
+	rm /tmp/list
+}
 RIPGREP_CONFIG_PATH=~/.ripgreprc
 GPG_TTY=$(tty)
 export GPG_TTY
diff --git a/.config/openbox/autostart b/.config/openbox/autostart
index 6ea5296..c99e3d0 100644
--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -1,9 +1,11 @@
 tint2 &
-alacritty &
+urxvt &
+redshift -l 34.3065:-82.66374 &
 nm-applet &
-pcmanfm-qt &
 clipmenud &
 nextcloud &
+xset r rate 251 25 &
+xset -b 
 xcape -e 'Caps_Lock=Escape'
 xinput set-prop 14 "libinput Natural Scrolling Enabled" 1
-feh --bg-fill ~/pictures/desktops/delos.png
+feh --bg-fill ~/pictures/desktops/Untitled_0535_by_Mike_Sinko.jpg
diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml
index cd7abd4..c5f6df3 100644
--- a/.config/openbox/rc.xml
+++ b/.config/openbox/rc.xml
@@ -120,13 +120,13 @@
 
        use obconf if you want to change these without having to log out
        and back in -->
-    <number>1</number>
+    <number>4</number>
     <firstdesk>1</firstdesk>
     <names>
-      <!-- set names up here if you want to, like this:
-    <name>desktop 1</name>
-    <name>desktop 2</name>
-    -->
+      <name>1</name>
+      <name>2</name>
+      <name>3</name>
+      <name>4</name>
     </names>
     <popupTime>875</popupTime>
     <!-- The number of milliseconds to show the popup for when switching
@@ -179,16 +179,21 @@
   <keyboard>
     <chainQuitKey>C-g</chainQuitKey>
     <!-- Keybindings for desktop switching -->
- <keybind key="C-A-space">
-   <action name="ShowMenu"><menu>root-menu</menu></action>
- </keybind>
-    <keybind key="C-A-Left">
+    <keybind key="A-F6">
+      <action name="MaximizeFull"/>
+    </keybind>
+    <keybind key="C-A-space">
+      <action name="ShowMenu">
+        <menu>root-menu</menu>
+      </action>
+    </keybind>
+    <keybind key="A-J">
       <action name="GoToDesktop">
         <to>left</to>
         <wrap>no</wrap>
       </action>
     </keybind>
-    <keybind key="C-A-Right">
+    <keybind key="A-K">
       <action name="GoToDesktop">
         <to>right</to>
         <wrap>no</wrap>
@@ -230,22 +235,22 @@
         <wrap>no</wrap>
       </action>
     </keybind>
-    <keybind key="W-F1">
+    <keybind key="A-1">
       <action name="GoToDesktop">
         <to>1</to>
       </action>
     </keybind>
-    <keybind key="W-F2">
+    <keybind key="A-2">
       <action name="GoToDesktop">
         <to>2</to>
       </action>
     </keybind>
-    <keybind key="W-F3">
+    <keybind key="A-3">
       <action name="GoToDesktop">
         <to>3</to>
       </action>
     </keybind>
-    <keybind key="W-F4">
+    <keybind key="A-4">
       <action name="GoToDesktop">
         <to>4</to>
       </action>
@@ -264,54 +269,56 @@
     </keybind>
     <keybind key="A-space">
       <action name="Execute">
-          <command>dmenu_run</command>
+        <command>dmenu_run</command>
       </action>
     </keybind>
-    <keybind key="A-space">
+    <keybind key="A-C">
       <action name="Execute">
-          <command>dmenu_run</command>
+        <command>clipmenu</command>
       </action>
     </keybind>
-    <keybind key="A-H">
+    <keybind key="A-S">
       <action name="Execute">
-          <command>clipmenu</command>
+        <command>urxvt -e sh -c "fzsnip"</command>
       </action>
     </keybind>
     <keybind key="XF86AudioRaiseVolume">
       <action name="Execute">
         <command>pactl set-sink-volume 0 +10%</command>
       </action>
-   </keybind>
+    </keybind>
     <keybind key="XF86AudioLowerVolume">
-     <action name="Execute">
+      <action name="Execute">
         <command>pactl set-sink-volume 0 -10%</command>
       </action>
     </keybind>
+    <keybind key="Print">
+      <action name="Execute">
+          <command>scrot ~/pictures/screenshots/%Y-%m-%d-%H-%M-%S.png</command>
+      </action>
+    </keybind>
+    <keybind key="A-Print">
+      <action name="Execute">
+          <command>scrot -s ~/pictures/screenshots/%Y-%m-%d-%H-%M-%S.png</command>
+      </action>
+    </keybind>
     <keybind key="XF86AudioMute">
       <action name="Execute">
-      <command>pactl set-sink-mute 0 toggle</command>
+        <command>pactl set-sink-mute 0 toggle</command>
       </action>
     </keybind>
-    <!-- Keybindings for window switching -->
-    <keybind key="A-Tab">
-      <action name="NextWindow">
-        <finalactions>
-          <action name="Focus"/>
-          <action name="Raise"/>
-          <action name="Unshade"/>
-        </finalactions>
+    <keybind key="XF86MonBrightnessDown">
+      <action name="Execute">
+        <command>brightnessctl set 100-</command>
       </action>
     </keybind>
-    <keybind key="A-S-Tab">
-      <action name="PreviousWindow">
-        <finalactions>
-          <action name="Focus"/>
-          <action name="Raise"/>
-          <action name="Unshade"/>
-        </finalactions>
+    <keybind key="XF86MonBrightnessUp">
+      <action name="Execute">
+        <command>brightnessctl set 100+</command>
       </action>
     </keybind>
-    <keybind key="A-J">
+    <!-- Keybindings for window switching -->
+    <keybind key="A-Tab">
       <action name="NextWindow">
         <finalactions>
           <action name="Focus"/>
@@ -320,7 +327,7 @@
         </finalactions>
       </action>
     </keybind>
-    <keybind key="A-K">
+    <keybind key="A-S-Tab">
       <action name="PreviousWindow">
         <finalactions>
           <action name="Focus"/>
@@ -384,6 +391,9 @@
     <screenEdgeWarpMouse>false</screenEdgeWarpMouse>
     <!-- Set this to TRUE to move the mouse pointer across the desktop when
        switching due to hitting the edge of the screen -->
+    <mousebind button="A-Left" action="Drag">
+      <action name="Move"/>
+    </mousebind>
     <context name="Frame">
       <mousebind button="A-Left" action="Press">
         <action name="Focus"/>
@@ -778,8 +788,6 @@
       <x>center</x>
       # a number like 50, or 'center' to center on screen. use a negative number
       # to start from the right (or bottom for <y>), ie -50 is 50 pixels from
-      # the right edge (or bottom). use 'default' to specify using value
-      # provided by the application, or chosen by openbox, instead.
       <y>200</y>
       <monitor>1</monitor>
       # specifies the monitor in a xinerama setup.
@@ -826,5 +834,17 @@
 
   # end of the example
 -->
+    <application class="URxvt">
+      <decor>no</decor>
+      <desktop>1</desktop>
+    </application>
+    <application class="Darktable">
+      <decor>no</decor>
+      <desktop>3</desktop>
+      <fullscreen>yes</fullscreen>
+    </application>
+    <application class="kdenlive">
+      <decor>no</decor>
+    </application>
   </applications>
 </openbox_config>
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index d1d5837..b5c890f 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -9,4 +9,4 @@ s:/home/lxf/sites/luxagraf.net
 c:/home/lxf/pictures/nextcloud-ccg-phone
 t:/home/lxf/temp
 p:/home/lxf/temp/wired
-':/usr/share/applications
+':/home/lxf
diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf
index cac8768..d7334d5 100644
--- a/.config/ranger/rifle.conf
+++ b/.config/ranger/rifle.conf
@@ -118,7 +118,7 @@ ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
 #-------------------------------------------
 mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
 mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
+mime ^video,       has mpv,      X, flag f = mpv --hwdec=vaapi -- "$@"
 mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
 mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
 mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
diff --git a/.config/tint2/executors/icons/weather/01d b/.config/tint2/executors/icons/weather/01d
new file mode 100644
index 0000000..673d322
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/01d
diff --git a/.config/tint2/executors/icons/weather/01n b/.config/tint2/executors/icons/weather/01n
new file mode 100644
index 0000000..d4e469f
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/01n
diff --git a/.config/tint2/executors/icons/weather/02d b/.config/tint2/executors/icons/weather/02d
new file mode 100644
index 0000000..3a65131
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/02d
diff --git a/.config/tint2/executors/icons/weather/02n b/.config/tint2/executors/icons/weather/02n
new file mode 100644
index 0000000..43f5054
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/02n
diff --git a/.config/tint2/executors/icons/weather/03d b/.config/tint2/executors/icons/weather/03d
new file mode 100644
index 0000000..a01bb81
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/03d
diff --git a/.config/tint2/executors/icons/weather/03n b/.config/tint2/executors/icons/weather/03n
new file mode 100644
index 0000000..088277b
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/03n
diff --git a/.config/tint2/executors/icons/weather/04.png b/.config/tint2/executors/icons/weather/04.png
new file mode 100644
index 0000000..67d4eb4
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/04.png
diff --git a/.config/tint2/executors/icons/weather/04d b/.config/tint2/executors/icons/weather/04d
new file mode 100644
index 0000000..f241aba
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/04d
diff --git a/.config/tint2/executors/icons/weather/04n b/.config/tint2/executors/icons/weather/04n
new file mode 100644
index 0000000..73476a2
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/04n
diff --git a/.config/tint2/executors/icons/weather/09d b/.config/tint2/executors/icons/weather/09d
new file mode 100644
index 0000000..a8568f5
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/09d
diff --git a/.config/tint2/executors/icons/weather/09n b/.config/tint2/executors/icons/weather/09n
new file mode 100644
index 0000000..602685e
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/09n
diff --git a/.config/tint2/executors/icons/weather/10d b/.config/tint2/executors/icons/weather/10d
new file mode 100644
index 0000000..fc2f201
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/10d
diff --git a/.config/tint2/executors/icons/weather/10n b/.config/tint2/executors/icons/weather/10n
new file mode 100644
index 0000000..bb20e0d
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/10n
diff --git a/.config/tint2/executors/icons/weather/11d b/.config/tint2/executors/icons/weather/11d
new file mode 100644
index 0000000..2310782
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/11d
diff --git a/.config/tint2/executors/icons/weather/11n b/.config/tint2/executors/icons/weather/11n
new file mode 100644
index 0000000..d2d6607
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/11n
diff --git a/.config/tint2/executors/icons/weather/13d b/.config/tint2/executors/icons/weather/13d
new file mode 100644
index 0000000..a419ce7
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/13d
diff --git a/.config/tint2/executors/icons/weather/13n b/.config/tint2/executors/icons/weather/13n
new file mode 100644
index 0000000..638d35c
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/13n
diff --git a/.config/tint2/executors/icons/weather/404.png b/.config/tint2/executors/icons/weather/404.png
new file mode 100644
index 0000000..00e9f11
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/404.png
diff --git a/.config/tint2/executors/icons/weather/50d b/.config/tint2/executors/icons/weather/50d
new file mode 100644
index 0000000..1bc8f9f
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/50d
diff --git a/.config/tint2/executors/icons/weather/50n b/.config/tint2/executors/icons/weather/50n
new file mode 100644
index 0000000..058da72
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/50n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/01d b/.config/tint2/executors/icons/weather/openweathermap/01d
new file mode 100644
index 0000000..ed42ad9
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/01d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/01n b/.config/tint2/executors/icons/weather/openweathermap/01n
new file mode 100644
index 0000000..85efa16
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/01n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/02d b/.config/tint2/executors/icons/weather/openweathermap/02d
new file mode 100644
index 0000000..fabd9c3
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/02d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/02n b/.config/tint2/executors/icons/weather/openweathermap/02n
new file mode 100644
index 0000000..288a40e
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/02n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/03d b/.config/tint2/executors/icons/weather/openweathermap/03d
new file mode 100644
index 0000000..ef2e9f7
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/03d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/03n b/.config/tint2/executors/icons/weather/openweathermap/03n
new file mode 100644
index 0000000..ef2e9f7
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/03n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/04.png b/.config/tint2/executors/icons/weather/openweathermap/04.png
new file mode 100644
index 0000000..9c64ea8
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/04.png
diff --git a/.config/tint2/executors/icons/weather/openweathermap/04d b/.config/tint2/executors/icons/weather/openweathermap/04d
new file mode 100644
index 0000000..9c64ea8
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/04d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/04n b/.config/tint2/executors/icons/weather/openweathermap/04n
new file mode 100644
index 0000000..9c64ea8
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/04n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/09d b/.config/tint2/executors/icons/weather/openweathermap/09d
new file mode 100644
index 0000000..0f14cb6
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/09d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/09n b/.config/tint2/executors/icons/weather/openweathermap/09n
new file mode 100644
index 0000000..0f14cb6
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/09n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/10d b/.config/tint2/executors/icons/weather/openweathermap/10d
new file mode 100644
index 0000000..62304fd
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/10d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/10n b/.config/tint2/executors/icons/weather/openweathermap/10n
new file mode 100644
index 0000000..b5e5d10
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/10n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/11d b/.config/tint2/executors/icons/weather/openweathermap/11d
new file mode 100644
index 0000000..4a885cf
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/11d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/11n b/.config/tint2/executors/icons/weather/openweathermap/11n
new file mode 100644
index 0000000..4a885cf
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/11n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/13d b/.config/tint2/executors/icons/weather/openweathermap/13d
new file mode 100644
index 0000000..7867322
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/13d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/13n b/.config/tint2/executors/icons/weather/openweathermap/13n
new file mode 100644
index 0000000..7867322
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/13n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/404.png b/.config/tint2/executors/icons/weather/openweathermap/404.png
new file mode 100644
index 0000000..00e9f11
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/404.png
diff --git a/.config/tint2/executors/icons/weather/openweathermap/50d b/.config/tint2/executors/icons/weather/openweathermap/50d
new file mode 100644
index 0000000..f04122b
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/50d
diff --git a/.config/tint2/executors/icons/weather/openweathermap/50n b/.config/tint2/executors/icons/weather/openweathermap/50n
new file mode 100644
index 0000000..f04122b
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/50n
diff --git a/.config/tint2/executors/icons/weather/openweathermap/weather.png b/.config/tint2/executors/icons/weather/openweathermap/weather.png
new file mode 100644
index 0000000..9c64ea8
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/openweathermap/weather.png
diff --git a/.config/tint2/executors/icons/weather/weather.svg b/.config/tint2/executors/icons/weather/weather.svg
new file mode 100644
index 0000000..293534f
--- /dev/null
+++ b/.config/tint2/executors/icons/weather/weather.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
+ <defs>
+  <style id="current-color-scheme" type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; }
+  </style>
+ </defs>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="m 10.999997,4.0000038 v 2.085937 a 6,6 0 0 1 1,-0.08594 6,6 0 0 1 1,0.08984 V 3.9999968 Z M 7.0507781,5.6367228 5.636716,7.0507848 7.1132781,8.5273477 a 6,6 0 0 1 1.416016,-1.4121099 z m 9.8984379,0 -1.476563,1.476562 a 6,6 0 0 1 1.41211,1.4160159 l 1.478515,-1.4785159 z m -4.949219,1.363281 A 5,5 0 0 0 6.9999971,12.000003 5,5 0 0 0 9.294919,16.205081 c 0.418395,-0.899362 1.246702,-1.568026 2.228516,-1.882812 0.646177,-1.320546 1.899347,-2.322266 3.476562,-2.322266 0.732994,0 1.393594,0.222902 1.958984,0.587891 a 5,5 0 0 0 0.04102,-0.587891 5,5 0 0 0 -5,-4.9999992 z m -8,3.9999992 v 2 h 2.085938 a 6,6 0 0 1 -0.08594,-1 6,6 0 0 1 0.08984,-1 z m 13.914062,0 a 6,6 0 0 1 0.08594,1 6,6 0 0 1 -0.08984,1 h 2.089844 v -2 z m -2.914062,2 c -1.31,0 -2.400547,0.859297 -2.810547,2.029297 -1.23,0.16 -2.1894529,1.200703 -2.1894529,2.470703 0,1.38 1.1199999,2.5 2.4999999,2.5 h 5 c 1.38,0 2.5,-1.12 2.5,-2.5 0,-1.27 -0.959453,-2.310703 -2.189453,-2.470703 -0.4,-1.17 -1.500547,-2.029297 -2.810547,-2.029297 z m -7.8847648,2.470703 -1.478516,1.478516 1.414062,1.414062 1.476563,-1.476562 a 6,6 0 0 1 -1.412109,-1.416016 z"/>
+</svg>
diff --git a/.config/tint2/tint2rc b/.config/tint2/tint2rc
new file mode 100644
index 0000000..ad291fc
--- /dev/null
+++ b/.config/tint2/tint2rc
@@ -0,0 +1,304 @@
+#---- Generated by tint2conf aeaf ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for 
+# full documentation of the configuration options.
+#-------------------------------------
+# Gradients
+#-------------------------------------
+# Backgrounds
+# Background 1: Panel
+rounded = 0
+border_width = 0
+border_sides = TBLR
+background_color = #000000 60
+border_color = #000000 30
+background_color_hover = #000000 60
+border_color_hover = #000000 30
+background_color_pressed = #000000 60
+border_color_pressed = #000000 30
+
+# Background 2: Default task, Iconified task
+rounded = 4
+border_width = 1
+border_sides = TBLR
+background_color = #777777 20
+border_color = #777777 30
+background_color_hover = #aaaaaa 22
+border_color_hover = #eaeaea 44
+background_color_pressed = #555555 4
+border_color_pressed = #eaeaea 44
+
+# Background 3: Active task
+rounded = 4
+border_width = 1
+border_sides = TBLR
+background_color = #777777 20
+border_color = #ffffff 40
+background_color_hover = #aaaaaa 22
+border_color_hover = #eaeaea 44
+background_color_pressed = #555555 4
+border_color_pressed = #eaeaea 44
+
+# Background 4: Urgent task
+rounded = 4
+border_width = 1
+border_sides = TBLR
+background_color = #aa4400 100
+border_color = #aa7733 100
+background_color_hover = #cc7700 100
+border_color_hover = #aa7733 100
+background_color_pressed = #555555 4
+border_color_pressed = #aa7733 100
+
+# Background 5: Tooltip
+rounded = 1
+border_width = 1
+border_sides = TBLR
+background_color = #222222 100
+border_color = #333333 100
+background_color_hover = #ffffaa 100
+border_color_hover = #000000 100
+background_color_pressed = #ffffaa 100
+border_color_pressed = #000000 100
+
+#-------------------------------------
+# Panel
+scale_relative_to_dpi = 2
+panel_items = P:L:TEEEESBC
+panel_size = 100% 44
+panel_margin = 0 0
+panel_padding = 2 0 2
+panel_background_id = 1
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom center horizontal
+panel_layer = top
+panel_monitor = all
+panel_shrink = 0
+autohide = 0
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.5
+autohide_height = 2
+strut_policy = follow_size
+panel_window_name = tint2
+disable_transparency = 0
+mouse_effects = 1
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
+
+#-------------------------------------
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_hide_if_empty = 0
+taskbar_padding = 0 0 2
+taskbar_background_id = 0
+taskbar_active_background_id = 0
+taskbar_name = 1
+taskbar_hide_inactive_tasks = 0
+taskbar_hide_different_monitor = 0
+taskbar_hide_different_desktop = 0
+taskbar_always_show_all_desktop_tasks = 0
+taskbar_name_padding = 4 2
+taskbar_name_background_id = 0
+taskbar_name_active_background_id = 0
+taskbar_name_font_color = #e3e3e3 100
+taskbar_name_font = Roboto 20
+taskbar_name_active_font_color = #ffffff 100
+taskbar_distribute_size = 0
+taskbar_sort_order = none
+task_align = left
+
+#-------------------------------------
+# Task
+task_text = 0
+task_icon = 1
+task_centered = 1
+urgent_nb_of_blink = 100000
+task_maximum_size = 180 35
+task_padding = 2 2 4
+task_tooltip = 1
+task_thumbnail = 0
+task_thumbnail_size = 210
+task_font_color = #ffffff 200
+task_background_id = 2
+task_active_background_id = 3
+task_urgent_background_id = 4
+task_iconified_background_id = 2
+task_font = Roboto 18
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 0 4 2
+systray_background_id = 0
+systray_sort = ascending
+systray_icon_size = 40
+systray_icon_asb = 100 0 0
+systray_monitor = 1
+
+#-------------------------------------
+# Launcher
+launcher_padding = 8 0 12
+launcher_font = Roboto 24
+launcher_background_id = 0
+launcher_icon_background_id = 0
+launcher_icon_size = 36
+launcher_icon_asb = 100 0 0
+launcher_icon_theme_override = 0
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = urxvt.desktop
+launcher_item_app = vivaldi-snapshot.desktop
+launcher_item_app = darktable.desktop
+launcher_item_app = thunar.desktop
+
+#-------------------------------------
+# Clock
+time1_format = %a %b %d   %l:%M   
+#time2_format = %A %d %B
+time1_timezone = 
+time1_font = Roboto 24
+time2_timezone = 
+clock_font_color = #ffffff 100
+clock_padding = 2 0
+clock_background_id = 0
+clock_tooltip = 
+clock_tooltip_timezone = 
+clock_lclick_command = gsimplecal
+clock_mclick_command = 
+clock_uwheel_command = 
+clock_dwheel_command = 
+
+#-------------------------------------
+# Battery
+battery = 0 
+battery_tooltip = 1
+bat1_font = Roboto 22
+bat2_font = Roboto 22
+bat1_format = %s %p - %t
+battery_low_status = 10
+battery_low_cmd = xmessage 'tint2: Battery low!'
+battery_full_cmd = 
+battery_font_color = #ffffff 100
+battery_padding = 40 0
+battery_background_id = 0
+battery_hide = 101
+
+#-------------------------------------
+# Tooltip
+tooltip_show_timeout = 0.5
+tooltip_hide_timeout = 0.1
+tooltip_padding = 4 4
+tooltip_background_id = 5
+tooltip_font_color = #dddddd 100
+
+# Executor 6	(weather local)
+button = new
+button_icon = ~/bin/launcher.png
+#button_text = Menu
+button_tooltip = 
+button_font = Roboto Regular 18
+button_font_color = #888888 100
+button_background_id = 0
+button_centered = 0
+button_padding = 10 1 1
+button_max_icon_size = 32
+button_lclick_command = jgmenu_run
+# button_mclick_command = 
+button_rclick_command = jgmenu_run
+#button_uwheel_command =
+#button_dwheel_command = 
+
+#-------------------------------------
+# Executor 1	(music)
+execp = new
+execp_command = mpc current --format '%title% - %artist%' | head -n 2
+execp_interval = 120
+execp_has_icon = 0
+execp_cache_icon = 1
+execp_continuous = 0
+execp_markup = 1
+execp_tooltip = 
+execp_lclick_command = mpc toggle
+execp_rclick_command = mpc next
+execp_font = Roboto Regular 20
+execp_font_color = #ffffff 100
+execp_padding = 8 0
+execp_background_id = 2
+execp_centered = 0
+execp_icon_w = 0
+execp_icon_h = 0
+
+#-------------------------------------
+# Executor 2	(weather local)
+execp = new
+execp_command = ~/bin/weather.sh
+execp_interval = 600
+execp_has_icon = 1
+execp_cache_icon = 1
+execp_continuous = 0
+execp_markup = 1
+execp_tooltip = Current weather --> leftclick for 7days weather forecast
+execp_lclick_command = xdg-open https://openweathermap.org/city/4583127
+execp_rclick_command = 
+execp_mclick_command = 
+execp_uwheel_command = 
+execp_dwheel_command = 
+execp_font = Roboto 22
+execp_font_color = #ffffff 100
+execp_padding = 20 0
+execp_background_id = 0
+execp_centered = 0
+execp_icon_w = 48
+execp_icon_h = 48 
+
+
+#-------------------------------------
+# Executor 3
+execp = new
+execp_command = psuinfo -IM
+execp_interval = 120
+execp_has_icon = 0
+execp_cache_icon = 1
+execp_continuous = 1
+execp_markup = 1
+execp_tooltip = 
+execp_lclick_command = 
+execp_rclick_command = 
+execp_mclick_command = 
+execp_uwheel_command = 
+execp_dwheel_command = 
+execp_font = Roboto 22
+execp_font_color = #ffffff 100
+execp_padding = 20 0
+execp_background_id = 0
+execp_centered = 0
+execp_icon_w = 0
+execp_icon_h = 0
+
+#-------------------------------------
+# Executor 4
+execp = new
+execp_command = psuinfo -In -W1
+execp_interval = 600
+execp_has_icon = 0
+execp_cache_icon = 1
+execp_continuous = 1
+execp_markup = 1
+execp_tooltip =
+execp_lclick_command =
+execp_rclick_command =
+execp_mclick_command =
+execp_uwheel_command =
+execp_dwheel_command =
+execp_font = Roboto 22
+execp_font_color = #ffffff 100
+execp_padding = 10 0
+execp_background_id = 0
+execp_centered = 0
+execp_icon_w = 0
+execp_icon_h = 0
diff --git a/.msmtprc b/.msmtprc
index 53b3531..cfaaeb5 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -1,18 +1,21 @@
-account sng@luxagraf.net
-host echo.mxrouting.net
+defaults
 port 587
 protocol smtp
 auth on
+host echo.mxrouting.net
+tls on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+#tls_nocertcheck
+logfile ~/.msmtp.log
+
+account personal
 from sng@luxagraf.net
 user sng@luxagraf.net
 passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/sng_mxroute.gpg"
 
-tls on
-#tls_trust_file ~/.mutt/DigiCertHighAssuranceEVRootCA.crt
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-logfile ~/.msmtp.log
-account default : sng@luxagraf.net
+account work
+from wired@scottgilbertson.net
+user wired@scottgilbertson.net
+passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/wired@scottgilbertson.net.gpg"
 
-tls on
-tls_nocertcheck
-logfile ~/.msmtp.log
+account default : personal
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 3366b40..da04d60 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -30,10 +30,6 @@ set meta_key=yes         # since control-j/k don't work use meta
 #set sidebar_width   = 30
 #color sidebar_new color221 color233
 
-# Need trash patch for this to work -------------------
-
-set trash = "+mxroute/Trash"
-
 # Status Bar -----------------------------------------
 set status_chars  = " *%A"
 set status_format = "───[ Folder: %f ]───[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───"
@@ -46,45 +42,7 @@ unhdr_order *                           # some distros order things by default
 hdr_order from: to: cc: date: subject:  # and in this order
 
 
-# Account Settings -----------------------------------
-
-# Default inbox.
-set spoolfile = "+mxroute/INBOX"
-
-# Alternate email addresses.
-alternates "luxagraf@gmail.com|scott_gilbertson@condenast.com"
-
-# Mailboxes to show
-set folder = ~/mail/mxroute
-mailboxes =INBOX \
-          +Archive \
-          +Trash \
-          +Bookmarks \
-          +Sent \
-          +'Old Mail.2008' \
-          +'Old Mail.2009' \
-          +'Old Mail.2010' \
-          +'Old Mail.2011' \
-          +'Old Mail.2012' \
-          +'Old Mail.2013' \
-          +'Old Mail.2014' \
-          +'Old Mail.2015' \
-          +'Old Mail.2016' \
-          +'Old Mail.2017' \
-          +'Old Mail.2018' \
-          +'Old Mail.2019' \
-          +Drafts \
-          +temporary/search \
-# Other special folders.
-set mbox      = "+mxroute/Archive"
-set postponed = "+Drafts"
-
-
-alias sng Scott Gilbertson <sng@luxagraf.net>
-alias wired Scott Gilbertson <scott_gilbertson@wired.com>
- 
-macro compose v "<edit-from>^Uidentity_<tab>" "Select from" 
- # Index View Options ---------------------------------
+# Index View Options ---------------------------------
 set date_format = "%m/%d"
 set index_format = "[%Z]  %D  %-20.20F  %s"
 set sort = threads                         # like gmail
@@ -117,7 +75,7 @@ macro index,pager a "<save-message>=Archive<enter><sync-mailbox>" "Archive"
 macro index,pager s "<save-message>=starred<enter><sync-mailbox>" "Starred"
 macro index,pager gi "<change-folder>=INBOX<enter>" "Go to inbox"
 macro index,pager ga "<change-folder>=Archive<enter>" "Go to all mail"
-macro index,pager gb "<change-folder>=bookmarks<enter>" "Go to Bookmarks"
+macro index,pager gb "<change-folder>=Bookmarks<enter>" "Go to Bookmarks"
 #macro index,pager gs "<change-folder>=starred<enter>" "Go to starred messages"
 macro index,pager gs "<change-folder>=Sent<enter>" "Go to starred messages"
 #Save a message to my notes folder
@@ -174,21 +132,8 @@ set reverse_name                     # reply as whomever it was to
 set include                          # include message in replies
 set forward_quote                    # include message in forwards
 
-set editor = "nvim"        # Use terminal Vim to compose email.
 
-set from     = "sng@luxagraf.net"
-set sendmail = "/usr/bin/msmtp"
-set sendmail_wait = 0
 #set record = "/home/lxf/mail/fastmail/sent"
-set record = "=Sent"  
-#macro generic "<esc>1" ":set from=scott_gilbertson@wired.com"
-#macro generic "<esc>2" ":set from=you@your-employer.example"
-#macro generic "<esc>3" ":set from=you@some-other-provider.example"
-
-#after the fact identity switching is less prone to me being an idiot, switching to a different account and then forgetting I did that.
-alias identity_sng Scott Gilbertson <sng@luxagraf.net>
-alias identity_wired Scott Gilbertson <scott_gilbertson@wired.com>
-macro compose v "<edit-from>^Uidentity_<tab>" "Select from" 
 
 #source ~/.mutt/alias
 
@@ -199,13 +144,8 @@ bind index p recall-message
 set query_command = "abook --mutt-query '%s'"
 bind editor <Tab> complete-query
 bind editor ^T    complete
-#source ~/.mutt/mutt-colors-solarized-dark-256.muttrc
+set editor="vim -c 'set spell spelllang=en'" 
 source ~/.mutt/mutt-colors-solarized-dark-16.muttrc
-#source ~/.mutt/mutt-zenburn.muttrc
-
-#make N do something useful/like Vim
-#bind index N search-opposite
-#bind pager N search-opposite
 
 #undo limit searches
 macro index c "<limit>all\n" "show all messages (undo limit)"
@@ -216,3 +156,9 @@ macro index <F9> "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt
 
 #macro generic,index,pager \ca "<shell-escape>abook<return>" "launch abook"
 macro index,pager A "<pipe-message>abook --add-email<return>" "add the sender address to abook"
+
+set spoolfile = "+personal/INBOX"
+source ~/.mutt/personal
+
+folder-hook personal/* source ~/.mutt/personal
+#folder-hook wired/*     source ~/.mutt/work
diff --git a/.mutt/personal b/.mutt/personal
new file mode 100644
index 0000000..748b1bf
--- /dev/null
+++ b/.mutt/personal
@@ -0,0 +1,33 @@
+set from = "sng@luxagraf.net"
+set folder = ~/mail/personal
+set sendmail = "/usr/bin/msmtp -a personal"
+set sendmail_wait = 0
+set trash = "+Trash"
+set mbox = "+Archive"
+set postponed = "+Drafts"
+set record="+Sent"
+# Alternate email addresses.
+alternates "luxagraf@gmail.com"
+
+# Mailboxes to show
+mailboxes =INBOX \
+          +Archive \
+          +Work \
+          +Trash \
+          +Bookmarks \
+          +Darktable \
+          +Sent \
+          +'Old Mail.2008' \
+          +'Old Mail.2009' \
+          +'Old Mail.2010' \
+          +'Old Mail.2011' \
+          +'Old Mail.2012' \
+          +'Old Mail.2013' \
+          +'Old Mail.2014' \
+          +'Old Mail.2015' \
+          +'Old Mail.2016' \
+          +'Old Mail.2017' \
+          +'Old Mail.2018' \
+          +'Old Mail.2019' \
+          +Drafts \
+          +temporary/search
diff --git a/.offlineimaprc b/.offlineimaprc
index 63171d7..bccdd21 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,15 +1,15 @@
 [general]
 ui = ttyui
-accounts = MxRoute
+accounts = Personal
 pythonfile=~/.mutt/offlineimap.py
 fsync = False
 
-[Account MxRoute]
-localrepository = MxRouteLocal
-remoterepository = MxRouteRemote
+[Account Personal]
+localrepository = Personal-Local
+remoterepository = Personal-Remote
 postsynchook = notmuch new
 
-[Repository MxRouteRemote]
+[Repository Personal-Remote]
 maxconnections = 1
 sslcacertfile = /etc/ssl/certs/ca-certificates.crt
 ssl_versions = tls1_2
@@ -19,8 +19,29 @@ remoteport = 993
 remoteuser = sng@luxagraf.net
 ssl = yes
 remotepasseval = get_password("sng_mxroute")
-folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts', 'Darktable', 'Old Mail']
+folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts', 'Darktable', 'Old Mail', 'Starred', 'Work', 'Old Mail.2014']
 
-[Repository MxRouteLocal]
+[Repository Personal-Local]
 type = Maildir
-localfolders = ~/mail/mxroute
+localfolders = ~/mail/personal
+
+#[Account Wired]
+#localrepository = Wired-Local
+#remoterepository = Wired-Remote
+#postsynchook = notmuch new
+#
+#[Repository Wired-Remote]
+#maxconnections = 1
+#sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+#ssl_versions = tls1_2
+#type = IMAP
+#remotehost = echo.mxrouting.net
+#remoteport = 993
+#remoteuser = wired@scottgilbertson.net
+#ssl = yes
+#remotepasseval = get_password("wired@scottgilbertson.net")
+#folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Archive', 'Drafts']
+#
+#[Repository Wired-Local]
+#type = Maildir
+#localfolders = ~/mail/wired
diff --git a/.photocopyrc b/.photocopyrc
index 80e45b5..1f4e931 100644
--- a/.photocopyrc
+++ b/.photocopyrc
@@ -1 +1 @@
-DSC03571.ARW
-\ No newline at end of file
+DSC04454.ARW
diff --git a/.rsync-exclude-weekly b/.rsync-exclude-weekly
index 3bc79a3..7599fc2 100644
--- a/.rsync-exclude-weekly
+++ b/.rsync-exclude-weekly
@@ -1,3 +1,4 @@
+
 .cache/
 venv/
 .DS_Store
@@ -5,7 +6,6 @@ venv/
 .gem/
 .mozilla/
 .tor-browser-en/
-downloads/
 temp/
 .config/skypeforlinux
 .config/vivaldi-snapshot/SingletonCookie
@@ -19,3 +19,7 @@ temp/
 .googleearth/
 .w3m/
 .ssh/
+cache/
+.thunderbird/
+bin/venv
+bin/venv3
diff --git a/.tmux.conf b/.tmux.conf
index 4cdf789..045f701 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -51,6 +51,10 @@ bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq v
 bind l send-keys 'C-l'
 # setup a decent environment
 bind m source-file ~/.tmux/thesetup
+bind C-f source-file ~/.tmux/write-fict
+bind C-x source-file ~/.tmux/write-lux
+bind C-w source-file ~/.tmux/write-wire
+bind C-d source-file ~/.tmux/dev
 
 set -g status-left-length 52
 set -g status-right-length 451
diff --git a/.tmux/dev b/.tmux/dev
new file mode 100644
index 0000000..e18f035
--- /dev/null
+++ b/.tmux/dev
@@ -0,0 +1,5 @@
+neww -n '' 
+splitw -h -p 36
+send "cd ~/sites/luxagraf.net/ && lxc exec lxf -- su - lxf" enter #open vim
+selectp -t 1 # select the original pane
+send "cd ~/sites/luxagraf.net/ && v" enter #open vim
diff --git a/.tmux/write-fict b/.tmux/write-fict
new file mode 100644
index 0000000..63b08dd
--- /dev/null
+++ b/.tmux/write-fict
@@ -0,0 +1,6 @@
+neww -n '' 
+rename-window "lbh"
+splitw -h -p 22
+selectp -t 1 # select the original pane
+splitw -h -p 69
+send "cd ~/lbh/ && v lbh.txt" enter #open vim
diff --git a/.tmux/write-lux b/.tmux/write-lux
new file mode 100644
index 0000000..56c58c4
--- /dev/null
+++ b/.tmux/write-lux
@@ -0,0 +1,5 @@
+neww -n 'lux' 
+splitw -h -p 22
+selectp -t 1 # select the original pane
+splitw -h -p 69
+send "cd ~/lux/ && v" enter #open vim
diff --git a/.tmux/write-wire b/.tmux/write-wire
new file mode 100644
index 0000000..da7c7bd
--- /dev/null
+++ b/.tmux/write-wire
@@ -0,0 +1,6 @@
+neww -n '' 
+rename-window "wir"
+splitw -h -p 22
+selectp -t 1 # select the original pane
+splitw -h -p 69
+send "cd ~/writing/conde/wired/ && v wired.txt" enter #open vim
diff --git a/.vimrc b/.vimrc
index c4eaeb0..d119ace 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,7 +12,6 @@ Bundle 'tpope/vim-surround'
 Bundle 'vim-scripts/multvals.vim'
 Bundle 'altercation/vim-colors-solarized'
 Bundle 'vim-scripts/django.vim'
-Bundle 'nelstrom/vim-markdown-folding'
 Bundle 'tpope/vim-markdown'
 Bundle 'amperser/proselint'
 Bundle 'jgdavey/tslime.vim'
@@ -413,6 +412,7 @@ let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
 let g:SuperTabDefaultCompletionType = '<C-n>'
 
 nnoremap <silent> <c-s> :NV<CR>
+let g:markdown_folding = 1
 let g:markdown_fold_style = 'nested'
 
 nmap <leader>i :%s/
 //g
diff --git a/.xinitrc b/.xinitrc
index 1a1d7db..5e9796a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,4 @@
-dbus-update-activation-environment --systemd DISPLAY
+#dbus-update-activation-environment --systemd DISPLAY
 xrdb -merge ~/.Xresources
 xmodmap .Xmodmap
 exec openbox-session
author	luxagraf <sng@luxagraf>	2021-05-05 20:20:52 -0400
committer	luxagraf <sng@luxagraf>	2021-05-05 20:20:52 -0400
commit	484d4d8cbaa5145324d80456ab5ddb624f590ddc (patch)
tree	10de629be1b9b597fe2acb935031c04199a268db
parent	dbb33e4bfbf7b9e7fe3f3a38cc501bc3d3aa4732 (diff)