nix/configurations/hetzner_benchmark.nix

@@ -47,14 +47,7 @@ in
 
       nix.package = pkgs.nix-monitored;
 
-      system.nixos =
-        let
-          rev = lib.substring 0 8 sources.nixpkgs.revision;
-        in
-        {
-          versionSuffix = "-git:${rev}";
-          revision = rev;
-        };
+      system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision;
     }
 
     ./hetzner_benchmark/nixos/hardware-configuration.nix

nix/configurations/hydrogen.nix

@@ -53,14 +53,7 @@ in
 
       nix.package = pkgs.nix-monitored;
 
-      system.nixos =
-        let
-          rev = lib.substring 0 8 sources.nixpkgs.revision;
-        in
-        {
-          versionSuffix = "-git:${rev}";
-          revision = rev;
-        };
+      system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision;
     }
 
     ./hydrogen/nixos/misc.nix

nix/configurations/installer.nix

@@ -4,9 +4,6 @@
 # figured out an elegant (enough) way to do it while keeping my secrets
 # encrypted.
 #
-let
-  sources = import ../../npins;
-in
 {
   pkgs,
   lib,
@@ -44,15 +41,6 @@ in
     ];
   };
 
-  system.nixos =
-    let
-      rev = lib.substring 0 8 sources.nixpkgs.revision;
-    in
-    {
-      versionSuffix = "-git:${rev}";
-      revision = rev;
-    };
-
   isoImage.squashfsCompression = "zstd -Xcompression-level 3";
 
   environment.systemPackages = [

nix/configurations/vanadium.nix

@@ -78,14 +78,7 @@ in
 
       nix.package = pkgs.nix-monitored;
 
-      system.nixos =
-        let
-          rev = lib.substring 0 8 sources.nixpkgs.revision;
-        in
-        {
-          versionSuffix = "-git:${rev}";
-          revision = rev;
-        };
+      system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision;
     }
 
     #

nix/configurations/vanadium/home/xmonad/xmonad.hs

@@ -26,6 +26,7 @@ import XMonad.Util.NamedScratchpad
 import XMonad.Util.SpawnOnce
 import XMonad.Layout.Magnifier
 
+import Data.Function
 import Data.Char.Greek
 import Data.Ratio
 import Data.Semigroup
@@ -356,17 +357,35 @@ fullFloat        = W.RationalRect     0     0     1     1
 buttomRightFloat = W.RationalRect (1%2) (1%2) (1%2) (1%2)
 
 xmobarConfig :: StatusBarConfig
-xmobarConfig = statusBarProp "xmobar -x 0" (pure myPrettyPrinter)
+xmobarConfig = statusBarProp "xmobar -x 0" myPrettyPrinter
   where
-    myPrettyPrinter :: PP
-    myPrettyPrinter =
-      filterOutWsPP [scratchpadWorkspaceTag]
-      $ def
-        { ppCurrent         = xmobarColor "#000000" "#ffffff" . wrap " " " "
-        , ppHiddenNoWindows = xmobarColor "#9c9c9c" "" . const "⋅"
-        , ppHidden          = xmobarColor "#ffffff" ""
-        , ppSep             = " | "
-        }
+    mkPpCurrent :: X (String -> String)
+    mkPpCurrent = do
+      windowCount <- gets $ length . W.integrate' . W.stack . W.workspace . W.current . windowset
+      pure $ \wid ->
+        wid <> (if windowCount > 1 then ":" <> show windowCount else mempty)
+        & xmobarColor "#000000" "#ffffff" . wrap " " " "
+
+    mkPpHidden :: X (String -> String)
+    mkPpHidden = do
+      m <- gets $ M.fromList . map (\x -> (W.tag x, length . W.integrate' . W.stack $ x)) . W.hidden . windowset
+      pure $ \wid ->
+        let windowCount = m M.! wid
+        in  wid <> (if windowCount > 1 then ":" <> show windowCount else mempty)
+            & xmobarColor "#ffffff" ""
+
+    myPrettyPrinter :: X PP
+    myPrettyPrinter = do
+      myPpCurrent <- mkPpCurrent
+      myPpHidden <- mkPpHidden
+      pure
+        $ filterOutWsPP [scratchpadWorkspaceTag]
+        $ def
+          { ppCurrent         = myPpCurrent
+          , ppHiddenNoWindows = xmobarColor "#9c9c9c" "" . const "⋅"
+          , ppHidden          = myPpHidden
+          , ppSep             = " | "
+          }
 
 myScratchpads :: [NamedScratchpad]
 myScratchpads =

nix/homeModules/common/firefox.nix

@@ -29,11 +29,13 @@ in
           "eBay"
           "Perplexity"
         ];
-        Default = "DuckDuckGo Lite";
+        Default = "Brave";
         Add = [
           {
-            Name = "DuckDuckGo Lite";
-            URLTemplate = "https://lite.duckduckgo.com/lite/search?q={searchTerms}";
+            Name = "Brave";
+            Alias = "@br";
+            URLTemplate = "https://search.brave.com/search?&summary=0&q={searchTerms}&source=web";
+            SuggestURLTemplate = "https://suggestqueries.google.com/complete/search?q={searchTerms}";
           }
         ];
       };

nix/homeModules/common/zen-browser.nix

@@ -29,11 +29,13 @@ in
           "eBay"
           "Perplexity"
         ];
-        Default = "DuckDuckGo Lite";
+        Default = "Brave";
         Add = [
           {
-            Name = "DuckDuckGo Lite";
-            URLTemplate = "https://lite.duckduckgo.com/lite/search?q={searchTerms}";
+            Name = "Brave";
+            Alias = "@br";
+            URLTemplate = "https://search.brave.com/search?&summary=0&q={searchTerms}&source=web";
+            SuggestURLTemplate = "https://suggestqueries.google.com/complete/search?q={searchTerms}";
           }
         ];
       };

nix/packages/by-name/ruler/package.nix

@@ -11,8 +11,8 @@ let
     domain = "git.confusedcompiler.org";
     owner = "leana8959";
     repo = "ruler";
-    rev = "2556b4985065d093b1db3a14a2c5c37115871c78";
-    hash = "sha256-OvNhDpyAbZp+d0rSXLE55BvM5jT3OI8q79D6aVaA2FI=";
+    rev = "52d8b95245aec702ec4105bcb040ea44771a77bc";
+    hash = "sha256-UIpt8NPEyVM2BR0WAhAv66XvpVj124odzzAC6tpTZVU=";
   }) { };
 
   cabalOverrides = o: {

shell.nix

@@ -26,6 +26,7 @@ pkgs.mkShell {
         self.xmonad-extras
         self.xmobar
       ]))
+      haskell-language-server
       cabal-install
     ];
 }