Merge remote-tracking branch 'origin/master'

dotfiles/config/autorandr/family_room_above_stevie-nixos/config

@@ -0,0 +1,15 @@
+output DP-1
+off
+output DP-2
+off
+output DP-3
+crtc 1
+mode 1920x1080
+pos 0x0
+rate 60.00
+output eDP-1
+crtc 0
+mode 2560x1600
+pos 0x1080
+primary
+rate 59.99

dotfiles/config/autorandr/family_room_above_stevie-nixos/setup

@@ -0,0 +1,2 @@
+DP-3 00ffffffffffff001e6d010001010101011a010380a05a780aee91a3544c99260f5054a108003140454061407140818001010101010131ce0046f0705a8020108a0040846300001e023a801871382d40582c450040846300001e000000fd003a3e1e883c000a202020202020000000fc004c47205456205256550a20202001b7020346f14e5d10222005040302015e5f000000293d06c01507500957076e030c001000b83c20008001020300e200cfee0146d00024180900ad5244a9230c00000000e30e0000011d8018711c1620582c250040846300009e662150b051001b304070360040846300001e00000000000000000000000000000000000000000099
+eDP-1 00ffffffffffff004d10d61400000000051e0104b52517780a771bab5233ba250c51560000000101010101010101010101010101010172e700a0f0604590302036006ee51000001828b900a0f0604590302036006ee510000018000000fe00374a584b38814c513137305231000000000002410332011200000b010a2020018502030f00e3058000e606050160602800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa

dotfiles/config/autorandr/stevie-nixos/config

@@ -0,0 +1,12 @@
+output DP-1
+off
+output DP-2
+off
+output DP-3
+off
+output eDP-1
+crtc 0
+mode 2560x1600
+pos 0x0
+primary
+rate 59.99

dotfiles/config/autorandr/stevie-nixos/setup

@@ -0,0 +1 @@
+eDP-1 00ffffffffffff004d10d61400000000051e0104b52517780a771bab5233ba250c51560000000101010101010101010101010101010172e700a0f0604590302036006ee51000001828b900a0f0604590302036006ee510000018000000fe00374a584b38814c513137305231000000000002410332011200000b010a2020018502030f00e3058000e606050160602800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa

dotfiles/config/rofi/colorful/colors.rasi

@@ -2,8 +2,8 @@
 
 * {
   al:  #00000000;
-  bg:  #00000099;
+  bg:  #000000ff;
   se:  #101010ff;
   fg:  #FFFFFFff;
-  ac:  #FFFF00ff;
+  ac:  #EC7875ff;
 }

dotfiles/config/rofi/colorful/launcher.sh

@@ -12,7 +12,7 @@
 # style_7     style_8     style_9     style_10    style_11    style_12
 
 theme="style_1"
-dir="$HOME/.config/rofi/colorful"
+dir="$HOME/.config/rofi/launchers/colorful"
 
 # dark
 ALPHA="#00000000"

dotfiles/config/rofi/colorful/style_1.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -95,11 +93,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           64px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0.5;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_10.rasi

