From 910783f3093e2cdb717a64f4695d0f9dacc6869f Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 21 Aug 2021 19:06:26 +0000 Subject: [PATCH 01/14] [NixOS] Set LIBGL_ALWAYS_SOFTWARE=1 for raspberry pi --- nixos/raspberry-pi.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index e34803e2..4af2ae7a 100644 --- a/nixos/raspberry-pi.nix +++ b/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 = { From 90cd014561ff88ec0be2baf1195298b7f808580c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 21 Aug 2021 19:07:31 +0000 Subject: [PATCH 02/14] [Emacs] Disable a few things that don't set up cleanly --- dotfiles/emacs.d/README.org | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index a9d63c16..3853f090 100644 --- a/dotfiles/emacs.d/README.org +++ b/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)))) @@ -3848,6 +3847,7 @@ alphanumeric characters only." *** forge #+begin_src emacs-lisp (use-package forge + :disabled t :after magit) #+end_src *** magithub @@ -4231,6 +4231,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 @@ -4852,7 +4853,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 From 75c999288b5430a5faaccf2d233f16c7f70dc580 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 21 Aug 2021 19:09:19 +0000 Subject: [PATCH 03/14] [NixOS] Remove jellyfin --- nixos/jellyfin.nix | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 nixos/jellyfin.nix diff --git a/nixos/jellyfin.nix b/nixos/jellyfin.nix deleted file mode 100644 index 9b4b4f6c..00000000 --- a/nixos/jellyfin.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - services.jellyfin = { - enable = true; - openFirewall = true; - }; -} From 3d894ba205a6e1ac77393f64925ca084a1710207 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 Sep 2021 16:52:11 -0600 Subject: [PATCH 04/14] [taffybar] Add indication that workspace is visible but not focused --- dotfiles/config/taffybar/taffybar.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css index 8da31007..fa2c22bb 100644 --- a/dotfiles/config/taffybar/taffybar.css +++ b/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 { From b0b03881e98cd85272a3cf721d27543c04ac3b38 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 Sep 2021 18:24:56 -0600 Subject: [PATCH 05/14] [XMonad] Use nix-flake recompilation support --- dotfiles/config/xmonad/xmonad | 2 +- dotfiles/config/xmonad/xmonad.hs | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad index aa18707c..485a0ad5 160000 --- a/dotfiles/config/xmonad/xmonad +++ b/dotfiles/config/xmonad/xmonad @@ -1 +1 @@ -Subproject commit aa18707c3ef96db88208509c2a18c6670e831661 +Subproject commit 485a0ad506b8fb4a93a01a7cdd437121ecf5e40c diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 198e3948..c405c489 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/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 - dirs <- getDirectories - (`launch` dirs) - . docks - . pagerHints - . ewmh - . ewmhFullscreen - . withNavigation2DConfig myNavigation2DConfig $ myConfig +main = + xmonad + . docks + . pagerHints + . ewmh + . ewmhFullscreen + . withNavigation2DConfig myNavigation2DConfig $ myConfig -- Utility functions @@ -316,7 +315,7 @@ instance Transformer MyToggles Window where transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS] -otherToggles = [NBFULL, MIRROR, NOBORDERS, SMARTBORDERS] +otherToggles = [NBFULL, NOBORDERS, MIRROR, SMARTBORDERS] toggleHandlers = [ (Toggle GAPS, toggleAll) , (Toggle MAGNIFY, toggleAll) From 9dd253b39b655d39e4e943ea4931aae3f325752c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 Sep 2021 18:25:19 -0600 Subject: [PATCH 06/14] [Emacs] Change default theme to gotham --- dotfiles/emacs.d/README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index a9d63c16..a159c1c5 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -5041,7 +5041,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) From ecabf7ac40922045f445f185bdd5114f6964f13c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 Sep 2021 22:16:17 -0600 Subject: [PATCH 07/14] [taffybar] Bump --- dotfiles/config/taffybar/taffybar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index af67fdf4..437f7307 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit af67fdf4c5079770c2b1ebcb2c46697a9da42261 +Subproject commit 437f73075261f5e0a018aa190f49d2f50d371aed From 04445bb84c813a18a69b702d6a2a1e88d05d7aea Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 Sep 2021 22:17:29 -0600 Subject: [PATCH 08/14] [NixOS] Bump quill --- nixos/nixpkgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/nixpkgs b/nixos/nixpkgs index 449bff2c..022c300d 160000 --- a/nixos/nixpkgs +++ b/nixos/nixpkgs @@ -1 +1 @@ -Subproject commit 449bff2c3447f796be48dfc0a7156d7f62a2caef +Subproject commit 022c300df10d5e90ea9738441fd3d978b80596e5 From cb731d9b3f4cde5f210066391814b8cb6a8fc554 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 12 Sep 2021 20:17:50 -0600 Subject: [PATCH 09/14] [NixOS] Move torbrowser to essential-no-arm --- nixos/essential-no-arm.nix | 1 + nixos/essential.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/essential-no-arm.nix b/nixos/essential-no-arm.nix index b667911b..fc8e4bdd 100644 --- a/nixos/essential-no-arm.nix +++ b/nixos/essential-no-arm.nix @@ -4,5 +4,6 @@ spotify google-chrome pommed_light + torbrowser ]; } diff --git a/nixos/essential.nix b/nixos/essential.nix index 065f5f46..2bde7fca 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -31,7 +31,6 @@ in dolphin element-desktop gpick - torbrowser # Appearance numix-icon-theme-circle From a746a2957586b5ba87b04b27ddce01e6e3171cae Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 12 Sep 2021 23:13:12 -0600 Subject: [PATCH 10/14] [rofi] Fix colorful theme --- dotfiles/config/rofi/colorful/colors.rasi | 4 ++-- dotfiles/config/rofi/colorful/launcher.sh | 2 +- dotfiles/config/rofi/colorful/style_1.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_10.rasi | 15 ++++++++++++--- dotfiles/config/rofi/colorful/style_11.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_12.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_2.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_3.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_4.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_5.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_6.rasi | 10 ++++++++-- dotfiles/config/rofi/colorful/style_7.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_8.rasi | 8 ++++++-- dotfiles/config/rofi/colorful/style_9.rasi | 8 ++++++-- 14 files changed, 83 insertions(+), 28 deletions(-) diff --git a/dotfiles/config/rofi/colorful/colors.rasi b/dotfiles/config/rofi/colorful/colors.rasi index 89a18f02..1479fc5a 100644 --- a/dotfiles/config/rofi/colorful/colors.rasi +++ b/dotfiles/config/rofi/colorful/colors.rasi @@ -2,8 +2,8 @@ * { al: #00000000; - bg: #00000099; + bg: #000000ff; se: #101010ff; fg: #FFFFFFff; - ac: #FFFF00ff; + ac: #EC7875ff; } diff --git a/dotfiles/config/rofi/colorful/launcher.sh b/dotfiles/config/rofi/colorful/launcher.sh index 705b7249..0fbfc4a6 100755 --- a/dotfiles/config/rofi/colorful/launcher.sh +++ b/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" diff --git a/dotfiles/config/rofi/colorful/style_1.rasi b/dotfiles/config/rofi/colorful/style_1.rasi index 60ab3ee0..667ef348 100644 --- a/dotfiles/config/rofi/colorful/style_1.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_10.rasi b/dotfiles/config/rofi/colorful/style_10.rasi index e92ee764..3311e8bb 100644 --- a/dotfiles/config/rofi/colorful/style_10.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_11.rasi b/dotfiles/config/rofi/colorful/style_11.rasi index 4a6792f8..6f393433 100644 --- a/dotfiles/config/rofi/colorful/style_11.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_12.rasi b/dotfiles/config/rofi/colorful/style_12.rasi index 713d569d..af9aac36 100644 --- a/dotfiles/config/rofi/colorful/style_12.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_2.rasi b/dotfiles/config/rofi/colorful/style_2.rasi index 12368cfd..3de665a4 100644 --- a/dotfiles/config/rofi/colorful/style_2.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_3.rasi b/dotfiles/config/rofi/colorful/style_3.rasi index fe0e6ad1..e70c102b 100644 --- a/dotfiles/config/rofi/colorful/style_3.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_4.rasi b/dotfiles/config/rofi/colorful/style_4.rasi index 2e34f337..d6d9eb73 100644 --- a/dotfiles/config/rofi/colorful/style_4.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_5.rasi b/dotfiles/config/rofi/colorful/style_5.rasi index 10739d7c..6bc6a9a8 100644 --- a/dotfiles/config/rofi/colorful/style_5.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_6.rasi b/dotfiles/config/rofi/colorful/style_6.rasi index e2bd1c3b..06ec71f8 100644 --- a/dotfiles/config/rofi/colorful/style_6.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_7.rasi b/dotfiles/config/rofi/colorful/style_7.rasi index e66e1269..cc29f11b 100644 --- a/dotfiles/config/rofi/colorful/style_7.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_8.rasi b/dotfiles/config/rofi/colorful/style_8.rasi index 78f8fd3c..97fb6f7c 100644 --- a/dotfiles/config/rofi/colorful/style_8.rasi +++ b/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; diff --git a/dotfiles/config/rofi/colorful/style_9.rasi b/dotfiles/config/rofi/colorful/style_9.rasi index 8c98050b..6e26dfb2 100644 --- a/dotfiles/config/rofi/colorful/style_9.rasi +++ b/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; From af4cb0c269a0940493184d86683e2bec294867fb Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 12 Sep 2021 23:28:01 -0600 Subject: [PATCH 11/14] [rofi] Delete old config --- dotfiles/config/rofi/config | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 dotfiles/config/rofi/config diff --git a/dotfiles/config/rofi/config b/dotfiles/config/rofi/config deleted file mode 100644 index 07a587a2..00000000 --- a/dotfiles/config/rofi/config +++ /dev/null @@ -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 From 53e150a93ca57b4287f133b357c6637b9f8656d6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 13 Sep 2021 03:14:55 -0600 Subject: [PATCH 12/14] [XMonad] Mute layout modifications --- dotfiles/config/xmonad/xmonad.hs | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index c405c489..4ae02337 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -294,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 = - myDmenu ["2", "3", "4"] >>= (setLimit . read) +data MutedModifiedLayout m l a = + 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 @@ -308,11 +323,11 @@ data MyToggles deriving (Read, Show, Eq, Typeable) instance Transformer MyToggles Window where - transform LIMIT x k = k (limitSlice 2 x) unmodifyLayout - transform GAPS x k = k (smartSpacing 5 x) unmodifyLayout - transform MAGICFOCUS x k = k (magicFocus x) unmodifyLayout - transform MAGNIFY x k = k (myMagnify x) unmodifyLayout - transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout + transform LIMIT x k = k (MutedModifiedLayout $ limitSlice 2 x) unmodifyMuted + transform GAPS x k = k (MutedModifiedLayout $ smartSpacing 5 x) unmodifyMuted + transform MAGICFOCUS x k = k (MutedModifiedLayout $ magicFocus x) unmodifyMuted + transform MAGNIFY x k = k (MutedModifiedLayout $ myMagnify x) unmodifyMuted + transform AVOIDSTRUTS x k = k (MutedModifiedLayout $ avoidStruts x) unmodifyMuted myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS] otherToggles = [NBFULL, NOBORDERS, MIRROR, SMARTBORDERS] @@ -424,6 +439,7 @@ layoutNames = [description layout | layout <- layoutList] selectLayout = myDmenu layoutNames >>= (sendMessage . JumpToLayout) myLayoutHook = + MutedModifiedLayout . minimize . boringAuto . mkToggle1 AVOIDSTRUTS . From 9cd50adacac9caa41b40d0f14649703e023806f8 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 13 Sep 2021 03:15:33 -0600 Subject: [PATCH 13/14] [XMonad] Bump submodule --- dotfiles/config/xmonad/xmonad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad index 485a0ad5..1e17c1c1 160000 --- a/dotfiles/config/xmonad/xmonad +++ b/dotfiles/config/xmonad/xmonad @@ -1 +1 @@ -Subproject commit 485a0ad506b8fb4a93a01a7cdd437121ecf5e40c +Subproject commit 1e17c1c1bc26cdb93e23d4aa75e57fe48ff4c951 From f36ddc4cdd155e4dbb264092dcb6c896713b05e6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 13 Sep 2021 03:16:12 -0600 Subject: [PATCH 14/14] [autorandr] Add configurations for stevie-nixos --- .../family_room_above_stevie-nixos/config | 15 +++++++++++++++ .../family_room_above_stevie-nixos/setup | 2 ++ dotfiles/config/autorandr/stevie-nixos/config | 12 ++++++++++++ dotfiles/config/autorandr/stevie-nixos/setup | 1 + 4 files changed, 30 insertions(+) create mode 100644 dotfiles/config/autorandr/family_room_above_stevie-nixos/config create mode 100644 dotfiles/config/autorandr/family_room_above_stevie-nixos/setup create mode 100644 dotfiles/config/autorandr/stevie-nixos/config create mode 100644 dotfiles/config/autorandr/stevie-nixos/setup diff --git a/dotfiles/config/autorandr/family_room_above_stevie-nixos/config b/dotfiles/config/autorandr/family_room_above_stevie-nixos/config new file mode 100644 index 00000000..a30d68ec --- /dev/null +++ b/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 diff --git a/dotfiles/config/autorandr/family_room_above_stevie-nixos/setup b/dotfiles/config/autorandr/family_room_above_stevie-nixos/setup new file mode 100644 index 00000000..a9cb0641 --- /dev/null +++ b/dotfiles/config/autorandr/family_room_above_stevie-nixos/setup @@ -0,0 +1,2 @@ +DP-3 00ffffffffffff001e6d010001010101011a010380a05a780aee91a3544c99260f5054a108003140454061407140818001010101010131ce0046f0705a8020108a0040846300001e023a801871382d40582c450040846300001e000000fd003a3e1e883c000a202020202020000000fc004c47205456205256550a20202001b7020346f14e5d10222005040302015e5f000000293d06c01507500957076e030c001000b83c20008001020300e200cfee0146d00024180900ad5244a9230c00000000e30e0000011d8018711c1620582c250040846300009e662150b051001b304070360040846300001e00000000000000000000000000000000000000000099 +eDP-1 00ffffffffffff004d10d61400000000051e0104b52517780a771bab5233ba250c51560000000101010101010101010101010101010172e700a0f0604590302036006ee51000001828b900a0f0604590302036006ee510000018000000fe00374a584b38814c513137305231000000000002410332011200000b010a2020018502030f00e3058000e606050160602800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa diff --git a/dotfiles/config/autorandr/stevie-nixos/config b/dotfiles/config/autorandr/stevie-nixos/config new file mode 100644 index 00000000..7f92e4c4 --- /dev/null +++ b/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 diff --git a/dotfiles/config/autorandr/stevie-nixos/setup b/dotfiles/config/autorandr/stevie-nixos/setup new file mode 100644 index 00000000..6db62ce9 --- /dev/null +++ b/dotfiles/config/autorandr/stevie-nixos/setup @@ -0,0 +1 @@ +eDP-1 00ffffffffffff004d10d61400000000051e0104b52517780a771bab5233ba250c51560000000101010101010101010101010101010172e700a0f0604590302036006ee51000001828b900a0f0604590302036006ee510000018000000fe00374a584b38814c513137305231000000000002410332011200000b010a2020018502030f00e3058000e606050160602800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa