fonts, color, bings

modules/home/hyprlock.nix

@@ -1,5 +1,8 @@
-{ inputs, ... }:
-{
+{ inputs, pkgs, ... }:
+with pkgs.lib.nix-rice;
+let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
+    fnt = pkgs.rice.font.monospace.name;
+in {
   programs.hyprlock = {
     enable = true;
     package = inputs.hyprlock.packages.x86_64-linux.default;
@@ -29,7 +32,7 @@
         position = "0, 0";
         halign = "center";
         valign = "center";
-        font_family = "JetBrains Mono";
+        font_family = fnt;
       };
 
       # DATE
@@ -38,7 +41,7 @@
           text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
           color = "rgba(242, 243, 244, 0.75)";
           font_size = 32;
-          font_family = "JetBrains Mono";
+          font_family = fnt;
           position = "0, 300";
           halign = "center";
           valign = "center";
@@ -49,7 +52,7 @@
           text = "cmd[update:1000] echo \"$(date +\"%-I:%M\")\"";
           color = "rgba(242, 243, 244, 0.75)";
           font_size = 32;
-          font_family = "JetBrains Mono";
+          font_family = fnt;
           position = "0, 200";
           halign = "center";
           valign = "center";

modules/home/mako.nix

@@ -6,7 +6,7 @@
       layer="top";
       anchor="top-right";
 
-      font="JetbrainsMono-Light 12";
+      font="IBMPlexMono 12";
       backgroundColor="#111111";
       textColor="#eeeeee";
       width=300;

modules/home/shell-conf.nix

@@ -33,6 +33,8 @@
 
     nix-du
     nix-melt
+    nix-tree
+
     usbutils
     pciutils
     util-linux

modules/home/shell-conf/wezterm/launcher.lua

@@ -9,7 +9,7 @@ config.enable_wayland = false;
 
 config.font_size = 14
 config.font = wezterm.font {
-  family = 'JetBrains Mono',
+  family = 'IBM Plex Mono',
   weight = 'Medium'
 }
 

modules/home/shell-conf/wezterm/wezterm.lua

@@ -48,6 +48,11 @@ config.audible_bell = "Disabled";
 config.warn_about_missing_glyphs = false;
 
 config.font_size = 14
+config.font = wezterm.font {
+  family = 'IBM Plex Mono',
+  -- weight = ''
+}
+
 config.freetype_load_flags = 'NO_HINTING'
 
 -- config.color_scheme = 'One Dark (Gogh)'

modules/home/waybar.nix

@@ -1,6 +1,7 @@
 { inputs, pkgs, ... }:
 with pkgs.lib.nix-rice;
 let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
+    fnt = pkgs.rice.font.monospace.name;
 in {
 
   programs.waybar = {
@@ -67,8 +68,8 @@ in {
 
         "idle_inhibitor" = {
           "format" = "{icon}";
-          "tooltip-format-activated" = "idle inhibitor = {status}";
-          "tooltip-format-deactivated" = "idle inhibitor = {status}";
+          "tooltip-format-activated" = "idle inhibitor {status}";
+          "tooltip-format-deactivated" = "idle inhibitor {status}";
           "format-icons" = {
             "activated" = "󱡆";
             "deactivated" = "󱡇";
@@ -172,10 +173,38 @@ in {
     };
 
     style = ''
+
+/*
+   #battery,
+   #custom-clipboard,
+   #custom-colorpicker,
+   #custom-powerDraw,
+   #pulseaudio,
+   #wireplumber,
+   #disk,
+   #taskbar
+   #cpu,
+   #temperature,
+   #custom-weather,
+   #jack,
+   #upower,
+   #power-profiles-daemon
+   #tray,
+   #window,
+   #workspaces,
+   #clock
+   #memory
+   #cpu
+   #battery
+   #taskbar
+   #tray
+   #power-profiles-daemon
+ */
+
 * {
-    border: none;
+  border: none;
     font-size: 12pt;
-    font-family: "JetBrainsMono Nerd Font" ;
+  font-family: "${fnt}" ;
     min-height: 30px;
 }
 
@@ -191,22 +220,33 @@ window#waybar {
   margin: 5px;
  }
 
-.modules-right {
-  padding-left: 5px;
+.module {
+  margin: 0;
+  padding: 0 18px;
+  min-width: 1em;
+}
+
+.modules-left, .modules-right {
   margin-top: 2px;
   color: #ccc;
 }
 
+.modules-left .module {
+  border-right: 2px #222 solid;
+}
+
+.modules-right .module {
+  border-right: 2px #222 solid;
+}
+
 .modules-center {
   padding: 0 15px;
   margin-top: 2px;
   color: #ccc;
 }
 
-.modules-left {
-  margin-top: 2px;
-  color: #ccc;
-  padding-right: 5px;
+.modules-center .module {
+  border: none;
 }
 
 #taskbar > *:hover {
@@ -217,70 +257,13 @@ window#waybar {
   background: #333;
 }
 
-#network {
-  padding: 0 10px 0 15px;
-}
-
-#battery,
-#custom-clipboard,
-#custom-colorpicker,
-#custom-powerDraw,
-#bluetooth,
-#pulseaudio,
-#wireplumber,
-#disk,
-#taskbar
-#cpu,
-#temperature,
-#custom-weather,
-#idle_inhibitor,
-#jack,
-#upower,
-#power-profiles-daemon
-#tray,
-#window,
-#workspaces,
-#clock
-#custom-notification {
-  padding: 0 20px;
-}
-
-#memory {
-  padding: 0 20px 0 10px;
-}
-
-#battery {
-  padding-right: 0;
-}
-
-#custom-notification {
-  min-width: 30px;
-  padding-right: 6px;
-  font-size: 13pt;
-}
-
-#idle_inhibitor {
-  min-width: 30px;
-  padding-left: 0;
-  font-size: 13pt;
-}
-
-#power-profiles-daemon {
-  min-width: 40px;
-}
-
 #temperature.critical,
 #pulseaudio.muted {
   color: #FF0000;
   padding-top: 0;
 }
 
-#cpu {
-  padding-right: 30px;
-}
-
 #clock{
-  padding-left: 6px;
   color: ${strPalette.normal.magenta};
 }
 
@@ -306,10 +289,12 @@ window#waybar {
 
 #mpris {
   margin-left: 15px;
+  border: none;
 }
 
 #workspaces button {
   color: #666;
+  padding: 0;
 }
 
 #workspaces button:hover {
@@ -325,10 +310,6 @@ window#waybar {
   color: #ccc;
 }
 
-#taskbar, #tray {
-  padding-right: 30px;
-}
-
 #taskbar button.active {
   background: #333;
 }
@@ -339,6 +320,7 @@ window#waybar {
     color: #000000;
   }
 }
-    '';
+'';
+
   };
 }