From 2c5b001259b40f657bc41644a1afb24118446e17 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sun, 11 Oct 2020 08:46:50 -0400
Subject: [PATCH] various minor changes

---
 brc                               | 24 +++++++++++++++---------
 i3-sway/common.conf               |  3 +++
 subdir_files/.config/i3/config    |  3 +++
 subdir_files/.config/mpv/mpv.conf |  6 +++---
 subdir_files/.config/sway/config  |  3 +++
 subdir_files/.gnupg/gpg.conf      | 10 ++++++++++
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/brc b/brc
index 4823951..96b6812 100644
--- a/brc
+++ b/brc
@@ -1573,20 +1573,26 @@ te() {
   return $ret
 }
 
+psoff() {
+  # normally, i would just execute these commands in the function.
+  # however, DEBUG is not inherited, so we need to run it outside a function.
+  # And we want to run set -x afterwards to avoid spam, so we cram everything
+  # in here, and then it will run after this function is done.
+  PROMPT_COMMAND='trap DEBUG; unset PROMPT_COMMAND; PS1="\w \$ "'
+}
+pson() {
+  PROMPT_COMMAND=prompt-command
+  if [[ $TERM == *(screen*|xterm*|rxvt*) ]]; then
+    trap 'settitle "$BASH_COMMAND"' DEBUG
+  fi
+}
 
 tx() { # toggle set -x, and the prompt so it doesnt spam
   if [[ $- == *x* ]]; then
     set +x
-    PROMPT_COMMAND=prompt-command
-    if [[ $TERM == *(screen*|xterm*|rxvt*) ]]; then
-      trap 'settitle "$BASH_COMMAND"' DEBUG
-    fi
+    pson
   else
-    # normally, i would just execute these commands in the function.
-    # however, DEBUG is not inherited, so we need to run it outside a function.
-    # And we want to run set -x afterwards to avoid spam, so we cram everything
-    # in here, and then it will run after this function is done.
-    PROMPT_COMMAND='trap DEBUG; unset PROMPT_COMMAND; PS1="\w \$ "; set -x'
+    psoff
   fi
 }
 
diff --git a/i3-sway/common.conf b/i3-sway/common.conf
index ccd022a..3da74b8 100644
--- a/i3-sway/common.conf
+++ b/i3-sway/common.conf
@@ -91,3 +91,6 @@ font pango:monospace 8
 
 # shortcut to selection widget (primary)
 bindsym $mod+End exec /a/opt/clipster/clipster -sp
+
+# file:///usr/share/doc/i3-wm/userguide.html#_border_style_for_new_windows
+new_window none
diff --git a/subdir_files/.config/i3/config b/subdir_files/.config/i3/config
index dbc2243..14f3819 100644
--- a/subdir_files/.config/i3/config
+++ b/subdir_files/.config/i3/config
@@ -10,6 +10,7 @@ bindsym $mod+2 exec "pavucontrol"
 bindsym $mod+3 exec "x-www-browser"
 bindsym $mod+4 exec "x-www-browser -no-remote -P firefox-main-profile"
 bindsym $mod+5 exec "/usr/local/bin/start-tor-browser"
+bindsym $mod+6 exec "/a/bin/redshift.sh"
 bindsym $mod+equal exec "t s w; t in"
 bindsym $mod+Home exec "t out"
 #bindsym $mod+End exec "t s x; t in"
@@ -90,6 +91,8 @@ font pango:monospace 8
 
 # shortcut to selection widget (primary)
 bindsym $mod+End exec /a/opt/clipster/clipster -sp
+
+new_window none
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
diff --git a/subdir_files/.config/mpv/mpv.conf b/subdir_files/.config/mpv/mpv.conf
index 8e83e9d..2739166 100644
--- a/subdir_files/.config/mpv/mpv.conf
+++ b/subdir_files/.config/mpv/mpv.conf
@@ -1,10 +1,10 @@
 #loop=inf
 
-
+#pause
 #loop-file=inf
 loop-file=no
-shuffle
-volume=20
+#shuffle
+#volume=20
 #save-position-on-quit
 
 # use --profile d
diff --git a/subdir_files/.config/sway/config b/subdir_files/.config/sway/config
index 1617507..6572f34 100644
--- a/subdir_files/.config/sway/config
+++ b/subdir_files/.config/sway/config
@@ -10,6 +10,7 @@ bindsym $mod+2 exec "pavucontrol"
 bindsym $mod+3 exec "x-www-browser"
 bindsym $mod+4 exec "x-www-browser -no-remote -P firefox-main-profile"
 bindsym $mod+5 exec "/usr/local/bin/start-tor-browser"
+bindsym $mod+6 exec "/a/bin/redshift.sh"
 bindsym $mod+equal exec "t s w; t in"
 bindsym $mod+Home exec "t out"
 #bindsym $mod+End exec "t s x; t in"
@@ -90,6 +91,8 @@ font pango:monospace 8
 
 # shortcut to selection widget (primary)
 bindsym $mod+End exec /a/opt/clipster/clipster -sp
+
+new_window none
 # exit sway (logs you out of your Wayland session)
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 
diff --git a/subdir_files/.gnupg/gpg.conf b/subdir_files/.gnupg/gpg.conf
index c60b19d..c764ca7 100644
--- a/subdir_files/.gnupg/gpg.conf
+++ b/subdir_files/.gnupg/gpg.conf
@@ -50,3 +50,13 @@ keyserver hkp://ipv4.pool.sks-keyservers.net
 
 # more secure hkps, but had problems with my gpg version
 #keyserver hkps://hkps.pool.sks-keyservers.net
+
+### begin things added by enigmail
+cert-digest-algo SHA256
+no-emit-version
+no-comments
+personal-cipher-preferences AES AES256 AES192 CAST5
+personal-digest-preferences SHA256 SHA512 SHA384 SHA224
+ignore-time-conflict
+allow-freeform-uid
+### end things added by enigmail
-- 
2.30.2