From 404ea984b179f62cffb8e411967b2fec567a61a9 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 20 Nov 2021 14:08:10 -0500
Subject: [PATCH] xmobar hls

---
 features/desktopish/default.nix                          | 2 +-
 features/desktopish/light-terminal.nix                   | 2 +-
 features/desktopish/xmobar/xmobar-srid/hie.yaml          | 4 ++++
 features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal | 4 ++--
 features/desktopish/xmonad/xmonad-srid/Main.hs           | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 features/desktopish/xmobar/xmobar-srid/hie.yaml

diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix
index b2d03ef..4303f71 100644
--- a/features/desktopish/default.nix
+++ b/features/desktopish/default.nix
@@ -15,7 +15,7 @@
     # WMish things
     ./xmonad
     #./taffybar # Disabled, because it rarely works (and memory hungry)
-    #./xmobar  # shit UX
+    ./xmobar # shit UX
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/features/desktopish/light-terminal.nix b/features/desktopish/light-terminal.nix
index 18e189e..944c1ac 100644
--- a/features/desktopish/light-terminal.nix
+++ b/features/desktopish/light-terminal.nix
@@ -6,7 +6,7 @@ let
     ''
       #!${pkgs.runtimeShell}
       # Use fc-list to lookup font names
-      exec ${pkgs.st}/bin/st -f "CascadiaCode:pixelsize=26" $*
+      exec ${pkgs.st}/bin/st -f "Iosevka:pixelsize=26" $*
     '';
 in
 {
diff --git a/features/desktopish/xmobar/xmobar-srid/hie.yaml b/features/desktopish/xmobar/xmobar-srid/hie.yaml
new file mode 100644
index 0000000..172cda4
--- /dev/null
+++ b/features/desktopish/xmobar/xmobar-srid/hie.yaml
@@ -0,0 +1,4 @@
+cradle:
+  cabal:
+    - path: "./"
+      component: "exe:xmobar-srid"
diff --git a/features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal b/features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal
index 139c3af..d5d6d65 100644
--- a/features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal
+++ b/features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal
@@ -1,4 +1,4 @@
-cabal-version:       >=1.10
+cabal-version:       3.0
 -- Initial package description 'xmobar-srid.cabal' generated by 'cabal
 -- init'.  For further documentation, see
 -- http://haskell.org/cabal/users-guide/
@@ -21,7 +21,7 @@ executable xmobar-srid
   -- other-modules:
   -- other-extensions:
   build-depends:       base
-                      , xmobar
+                      , xmobar >= 0.39
                       , text
   -- hs-source-dirs:
   default-language:    Haskell2010
diff --git a/features/desktopish/xmonad/xmonad-srid/Main.hs b/features/desktopish/xmonad/xmonad-srid/Main.hs
index 60c2ed8..ec15c26 100644
--- a/features/desktopish/xmonad/xmonad-srid/Main.hs
+++ b/features/desktopish/xmonad/xmonad-srid/Main.hs
@@ -43,7 +43,7 @@ main = do
     myTabbed :: ModifiedLayout (Decoration TabbedDecoration DefaultShrinker) Simplest.Simplest Window
     myTabbed =
       -- FIXME: This doesn't work reliably.
-      tabbed shrinkText $ def {decoHeight = 10, activeColor = "#50CBE8", fontName = "xft:CascadiaCode:size=16"}
+      tabbed shrinkText $ def {decoHeight = 10, activeColor = "#50CBE8", fontName = "xft:Consolas:size=12"}
 
     pointerFollowsFocus =
       let centerOfWindow = ((0.5, 0.5), (0, 0))