From 874cad02b1c78a7586a70cbbcd0cf7b38917d597 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 1 Dec 2020 16:12:01 -0800 Subject: [PATCH 1/6] WIP --- dotfiles/config/taffybar/base.nix | 16 ++-------------- dotfiles/config/taffybar/default.nix | 2 +- dotfiles/config/xmonad/base.nix | 2 +- nixos/configuration.nix | 8 +++++--- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dotfiles/config/taffybar/base.nix b/dotfiles/config/taffybar/base.nix index 73bebeac..85b7a2c3 100644 --- a/dotfiles/config/taffybar/base.nix +++ b/dotfiles/config/taffybar/base.nix @@ -1,19 +1,7 @@ -(import ./taffybar/nixpkgs.nix) { +pkgs: pkgs { overlays = [ (import ./taffybar/overlay.nix) (import ../xmonad/overlay.nix) - (_: super: { - haskellPackages = super.haskellPackages.override (old: { - overrides = super.lib.composeExtensions (old.overrides or (_: _: {})) (self: _: { - imalison-taffybar = - self.callCabal2nix "imalison-taffybar" - ( - super.lib.sourceByRegex ./. - ["taffybar.hs" "imalison-taffybar.cabal"] - ) - { }; - }); - }); - }) + (import ./overlay.nix) ]; } diff --git a/dotfiles/config/taffybar/default.nix b/dotfiles/config/taffybar/default.nix index 922dacbd..9a3f12b2 100644 --- a/dotfiles/config/taffybar/default.nix +++ b/dotfiles/config/taffybar/default.nix @@ -1 +1 @@ -(import ./base.nix).haskellPackages.imalison-taffybar +(import ./base.nix).haskellPackages.imalison-taffybar (import ./taffybar/nixpkgs.nix) diff --git a/dotfiles/config/xmonad/base.nix b/dotfiles/config/xmonad/base.nix index f90655da..16fe3fbd 100644 --- a/dotfiles/config/xmonad/base.nix +++ b/dotfiles/config/xmonad/base.nix @@ -1,4 +1,4 @@ -(import ../taffybar/taffybar/nixpkgs.nix) { +pkgs: pkgs { overlays = [ (import ../taffybar/taffybar/overlay.nix) (import ./overlay.nix) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 1e94d270..bff90a88 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -25,7 +25,9 @@ in { nixpkgs.overlays = [ (import ./overlays.nix) - (import ../dotfiles/config/taffybar/taffybar/environment.nix) + (import ../dotfiles/config/taffybar/taffybar/overlay.nix) + (import ../dotfiles/config/xmonad/overlay.nix) + (import ../dotfiles/config/taffybar/overlay.nix) ]; # Allow all the things @@ -142,8 +144,8 @@ in plasma5.breeze-qt5 # Haskell Desktop - (import ../dotfiles/config/taffybar/default.nix) - (import ../dotfiles/config/xmonad/default.nix) + haskellPackages.imalison-xmonad + haskellPackages.imalison-taffybar # notifications-tray-icon haskellPackages.status-notifier-item haskellPackages.xmonad From d4dd215f486747dcfba24cdc40dbd4ba71118102 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 1 Dec 2020 13:08:36 -0800 Subject: [PATCH 2/6] [picom] Remove deprecated configurations --- dotfiles/config/picom.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/dotfiles/config/picom.conf b/dotfiles/config/picom.conf index 6126532f..e860addc 100644 --- a/dotfiles/config/picom.conf +++ b/dotfiles/config/picom.conf @@ -112,7 +112,6 @@ inactive-opacity = 1; active-opacity = 1; frame-opacity = 1; inactive-opacity-override = false; -alpha-step = 0.06; # Dim inactive windows. (0.0 - 1.0) # inactive-dim = 0.2; @@ -190,8 +189,6 @@ vsync = "opengl"; # Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing. # Reported to have no effect, though. dbe = false; -# Painting on X Composite overlay window. Recommended. -paint-on-overlay = true; # Limit compton to repaint at most once every 1 / refresh_rate second to boost performance. # This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already, From 174fdd79b0620b4532fe7b72f32f1a66e122e23e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 1 Dec 2020 16:13:47 -0800 Subject: [PATCH 3/6] [Emacs] Ignore sqlite --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a1efb0e8..1b1a3663 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ gotools /dotfiles/config/xmonad/result /dotfiles/config/taffybar/result +/dotfiles/emacs.d/*.sqlite From 5f046744036c4909e9967e0637c0297deb97a490 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 2 Dec 2020 18:42:17 -0800 Subject: [PATCH 4/6] [taffybar] Bump taffybar, xmonad versions --- dotfiles/config/taffybar/default.nix | 4 +++- dotfiles/config/taffybar/taffybar | 2 +- dotfiles/config/taffybar/taffybar.hs | 3 +++ dotfiles/config/xmonad/xmonad | 2 +- dotfiles/config/xmonad/xmonad-contrib | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dotfiles/config/taffybar/default.nix b/dotfiles/config/taffybar/default.nix index 9a3f12b2..be1a111c 100644 --- a/dotfiles/config/taffybar/default.nix +++ b/dotfiles/config/taffybar/default.nix @@ -1 +1,3 @@ -(import ./base.nix).haskellPackages.imalison-taffybar (import ./taffybar/nixpkgs.nix) +let pkgs = ((import ./base.nix) (import )) ; +in +pkgs.haskellPackages.imalison-taffybar diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index 104a1c12..c8fe1a41 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit 104a1c12f722f362ccb60794119de95f96f18ea8 +Subproject commit c8fe1a41497c2b68ba6c15404125afa7de283e86 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index e2599a8e..a7aebd7f 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -197,6 +197,9 @@ main = do , ( "imalison-home" , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 } ) + , ( "ryzen-shine" + , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 } + ) , ( "ivanm-dfinity-razer" , baseConfig { endWidgets = shortLaptopEndWidgets, barHeight = 42 } ) diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad index bb138539..5be975b4 160000 --- a/dotfiles/config/xmonad/xmonad +++ b/dotfiles/config/xmonad/xmonad @@ -1 +1 @@ -Subproject commit bb13853929f8f6fc59b526bcc10631e1bac309ad +Subproject commit 5be975b4f23abe851ab59866f572d3301cb0119a diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib index 509fe0d4..92617ebc 160000 --- a/dotfiles/config/xmonad/xmonad-contrib +++ b/dotfiles/config/xmonad/xmonad-contrib @@ -1 +1 @@ -Subproject commit 509fe0d459b85a485a84f231ad0b4ed0b60d8bfd +Subproject commit 92617ebc09a4b989e7d6353d8f1783994afa8939 From 89413674c4e9806eb72c8e76dab154619bda3f48 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 2 Dec 2020 18:43:08 -0800 Subject: [PATCH 5/6] Revert "[taffybar] Use ewmh icons to avoid crashes" This reverts commit 42a9aa1a1b2b6f6407078b5449609aa570f5686c. --- 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 a7aebd7f..a69b9d26 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -136,7 +136,7 @@ main = do { underlineHeight = 3 , underlinePadding = 2 , minIcons = 1 - , getWindowIconPixbuf = scaledWindowIconPixbufGetter getWindowIconPixbufFromEWMH + , getWindowIconPixbuf = myIcons , widgetGap = 0 , showWorkspaceFn = hideEmpty , updateRateLimitMicroseconds = 100000 From fc583fde01a942703311fb84a83351a86fb6b4da Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 3 Dec 2020 14:26:14 -0800 Subject: [PATCH 6/6] [XMonad] Remove log --- dotfiles/config/xmonad/xmonad.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 7d00da69..7bccc72a 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -398,8 +398,7 @@ getClass w = fromMaybe <$> getClassRaw w <*> getVirtualClass w desktopEntriesMap :: MM.MultiMap String DesktopEntry desktopEntriesMap = - unsafePerformIO $ do - tee id (>>= writeToHomeDirLog . show . MM.keys) $ + unsafePerformIO $ indexDesktopEntriesByClassName <$> getDirectoryEntriesDefault lookupIconFromClasses classes =