From 8e7629da2ef0168613412760dc19eaa20afbb43a Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Thu, 2 May 2024 14:16:25 +0200
Subject: [PATCH] font: try cascadia code

---
 hosts/configuration_desktop.nix | 3 +--
 hosts/configuration_server.nix  | 2 +-
 hosts/home.nix                  | 2 +-
 modules/desktop/sway/home.nix   | 2 +-
 modules/home.nix                | 2 +-
 modules/programs/alacritty.nix  | 5 +++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hosts/configuration_desktop.nix b/hosts/configuration_desktop.nix
index 67037fe..4d6b7bf 100644
--- a/hosts/configuration_desktop.nix
+++ b/hosts/configuration_desktop.nix
@@ -69,12 +69,11 @@
     carlito                                 # NixOS
     vegur                                   # NixOS
     source-code-pro
-    jetbrains-mono
     font-awesome                            # Icons
     hack-font
     corefonts                               # MS
     intel-one-mono
-    office-code-pro
+    cascadia-code
     (nerdfonts.override {                   # Nerdfont Icons override
       fonts = [
         "FiraCode"
diff --git a/hosts/configuration_server.nix b/hosts/configuration_server.nix
index 1feab25..acad7d7 100644
--- a/hosts/configuration_server.nix
+++ b/hosts/configuration_server.nix
@@ -58,7 +58,7 @@
     carlito                                 # NixOS
     vegur                                   # NixOS
     source-code-pro
-    jetbrains-mono
+    cascadia-code
     font-awesome                            # Icons
     hack-font
     corefonts                               # MS
diff --git a/hosts/home.nix b/hosts/home.nix
index d654e45..2a6f65f 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -123,7 +123,7 @@
 #      package = pkgs.papirus-icon-theme;
 #    };
 #    font = {
-#      name = "FiraCode Nerd Font";         # or FiraCode Nerd Font Mono Medium
+#      name = "Cascadia Code";         # or FiraCode Nerd Font Mono Medium
 #    };                                        # Cursor is declared under home.pointerCursor
 #  };
   systemd.user.services.mpris-proxy = {
diff --git a/modules/desktop/sway/home.nix b/modules/desktop/sway/home.nix
index 3035f34..d230bdc 100644
--- a/modules/desktop/sway/home.nix
+++ b/modules/desktop/sway/home.nix
@@ -73,7 +73,7 @@
         terminal = "${pkgs.alacritty}/bin/alacritty";
     
         fonts = {
-            names = [ "Source Code Pro" ];
+            names = [ "Cascadia Code" ];
             size = 10.0;
         };
         
diff --git a/modules/home.nix b/modules/home.nix
index 55c8844..f447d74 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -24,7 +24,7 @@
     theme = {
       theme = mkOption { type = types.str; default = "catppuccin-mocha"; };
       icon-theme = mkOption { type = types.str; default = "Papirus-Dark"; };
-      font = mkOption { type = types.str; default = "FiraCode Nerd Font 11"; };
+      font = mkOption { type = types.str; default = "Cascadia Code 11"; };
       wallpaper = mkOption { type = types.str; default = ""; };
     };
   };
diff --git a/modules/programs/alacritty.nix b/modules/programs/alacritty.nix
index eaeaf9d..6beae75 100644
--- a/modules/programs/alacritty.nix
+++ b/modules/programs/alacritty.nix
@@ -16,8 +16,9 @@
       package = pkgs.alacritty;
       settings = {
         font = rec {                          # Font - Laptop has size manually changed at home.nix
-          #normal.family = "Source Code Pro";
-          normal.family = "FiraCode Nerd Font";
+          #normal.family = "FiraCode Nerd Font";
+          normal.family = "Cascadia Code";
+          #normal.family = "Intel One Mono";
           #bold = { style = "Bold"; };
 #         size = 8;
         };