From 7d772e0eeaecdb897fa0d5344eea113b78236a81 Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Mon, 10 May 2021 23:56:40 -0400
Subject: [PATCH] Xmonad Switch to Polybar & Other Small Changes

- Add oryx pro 7 specific Xresource settings
- Remove exec fish from bashrc so bash is actually usable
- Org document cleanup
- Add zoom to blur background exclude in picom config
- Xmonad switch from Xmobar to Polybar
---
 .Xresources              | 16 +++++++++++++---
 .bashrc                  |  3 ---
 .config/emacs            |  2 +-
 .config/picom/picom.conf |  1 +
 .xmonad                  |  2 +-
 README.org               | 30 ++++++++++++++++++++++++------
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/.Xresources b/.Xresources
index e659733..3724a97 100644
--- a/.Xresources
+++ b/.Xresources
@@ -40,16 +40,25 @@
 *.color15:    WHITE1
 *.color16:    ORANGE
 
-! Regular DPI Parameters
+! System76 Oryx Pro 7 DPI Parameters
 #define DPI 96
 #define BAR_HEIGHT 25
-#define MODULE_MARGIN 2
+#define MODULE_MARGIN 1
+#define MODULE_PADDING 2
 #define TRAY_MAXSIZE 15
 #define TRAY_SCALE 1
 #define BORDER_SIZE 2
 #define INNER_GAPS 20
 #define OUTER_GAPS 10
-#define MAXLEN 75
+#define MAXLEN 50
+#define CURSOR_SIZE 16
+
+! Polybar
+polybar.bar-height:    BAR_HEIGHT
+polybar.module-margin: MODULE_MARGIN
+polybar.tray-maxsize:  TRAY_MAXSIZE
+polybar.tray-scale:    TRAY_SCALE
+polybar.maxlen:        MAXLEN
 
 ! Dunst
 dunst.geometry-x:           OUTER_GAPS
@@ -71,3 +80,4 @@ dunst.critical-frame:       PURPLE1
 
 ! Display Scaling
 *.dpi: DPI
+Xcursor.size: CURSOR_SIZE
diff --git a/.bashrc b/.bashrc
index 259086f..e487b5c 100644
--- a/.bashrc
+++ b/.bashrc
@@ -124,6 +124,3 @@ export EDITOR="code -w"
 export TERM=xterm-256color
 export QT_STYLE_OVERRIDE=kvantum
 export XDG_CONFIG_HOME=$HOME/.config
-
-# Set fish as interactive shell only
-exec fish
diff --git a/.config/emacs b/.config/emacs
index 5505fbd..2816aff 160000
--- a/.config/emacs
+++ b/.config/emacs
@@ -1 +1 @@
-Subproject commit 5505fbd6a6e66b7829fe1aec46cca0ff7930cf82
+Subproject commit 2816aff602397a3f9e3f592963fd61ff9c3ba76c
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 70cab8f..d93ff49 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -272,6 +272,7 @@ blur-background-exclude = [
   # when taking selection screenshot with `main`
   # https://github.com/naelstrof/maim/issues/130
   "class_g = 'slop'",
+  "class_g = 'zoom'",
   "_GTK_FRAME_EXTENTS@:c"
 ];
 
diff --git a/.xmonad b/.xmonad
index 1bb3509..f803927 160000
--- a/.xmonad
+++ b/.xmonad
@@ -1 +1 @@
-Subproject commit 1bb350973637d6b4706efd02ccaed084c2eac4ec
+Subproject commit f803927440d2443912676b6a4cb29c5193fca131
diff --git a/README.org b/README.org
index ffbc764..3cc449a 100644
--- a/README.org
+++ b/README.org
@@ -1817,6 +1817,7 @@ Pull and update submodules
     # when taking selection screenshot with `main`
     # https://github.com/naelstrof/maim/issues/130
     "class_g = 'slop'",
+    "class_g = 'zoom'",
     "_GTK_FRAME_EXTENTS@:c"
   ];
 #+end_src
@@ -3276,9 +3277,6 @@ Pull and update submodules
   export TERM=xterm-256color
   export QT_STYLE_OVERRIDE=kvantum
   export XDG_CONFIG_HOME=$HOME/.config
-
-  # Set fish as interactive shell only
-  exec fish
 #+end_src
 *** Zsh
 
@@ -5574,17 +5572,35 @@ Pull and update submodules
 
 *** Sizes
 
-#+begin_src conf :tangle .Xresources
+*NOT IN USE*
+#+begin_src conf :tangle no
   ! Regular DPI Parameters
   #define DPI 96
   #define BAR_HEIGHT 25
   #define MODULE_MARGIN 2
+  #define MODULE_PADDING 2
   #define TRAY_MAXSIZE 15
   #define TRAY_SCALE 1
   #define BORDER_SIZE 2
   #define INNER_GAPS 20
   #define OUTER_GAPS 10
   #define MAXLEN 75
+  #define CURSOR_SIZE 16
+#+end_src
+
+#+begin_src conf :tangle .Xresources
+  ! System76 Oryx Pro 7 DPI Parameters
+  #define DPI 96
+  #define BAR_HEIGHT 25
+  #define MODULE_MARGIN 1
+  #define MODULE_PADDING 2
+  #define TRAY_MAXSIZE 15
+  #define TRAY_SCALE 1
+  #define BORDER_SIZE 2
+  #define INNER_GAPS 20
+  #define OUTER_GAPS 10
+  #define MAXLEN 50
+  #define CURSOR_SIZE 16
 #+end_src
 
 *NOT IN USE*
@@ -5593,12 +5609,14 @@ Pull and update submodules
   #define DPI 192
   #define BAR_HEIGHT 50
   #define MODULE_MARGIN 1
+  #define MODULE_PADDING 2
   #define TRAY_MAXSIZE 30
   #define TRAY_SCALE 1
   #define BORDER_SIZE 4
   #define INNER_GAPS 40
   #define OUTER_GAPS 20
   #define MAXLEN 45
+  #define CURSOR_SIZE 32
 #+end_src
 
 *** Application Specific Changes
@@ -5623,8 +5641,7 @@ Pull and update submodules
 
 **** Polybar
 
-*NOT IN USE*
-#+begin_src conf :tangle no
+#+begin_src conf :tangle .Xresources
   ! Polybar
   polybar.bar-height:    BAR_HEIGHT
   polybar.module-margin: MODULE_MARGIN
@@ -5660,6 +5677,7 @@ Pull and update submodules
 #+begin_src conf :tangle .Xresources
   ! Display Scaling
   ,*.dpi: DPI
+  Xcursor.size: CURSOR_SIZE
 #+end_src
 
 * Acknowledgements