From f17154601fab31eec660f3f6e884771c01565c21 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 21 Aug 2021 01:29:07 -0600 Subject: [PATCH 01/21] [picom/XMonad] Exclude xmonad decorations from rounded corners --- dotfiles/config/picom.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/config/picom.conf b/dotfiles/config/picom.conf index 82f8ba1f..8f9eb809 100644 --- a/dotfiles/config/picom.conf +++ b/dotfiles/config/picom.conf @@ -158,6 +158,7 @@ fade-exclude = [ ]; ################################# corner-radius: 10 +rounded-corners-exclude = [ "class_g = 'xmonad'" ]; ################################# # From 8bd0b1cb10b8c75c5e1ff624c2214455727a88d5 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 21 Aug 2021 13:48:33 -0600 Subject: [PATCH 02/21] [XMonad] Use gotham tab theme --- dotfiles/config/xmonad/xmonad.hs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 8ce40170..198e3948 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -66,6 +66,7 @@ import XMonad.Layout.Accordion import XMonad.Layout.BoringWindows import XMonad.Layout.ConditionalLayout import XMonad.Layout.Cross +import XMonad.Layout.Decoration import XMonad.Layout.Grid import XMonad.Layout.LayoutCombinators import XMonad.Layout.LayoutModifier @@ -90,7 +91,6 @@ import XMonad.Util.Minimize import XMonad.Util.NamedScratchpad as NS import XMonad.Util.NamedWindows (getName) import XMonad.Util.Run -import XMonad.Util.Themes import XMonad.Util.WorkspaceCompare myConfig = def @@ -100,8 +100,6 @@ myConfig = def = namedScratchpadManageHook scratchpads , layoutHook = myLayoutHook , borderWidth = 0 - , normalBorderColor = "#0096ff" - , focusedBorderColor = "#ffff00" , logHook = updatePointer (0.5, 0.5) (0, 0) <> toggleFadeInactiveLogHook 0.9 @@ -118,6 +116,18 @@ myConfig = def , keys = customKeys (const []) addKeys } +gothamTheme = + def + { inactiveBorderColor = "#000" + , activeBorderColor = "#edb443" + , activeColor = "#edb443" + , inactiveColor = "#091f2e" + , inactiveTextColor = "#edb443" + , activeTextColor = "#091f2e" + , fontName = "xft:Source Code Pro:style=Semibold" + , decoHeight = 25 + } + restartEventHook e@ClientMessageEvent { ev_message_type = mt } = do a <- getAtom "XMONAD_RESTART" if mt == a @@ -406,7 +416,7 @@ layoutInfo = rename "2 Columns" (Tall 1 (3 / 100) (1 / 2)) |||! Accordion |||! simpleCross |||! myTabbed where - myTabbed = rename "Tabbed" $ tabbed shrinkText (theme robertTheme) + myTabbed = rename "Tabbed" $ tabbed shrinkText gothamTheme layoutList = snd layoutInfo From 7a511b3e137245c447788b6937793d146da5052c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 21 Aug 2021 17:39:43 -0600 Subject: [PATCH 03/21] [NixOS] Add df_ssh --- nixos/environment.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/environment.nix b/nixos/environment.nix index b64cec91..dd68e310 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -38,8 +38,11 @@ with lib; environment = { homeBinInPath = true; localBinInPath = true; + shellAliases = { + df_ssh = "TERM='xterm-256color ssh -o StrictHostKeyChecking=no'"; + }; interactiveShellInit = '' - vterm_printf(){ + vterm_printf(){ if [ -n "$TMUX" ] && ([ "''${TERM%%-*}" = "tmux" ] || [ "''${TERM%%-*}" = "screen" ] ); then # Tell tmux to pass the escape sequences through printf "\ePtmux;\e\e]%s\007\e\\" "$1" From d505e8c79dd99af12d4790d27838acc71e58b666 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 22 Aug 2021 22:43:17 -0600 Subject: [PATCH 04/21] [NixOS] More general way of getting home directory --- nixos/home-manager.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index 54288744..edc05616 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -73,15 +73,15 @@ enable = true; repositories = { config = { - path = "/home/imalison/config"; + path = config.home.homeDirectory + "/config"; uri = "git@github.com:IvanMalison/config.git"; }; org = { - path = "/home/imalison/org"; + path = config.home.homeDirectory + "/org"; uri = "git@github.com:IvanMalison/org.git"; }; password-store = { - path = "/home/imalison/.password-store"; + path = config.home.homeDirectory + "/org"; uri = "git@github.com:IvanMalison/.password-store.git"; }; }; From 4188a455346bb6baf4999cb329f7102f3fce725d Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 22 Aug 2021 22:44:59 -0600 Subject: [PATCH 05/21] [NixOS] Fix mistake --- nixos/home-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index edc05616..de480f00 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -81,7 +81,7 @@ uri = "git@github.com:IvanMalison/org.git"; }; password-store = { - path = config.home.homeDirectory + "/org"; + path = config.home.homeDirectory + "/.password-store"; uri = "git@github.com:IvanMalison/.password-store.git"; }; }; From a1d59933b5995917f6ed512760a888c0a617ea5f Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 24 Aug 2021 00:19:18 -0600 Subject: [PATCH 06/21] [git] Set defaultBranch to master --- dotfiles/gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 5495b292..e623a49b 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -98,3 +98,6 @@ [user] email = IvanMalison@gmail.com name = Ivan Malison + +[init] + defaultBranch = master From 92a3f0bb0e3e46038d8f219fbeb9f514c874195c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 5 Sep 2021 20:53:43 -0600 Subject: [PATCH 07/21] [NixOS] Remove comment from adele.nix --- nixos/machines/adele.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/machines/adele.nix b/nixos/machines/adele.nix index a5145dc6..15d12cd3 100644 --- a/nixos/machines/adele.nix +++ b/nixos/machines/adele.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, inputs, ... }: { From c1a68b10e95158f3d95607e41fd57aac747ec2ee Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 6 Sep 2021 18:23:11 +0000 Subject: [PATCH 08/21] [NixOS] Add stevie-nixos (Dfinity Dell XPS 17 2021) --- nixos/machines/stevie-nixos.nix | 46 +++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 nixos/machines/stevie-nixos.nix diff --git a/nixos/machines/stevie-nixos.nix b/nixos/machines/stevie-nixos.nix new file mode 100644 index 00000000..1a63275f --- /dev/null +++ b/nixos/machines/stevie-nixos.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs, inputs, ... }: + +{ + imports = [ + ../full.nix + ../base.nix + inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia + ]; + + hardware.enableRedistributableFirmware = true; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + services.xserver.libinput.enable = true; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/7c999009-1ff1-42f7-a64a-3fa91fc777a8"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/97c1eee7-b161-4186-9c14-6b1771d49afb"; + + fileSystems."/boot" = + { device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + + + swapDevices = [ ]; + + networking.hostName = "stevie-nixos"; + + nix.maxJobs = lib.mkDefault 16; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + + hardware.video.hidpi.enable = true; + + system.stateVersion = "21.05"; +} From 205304c059dcc49689d5dfca532a3f09b4ab06f4 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 6 Sep 2021 18:23:42 +0000 Subject: [PATCH 09/21] Add keymap for stevie-nixos --- dotfiles/xkb/keymap/stevie-nixos | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dotfiles/xkb/keymap/stevie-nixos diff --git a/dotfiles/xkb/keymap/stevie-nixos b/dotfiles/xkb/keymap/stevie-nixos new file mode 100644 index 00000000..e4458964 --- /dev/null +++ b/dotfiles/xkb/keymap/stevie-nixos @@ -0,0 +1,7 @@ +xkb_keymap { + xkb_keycodes { include "evdev+aliases(qwerty)" }; + xkb_types { include "complete" }; + xkb_compat { include "complete" }; + xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" }; + xkb_geometry { include "pc(pc105)" }; +}; From d0668a3b4a588c435ebabbbfddefd6a2936e1e9c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 7 Sep 2021 22:53:05 -0600 Subject: [PATCH 10/21] [NixOS] Add ssh key for stevie-nixos --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index cf9d03ff..402e04eb 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -27,6 +27,7 @@ openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICzGkqGJm+nrMvsrfuWOLVxXHvi0UL1ULJmyfzS9sKpy imalison@biskcomp.local" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuO/tc728fKyctlufiehZQuKsD0XDiS/5x7TImk0Ip4 imalison@ivanm-dfinity-razer" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDt/rcYuGGlXBcRUJvzUCgOW8PNVkJJ5TwEOha1/KGM4 imalison@stevie-nixos" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIiZd2FiyTJvuvDh5hH0L3BqZV3E/kwwyau57QD7pz7C cardno:000614590850" # Dfinity Admin "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOEt0T+Hxxat5tbkD9mSu8T271QjRrLr2EA0rIDXUNL cardno:000614590748" # Dfinity Read-Only "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUSkj7587e+MAUNyU/KRpw9Vk++53Wv5nB+0V1QgiTO3rMQe6HJt0Tm2wi/o/T8GNjueT2D69YgkqOIF1FQwsj2EFLObcMzeBgs5gTSglqggA2I91BIc1vvgjCDpogOMAzAQGlTxRnqrEXhqG0jJtw8KIzLr9WrvWLdTT4rHtWS8RoOBgkQ8oxbggZ4vtbMBIwoIAYGRr70KBRNCsLTPLa8yEf+DDQxq1entzxSjHXHgyeBSVVpPCrBVmhjandk+lIFInjvAiAE1ZkJHSRccL73ORmgb1crwH7xlD9NwBPmypowMi8UIRMKfL2lNehT0AQIlEAikUBLMDzPIPhnwLZ imalison@ivanm-dfinity-razer.local" From 8f9a72f287f1062e5561550a934b1b70e1c070d7 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 8 Sep 2021 19:33:47 -0600 Subject: [PATCH 11/21] [taffybar] Bump taffybar submodule, add stevie-nixos config --- dotfiles/config/taffybar/taffybar | 2 +- dotfiles/config/taffybar/taffybar.hs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index dd3d0555..c901f1f5 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit dd3d05555fb997d0a558cfc28bb34680f25ad9a1 +Subproject commit c901f1f5d1ec7e885c15e349458faea7f26b6660 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index 42e1594b..be5a5926 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -131,6 +131,7 @@ cssFilesByHostname = , ("imalison-home", ["taffybar.css"]) , ("ivanm-dfinity-razer", ["taffybar.css"]) , ("ryzen-shine", ["taffybar.css"]) + , ("stevie-nixos", ["taffybar.css"]) ] main = do @@ -224,6 +225,9 @@ main = do , ( "adele" , baseConfig { endWidgets = laptopEndWidgets, barHeight = 45 } ) + , ( "stevie-nixos" + , baseConfig { endWidgets = laptopEndWidgets, barHeight = 70 } + ) ] simpleTaffyConfig = selectedConfig { centerWidgets = [ myClock ] @@ -231,7 +235,7 @@ main = do -- , startWidgets = [] } startTaffybar $ - appendHook (void $ getHost False) $ + appendHook (void $ getTrayHost False) $ withLogServer $ withToggleServer $ toTaffyConfig simpleTaffyConfig From b610563a5c405eb5ad9297527ebd6ca5e3f49e20 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 8 Sep 2021 19:34:07 -0600 Subject: [PATCH 12/21] [NixOS] Bump nixpkgs --- nixos/nixpkgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/nixpkgs b/nixos/nixpkgs index c159b9d5..449bff2c 160000 --- a/nixos/nixpkgs +++ b/nixos/nixpkgs @@ -1 +1 @@ -Subproject commit c159b9d51e4bd7a3d29744ab1c6baa78c71bf93b +Subproject commit 449bff2c3447f796be48dfc0a7156d7f62a2caef From 4f7cce1b8e7c2ddc10edfd6cc0a50be24082a8d6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 10 Sep 2021 00:46:17 -0600 Subject: [PATCH 13/21] [taffybar] Specify bar size as a ScreenRatio --- dotfiles/config/taffybar/taffybar | 2 +- dotfiles/config/taffybar/taffybar.hs | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index c901f1f5..af67fdf4 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit c901f1f5d1ec7e885c15e349458faea7f26b6660 +Subproject commit af67fdf4c5079770c2b1ebcb2c46697a9da42261 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index be5a5926..ecae42fc 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -135,6 +135,8 @@ cssFilesByHostname = ] main = do + enableLogger "Graphics.UI.GIGtkStrut" DEBUG + hostName <- getHostName homeDirectory <- getHomeDirectory let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname @@ -201,10 +203,10 @@ main = do defaultSimpleTaffyConfig { startWidgets = [myWorkspaces, myLayout, myWindows] , endWidgets = fullEndWidgets - , barPosition = Top + , barPosition = Bottom , widgetSpacing = 0 , barPadding = 0 - , barHeight = 50 + , barHeight = ScreenRatio $ 1/27 , cssPaths = cssFiles , startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329" } @@ -214,19 +216,19 @@ main = do , baseConfig { endWidgets = laptopEndWidgets } ) , ( "imalison-home" - , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 } + , baseConfig { endWidgets = fullEndWidgets } ) , ( "ryzen-shine" - , baseConfig { endWidgets = fullEndWidgets, barHeight = 50 } + , baseConfig { endWidgets = fullEndWidgets } ) , ( "ivanm-dfinity-razer" - , baseConfig { endWidgets = laptopEndWidgets, barHeight = 42 } + , baseConfig { endWidgets = laptopEndWidgets } ) , ( "adele" - , baseConfig { endWidgets = laptopEndWidgets, barHeight = 45 } + , baseConfig { endWidgets = laptopEndWidgets } ) , ( "stevie-nixos" - , baseConfig { endWidgets = laptopEndWidgets, barHeight = 70 } + , baseConfig { endWidgets = laptopEndWidgets } ) ] simpleTaffyConfig = selectedConfig From 4878bacc3b24a3a2a5c0147aaa3cf5a2f9ba421a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 10 Sep 2021 11:47:15 -0600 Subject: [PATCH 14/21] [NixOS] Add games to ryzen-shine --- nixos/machines/ryzen-shine.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix index 54b71ccc..e1df5da6 100644 --- a/nixos/machines/ryzen-shine.nix +++ b/nixos/machines/ryzen-shine.nix @@ -5,6 +5,7 @@ ../users.nix ../full.nix ../dfinity.nix + ../games.nix ]; hardware.enableRedistributableFirmware = true; From 41c71eaa20f00e6f75836d69e02e2a1696260f71 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 10 Sep 2021 11:47:27 -0600 Subject: [PATCH 15/21] [NixOS] Add torbrowser --- nixos/essential.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/essential.nix b/nixos/essential.nix index 2bde7fca..065f5f46 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -31,6 +31,7 @@ in dolphin element-desktop gpick + torbrowser # Appearance numix-icon-theme-circle From 5c9dd1f15534c1949ddfe1fd2fc700a9ba15498c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 10 Sep 2021 12:13:41 -0600 Subject: [PATCH 16/21] [taffybar] Put bar back on top --- dotfiles/config/taffybar/taffybar.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index ecae42fc..bb4894fb 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -203,7 +203,7 @@ main = do defaultSimpleTaffyConfig { startWidgets = [myWorkspaces, myLayout, myWindows] , endWidgets = fullEndWidgets - , barPosition = Bottom + , barPosition = Top , widgetSpacing = 0 , barPadding = 0 , barHeight = ScreenRatio $ 1/27 From 3d894ba205a6e1ac77393f64925ca084a1710207 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 Sep 2021 16:52:11 -0600 Subject: [PATCH 17/21] [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 18/21] [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 19/21] [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 20/21] [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 21/21] [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