@@ -8,32 +8,35 @@
  */
 
 configuration {
+	font:							"Iosevka Nerd Font 10";
     show-icons:                     true;
 	icon-theme: 					"Papirus";
     display-drun: 					"Applications";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     true;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
 @import "colors.rasi"
 
 window {
+    transparency:                   "real";
     background-color:               @bg;
     text-color:                     @fg;
 	border:							0px;
 	border-color:					@ac;
     border-radius:                  0px;
+	width:							100%;
+	height:							100%;
 }
 
 prompt {
     enabled: 						true;
 	padding: 						1% 0.75% 1% 0.75%;
 	background-color: 				@ac;
-	text-color: 					@bg;
+	text-color: 					@fg;
     border-radius:                  100%;
+	font:							"Iosevka Nerd Font 12";
 }
 
 textbox-prompt-colon {
@@ -94,11 +97,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           24px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_11.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"Applications";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -102,6 +100,10 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           24px;
     border:                         1%;
     border-color:                  	@ac;
@@ -110,6 +112,8 @@ element-icon {
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_12.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					" Applications";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -102,6 +100,10 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           64px;
     border:                         1%;
     border-color:                  	@se;
@@ -111,6 +113,8 @@ element-icon {
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0.5;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_2.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -95,11 +93,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           32px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_3.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -96,11 +94,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           32px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_4.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -95,11 +93,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           48px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0.5;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_5.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -95,11 +93,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           24px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_6.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     true;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -28,6 +26,8 @@ window {
 	border:							0px;
 	border-color:					@ac;
     border-radius:                  0px;
+	width:							100%;
+	height:							100%;
 }
 
 prompt {
@@ -90,11 +90,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           80px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0.5;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_7.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -95,11 +93,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           24px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_8.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"Applications";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -101,11 +99,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           24px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/colorful/style_9.rasi

@@ -14,8 +14,6 @@ configuration {
     display-drun: 					"Applications";
     drun-display-format:            "{name}";
     disable-history:                false;
-    fullscreen:                     false;
-	hide-scrollbar: 				true;
 	sidebar-mode: 					false;
 }
 
@@ -102,11 +100,17 @@ element {
 }
 
 element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
     size:                           24px;
     border:                         0px;
 }
 
 element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
     expand:                         true;
     horizontal-align:               0;
     vertical-align:                 0.5;

dotfiles/config/rofi/config

@@ -1,6 +0,0 @@
-rofi.terminal:         termite
-rofi.sidebar-mode:     false
-rofi.theme:            sidestyle.rasi
-rofi.drun-icon-theme:  Papirus
-rofi.show-icons:       true
-rofi.dpi: 100

dotfiles/config/taffybar/taffybar

@@ -1 +1 @@
-Subproject commit af67fdf4c5079770c2b1ebcb2c46697a9da42261
+Subproject commit 437f73075261f5e0a018aa190f49d2f50d371aed

dotfiles/config/taffybar/taffybar.css

@@ -38,6 +38,9 @@
 .workspaces .contents {
 	box-shadow: none;
 	border-radius: 4px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: @transparent;
 }
 
 .workspace-label {

dotfiles/config/xmonad/xmonad

@@ -1 +1 @@
-Subproject commit aa18707c3ef96db88208509c2a18c6670e831661
+Subproject commit 1e17c1c1bc26cdb93e23d4aa75e57fe48ff4c951

dotfiles/config/xmonad/xmonad.hs

@@ -110,7 +110,7 @@ myConfig = def
   , handleEventHook
   =  followIfNoMagicFocus
   <> minimizeEventHook
-  <> restartEventHook
+  -- <> restartEventHook
   <> myScratchPadEventHook
   , startupHook = myStartup
   , keys = customKeys (const []) addKeys
@@ -137,14 +137,13 @@ restartEventHook _ = return $ All True
 
 myNavigation2DConfig = def { defaultTiledNavigation = centerNavigation }
 
-main = do
+main =
-  dirs <- getDirectories
+  xmonad
-  (`launch` dirs)
+      . docks
-       . docks
+      . pagerHints
-       . pagerHints
+      . ewmh
-       . ewmh
+      . ewmhFullscreen
-       . ewmhFullscreen
+      . withNavigation2DConfig myNavigation2DConfig $ myConfig
-       . withNavigation2DConfig myNavigation2DConfig $ myConfig
 
 -- Utility functions
 
@@ -295,10 +294,25 @@ disableOnTabbed = ConditionalLayoutModifier DisableOnTabbedCondition
 myMagnify = ModifiedLayout $ disableOnTabbed (Mag 1 (1.3, 1.3) On (AllWins 1))
 
 -- Toggles
-unmodifyLayout (ModifiedLayout _ x') =  x'
+unmodifyLayout (ModifiedLayout _ x') = x'
+unmodifyMuted (MutedModifiedLayout m) = unmodifyLayout m
 
-selectLimit =
+data MutedModifiedLayout m l a =
-  myDmenu ["2", "3", "4"] >>= (setLimit . read)
+  MutedModifiedLayout (ModifiedLayout m l a) deriving (Read, Show)
+
+instance (LayoutModifier m Window, LayoutClass l Window, Typeable m) =>
+  LayoutClass (MutedModifiedLayout m l) Window where
+    runLayout (W.Workspace i (MutedModifiedLayout l) ms) r =
+      fmap (fmap MutedModifiedLayout) `fmap` runLayout (W.Workspace i l ms) r
+    doLayout (MutedModifiedLayout l) r s =
+      fmap (fmap MutedModifiedLayout) `fmap` doLayout l r s
+    emptyLayout (MutedModifiedLayout l) r =
+      fmap (fmap MutedModifiedLayout) `fmap` emptyLayout l r
+    handleMessage (MutedModifiedLayout l) =
+      fmap (fmap MutedModifiedLayout) . handleMessage l
+    description (MutedModifiedLayout (ModifiedLayout m l)) = description l
+
+selectLimit = myDmenu ["2", "3", "4"] >>= (setLimit . read)
 
 data MyToggles
   = LIMIT
@@ -309,14 +323,14 @@ data MyToggles
   deriving (Read, Show, Eq, Typeable)
 
 instance Transformer MyToggles Window where
-  transform LIMIT x k = k (limitSlice 2 x) unmodifyLayout
+  transform LIMIT x k = k (MutedModifiedLayout $ limitSlice 2 x) unmodifyMuted
-  transform GAPS x k = k (smartSpacing 5 x) unmodifyLayout
+  transform GAPS x k = k (MutedModifiedLayout $ smartSpacing 5 x) unmodifyMuted
-  transform MAGICFOCUS x k = k (magicFocus x) unmodifyLayout
+  transform MAGICFOCUS x k = k (MutedModifiedLayout $ magicFocus x) unmodifyMuted
-  transform MAGNIFY x k = k (myMagnify x) unmodifyLayout
+  transform MAGNIFY x k = k (MutedModifiedLayout $ myMagnify x) unmodifyMuted
-  transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout
+  transform AVOIDSTRUTS x k = k (MutedModifiedLayout $ avoidStruts x) unmodifyMuted
 
 myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS]
-otherToggles = [NBFULL, MIRROR, NOBORDERS, SMARTBORDERS]
+otherToggles = [NBFULL, NOBORDERS, MIRROR, SMARTBORDERS]
 toggleHandlers =
   [ (Toggle GAPS, toggleAll)
   , (Toggle MAGNIFY, toggleAll)
@@ -425,6 +439,7 @@ layoutNames = [description layout | layout <- layoutList]
 selectLayout = myDmenu layoutNames >>= (sendMessage . JumpToLayout)
 
 myLayoutHook =
+  MutedModifiedLayout .
   minimize .
   boringAuto .
   mkToggle1 AVOIDSTRUTS .

dotfiles/emacs.d/README.org

@@ -3166,7 +3166,6 @@ Intero seems to be causing hangs, so it has been disabled
          `((python . t)
            (ruby . t)
            (octave . t)
-           (sqlite . t)
            (plantuml . t)
            ,@added-modes))))
 
@@ -3850,6 +3849,7 @@ alphanumeric characters only."
 *** forge
 #+begin_src emacs-lisp
 (use-package forge
+  :disabled t
   :after magit)
 #+end_src
 *** magithub
@@ -4233,6 +4233,7 @@ crux-reopen-as-root-mode makes it so that any file owned by root will automatica
 ** erc
 #+BEGIN_SRC emacs-lisp
 (use-package erc
+  :disabled t
   :commands erc
   :config
   (progn
@@ -4854,7 +4855,8 @@ I've disabled perspective because I just don't use it much.
 ** groovy-mode
 This also adds syntax highlighting for gradle
 #+BEGIN_SRC emacs-lisp
-(use-package groovy-mode)
+(use-package groovy-mode
+  :disabled t)
 #+END_SRC
 ** jsx-mode
 #+BEGIN_SRC emacs-lisp
@@ -5043,7 +5045,7 @@ load-theme hook (See the heading below).
 ** After ~load-theme~ hook
 #+BEGIN_SRC emacs-lisp
 (defvar imalison:light-theme 'solarized-light)
-(defvar imalison:dark-theme 'flatland)
+(defvar imalison:dark-theme 'gotham)
 
 (defun imalison:after-load-theme (&rest _args)
   (when (fboundp 'powerline-reset)

nixos/essential-no-arm.nix

@@ -4,5 +4,6 @@
     spotify
     google-chrome
     pommed_light
+    torbrowser
   ];
 }

nixos/essential.nix

@@ -31,7 +31,6 @@ in
     dolphin
     element-desktop
     gpick
-    torbrowser
 
     # Appearance
     numix-icon-theme-circle

nixos/jellyfin.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  services.jellyfin = {
-    enable = true;
-    openFirewall = true;
-  };
-}

nixos/nixpkgs

@@ -1 +1 @@
-Subproject commit 449bff2c3447f796be48dfc0a7156d7f62a2caef
+Subproject commit 022c300df10d5e90ea9738441fd3d978b80596e5

nixos/raspberry-pi.nix

@@ -43,6 +43,13 @@
     raspberrypi-eeprom
   ];
 
+  environment = {
+    # This allows alacritty to run
+    extraInit = ''
+      export LIBGL_ALWAYS_SOFTWARE=1
+    '';
+  };
+
   nix = {
     autoOptimiseStore = true;
     gc = {