diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 9e2b9fe..3d8eb1a 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -25,8 +25,6 @@
 
     noisetorch.enable = true;
 
-    hyprland.enable = true;
-
     fish.enable = true;
     virt-manager.enable = true;
 
diff --git a/modules/shared/extras.nix b/modules/shared/extras.nix
index b508ced..661b60d 100644
--- a/modules/shared/extras.nix
+++ b/modules/shared/extras.nix
@@ -29,23 +29,18 @@
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml";
 
-    #   pkgs.fetchurl {
-    #   url = "https://raw.githubusercontent.com/tinted-theming/schemes/refs/heads/spec-0.11/base16/catppuccin-mocha.yaml";
-    #   hash = "sha256-+/adkhwuW/3jCJ3/EWxyz99u13yuTk9Fqqy0YZ4KPPY=";
-    # };
-
     fonts = {
       serif = {
         package = pkgs.nerd-fonts.${userSettings.font};
-        name = "Iosevka Nerd Font";
+        name = "${userSettings.font} Nerd Font";
       };
       sansSerif = {
         package = pkgs.nerd-fonts.${userSettings.font};
-        name = "Iosevka Nerd Font";
+        name = "${userSettings.font} Nerd Font";
       };
       monospace = {
         package = pkgs.nerd-fonts.${userSettings.font};
-        name = "Iosevka Nerd Font";
+        name = "${userSettings.font} Nerd Font";
       };
       emoji = {
         package = pkgs.twemoji-color-font;
diff --git a/modules/shared/homeManagerPrograms.nix b/modules/shared/homeManagerPrograms.nix
index c0a692f..83fcda9 100644
--- a/modules/shared/homeManagerPrograms.nix
+++ b/modules/shared/homeManagerPrograms.nix
@@ -1,6 +1,8 @@
 {
   pkgs,
+  lib,
   userSettings,
+  systemSettings,
   ...
 }: {
   nix-index.enable = true;
@@ -17,15 +19,6 @@
     nix-direnv.enable = true;
   };
 
-  kitty = {
-    enable = true;
-    themeFile = "Catppuccin-Mocha";
-    extraConfig = "font_family Iosevka NF
-                   italic_font auto
-                   bold_italic_font  auto
-                   bold_font  auto";
-  };
-
   bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
@@ -59,9 +52,12 @@
         inherit (pkgs.fishPlugins.bang-bang) src;
       }
     ];
-    shellAliases = {
-      reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
-    };
+    shellAliases =
+      {
+      }
+      // lib.optionalAttrs (!systemSettings.darwin) {
+        reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
+      };
     shellInit = ''
       test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
       batman --export-env | source