workstation: more tweaks for the UI and fonts

6 files changed, 12 insertions, 14 deletions

diff --git a/home/profiles/firefox.nix b/home/profiles/firefox.nix
index e74aaea..c551cee 100644
--- a/home/profiles/firefox.nix
+++ b/home/profiles/firefox.nix
@@ -43,8 +43,8 @@
           "privacy.trackingprotection.enabled" = true;
           "privacy.trackingprotection.socialtracking.enabled" = true;
 
-          "font.name.monospace.x-western" = "Source Code Pro";
-          "font.name.sans-serif.x-western" = "DejaVu Sans";
+          "font.name.monospace.x-western" = "JetBrain Mono";
+          "font.name.sans-serif.x-western" = "DejaVu Sans Serif";
           "font.name.serif.x-western" = "DejaVu Serif";
         };
 
diff --git a/home/profiles/gtk.nix b/home/profiles/gtk.nix
index bc68d97..4884e4a 100644
--- a/home/profiles/gtk.nix
+++ b/home/profiles/gtk.nix
@@ -5,9 +5,5 @@
       package = pkgs.roboto;
       name = "Roboto Medium 11";
     };
-    cursorTheme = {
-      name = "Numix-Cursor";
-      package = pkgs.numix-cursor-theme;
-    };
   };
 }
diff --git a/home/profiles/mako.nix b/home/profiles/mako.nix
index d4e54fe..f31b417 100644
--- a/home/profiles/mako.nix
+++ b/home/profiles/mako.nix
@@ -7,7 +7,7 @@
   # All the options are documented via `man 5 mako`
   services.mako = {
     enable = true;
-    font = "Source Code Pro";
+    font = "Roboto";
     backgroundColor = "#000021DD";
     textColor = "#FFFFFFFF";
     borderSize = 0;
@@ -18,8 +18,8 @@
     actions = true;
     defaultTimeout = 3000;
     padding = "20";
-    height = 200;
-    width = 500;
+    height = 180;
+    width = 400;
     layer = "overlay";
   };
 }
diff --git a/home/profiles/sway.nix b/home/profiles/sway.nix
index 193ecd5..d3629a0 100644
--- a/home/profiles/sway.nix
+++ b/home/profiles/sway.nix
@@ -2,7 +2,7 @@
 let
   modifier = "Mod4"; # `Super` key
   fonts = {
-    names = [ "Roboto" "Font Awesome 5 Free" "Font Awesome 5 Brands" "Arial" "sans-serif" ];
+    names = [ "Roboto" "sans-serif" ];
     style = "Bold";
     size = 10.0;
   };
diff --git a/home/profiles/waybar.nix b/home/profiles/waybar.nix
index 4a31377..3194c23 100644
--- a/home/profiles/waybar.nix
+++ b/home/profiles/waybar.nix
@@ -58,7 +58,7 @@
     * {
       border-radius: 0;
       border: none;
-      font-family: "Roboto Mono, Font Awesome 5 Free, Font Awesome 5 Brands, Arial, sans-serif";
+      font-family: "Roboto Mono, sans-serif";
       font-size: 15px;
       color: #C5C8C6;
       min-height: 24px;
@@ -69,7 +69,7 @@
     }
     #window {
       font-weight: bold;
-      font-family: "Roboto Mono, Font Awesome 5 Free, Font Awesome 5 Brands, Arial, sans-serif";
+      font-family: "Roboto Mono, sans-serif";
     }
     #workspaces button {
       padding: 0 5px;
@@ -107,6 +107,9 @@
     #pulseaudio.muted {
       color: #8c8f91;
     }
+    #custom-systemd {
+      color: #8c8f91;
+    }
     #custom-systemd.errors {
       border-bottom: 2px solid #ef8773;
     }
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index e607c0d..7fa9c6a 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -52,12 +52,11 @@
       enable = true;
       defaultFonts = {
         serif = [ "DejaVu Serif" ];
-        sansSerif = [ "Roboto" ];
+        sansSerif = [ "DejaVu Sans Serif" ];
         monospace = [ "JetBrain Mono" ];
       };
     };
     fonts = with pkgs; [
-      cantarell-fonts
       dejavu_fonts
       etBook
       font-awesome_5