Updated default mono from Jetbrains to Ubuntu

ryanwclark1 · Dec 6, 2024 · 7bc0aeb · 7bc0aeb
1 parent f501721
commit 7bc0aeb
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 20 deletions.
diff --git a/home/features/desktop/hyprland/eww/backup/eww.scss b/home/features/desktop/hyprland/eww/backup/eww.scss
@@ -15,7 +15,7 @@ $light-gray: #9699b7;
 
 * {
     all: unset; //Unsets everything so you can style everything from scratch
-    font-family: "JetBrainsMono"
+    font-family: "UbuntuMono"
 }
 
 .icon {
@@ -122,7 +122,7 @@ button {
         margin: 8px;
         border-radius: 100px;
     }
-    
+
     .brightness_slider highlight {
         background-color: $yellow;
     }
@@ -134,7 +134,7 @@ button {
     .micvolume_slider highlight {
         background-color: $green;
     }
-    
+
     .slider_icon {
         font-size: 2rem;
         padding-right: 0.75rem;
@@ -185,7 +185,7 @@ button {
   font-size: 1.5rem;
 }
 
-.reg-btn { 
+.reg-btn {
     font-size: 2rem;
     margin: 2px 8px;
     border-radius: 10px;
@@ -204,8 +204,8 @@ button {
     color: $mantle;
 }
 
-.powerbutton { 
-    color: $red; 
+.powerbutton {
+    color: $red;
 }
 
 .powerbutton:hover {
@@ -217,8 +217,8 @@ button {
     color: $mantle;
 }
 
-.launchbutton { 
-    background-color: $blue; 
+.launchbutton {
+    background-color: $blue;
     color: $mantle;
     margin-top: 6px;
 }

diff --git a/home/features/desktop/hyprland/eww/backup/eww_backup2.scss b/home/features/desktop/hyprland/eww/backup/eww_backup2.scss
@@ -2,7 +2,7 @@
 Created by saimoom **/
 *{
 	all: unset;
-	font-family: JetBrainsMono Nerd Font;
+	font-family: Ubuntu Mono;
 }
 
 /** General **/
@@ -198,7 +198,7 @@ color: #3e424f;
 // Calendar
 .cal {
   background-color: #0f0f17;
-  font-family: JetBrainsMono Nerd Font;
+  font-family: Ubuntu Mono;
   font-size: 18px;
   font-weight: normal;
 

diff --git a/home/features/desktop/hyprland/rofi/style/rofi_template.nix b/home/features/desktop/hyprland/rofi/style/rofi_template.nix
@@ -10,7 +10,7 @@
         show-icons = true;
         icon-theme = "Papirus";
         location = 0;
-        font = "JetBrainsMono Nerd Font Mono 12";
+        font = "Ubuntu Mono 12";
         drun-display-format = "{icon} {name}";
         display-drun = " Apps";
         display-run = " Run";
@@ -184,7 +184,7 @@
           };
           "element-text" = {
             background-color = mkLiteral "transparent";
-            font = "JetBrainsMono Nerd Font Mono 12";
+            font = "Ubuntu Mono 12";
             text-color = mkLiteral "inherit";
             cursor = mkLiteral "inherit";
             vertical-align = mkLiteral "0.5";

diff --git a/home/features/desktop/hyprland/swaync/default.nix b/home/features/desktop/hyprland/swaync/default.nix
@@ -73,7 +73,7 @@
       };
       style = ''
         * {
-            font-family: JetBrainsMono Nerd Font Mono;
+            font-family: Ubuntu Mono;
             font-weight: bold;
           }
           .control-center .notification-row:focus,

diff --git a/home/features/desktop/hyprland/wlogout/default.nix b/home/features/desktop/hyprland/wlogout/default.nix
@@ -56,7 +56,7 @@ with config.lib.stylix.colors.withHashtag;
     ];
     style = ''
       * {
-        font-family: "JetBrainsMono NF", FontAwesome, sans-serif;
+        font-family: "Ubuntu Mono", FontAwesome, sans-serif;
       	background-image: none;
       	transition: 20ms;
       }

diff --git a/home/features/vscode/default.nix b/home/features/vscode/default.nix
@@ -278,7 +278,7 @@
         "files.autoSave" = "afterDelay";
         "files.trimTrailingWhitespace" = true;
         "telemetry.telemetryLevel" = "off";
-        # "terminal.integrated.fontFamily" = "JetBrainsMono Nerd Font";
+        # "terminal.integrated.fontFamily" = "Ubuntu Mono";
         "terminal.integrated.copyOnSelection" = true;
         "terminal.integrated.defaultProfile.linux" = "bash";
         "terminal.integrated.fontSize" = 12;

diff --git a/home/global/style.nix b/home/global/style.nix
@@ -33,8 +33,8 @@ in
         name = "DejaVu Sans";
       };
       monospace = {
-        package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
-        name = "JetBrainsMono Nerd Font";
+        package = pkgs.nerd-fonts.ubuntu-mono;
+        name = "Ubuntu Mono";
       };
       emoji = {
         package = pkgs.noto-fonts-emoji;

diff --git a/hosts/common/optional/style.nix b/hosts/common/optional/style.nix
@@ -32,8 +32,8 @@ in
         name = "DejaVu Sans";
       };
       monospace = {
-        package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
-        name = "JetBrainsMono Nerd Font";
+        package = pkgs.nerd-fonts.ubuntu-mono;
+        name = "Ubuntu Mono";
       };
       emoji = {
         package = pkgs.noto-fonts-emoji;

diff --git a/hosts/mini/default.nix b/hosts/mini/default.nix
@@ -55,7 +55,8 @@
 
   fonts = {
     packages = [
-      (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+      pkgs.nerd-fonts.jetbrains-mono
+      pkgs.nerd-fonts.ubuntu-mono
     ];
   };