diff --git a/hosts/desktop.nix b/hosts/desktop.nix index 534f531..b70616c 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -1,6 +1,5 @@ { inputs, - config, pkgs, ... }: @@ -53,28 +52,6 @@ systemd.services.NetworkManager-wait-online.enable = false; - stylix = { - enable = true; - autoEnable = false; - image = config.lib.stylix.pixel "base00"; - polarity = "dark"; - - # colors, dracula, eris, google-dark, framer, horizon-terminal-dark, humanoid-dark, isotope, onedark-dark, spacemacs, windows-nt - base16Scheme = "${pkgs.base16-schemes}/share/themes/colors.yaml"; - - cursor = { - name = "Adwaita"; - package = pkgs.adwaita-icon-theme; - }; - - fonts = { - sansSerif = { - name = "Segoe UI"; - package = pkgs.segoe-ui-ttf; - }; - }; - }; - fonts.packages = with pkgs; [ noto-fonts (nerdfonts.override { diff --git a/modules/nixos/system/desktop/hyprland.nix b/modules/nixos/system/desktop/hyprland.nix index ec3e354..01680b6 100644 --- a/modules/nixos/system/desktop/hyprland.nix +++ b/modules/nixos/system/desktop/hyprland.nix @@ -1,4 +1,5 @@ { + pkgs, config, lib, ... @@ -23,5 +24,33 @@ in enable = true; # withUWSM = true; }; + + nixpkgs.config.allowUnfree = true; + + stylix = { + enable = true; + autoEnable = false; + image = config.lib.stylix.pixel "base00"; + polarity = "dark"; + + # colors, dracula, eris, google-dark, framer, horizon-terminal-dark, humanoid-dark, isotope, onedark-dark, spacemacs, windows-nt + base16Scheme = "${pkgs.base16-schemes}/share/themes/colors.yaml"; + + cursor = { + name = "macOS"; + package = pkgs.apple-cursor; + }; + + fonts = { + sansSerif = { + name = "SF Pro Text"; + package = pkgs.sf-pro; + }; + emoji = { + name = "Apple Color Emoji"; + package = pkgs.apple-color-emoji; + }; + }; + }; }; } diff --git a/users/jordan/graphical/default.nix b/users/jordan/graphical/default.nix index ff895a1..0515e9c 100644 --- a/users/jordan/graphical/default.nix +++ b/users/jordan/graphical/default.nix @@ -18,10 +18,6 @@ ./hyprland ]; - fonts.fontconfig.defaultFonts.sansSerif = [ - "Segoe UI" - ]; - home.packages = with pkgs; [ # ardour # audacity diff --git a/users/jordan/graphical/hyprland/default.nix b/users/jordan/graphical/hyprland/default.nix index a154bf0..ea31c06 100644 --- a/users/jordan/graphical/hyprland/default.nix +++ b/users/jordan/graphical/hyprland/default.nix @@ -18,6 +18,10 @@ in ./waybar.nix ]; + fonts.fontconfig.defaultFonts.sansSerif = [ + "SF Pro Text" + ]; + wayland.windowManager.hyprland = { enable = true; # plugins = [ hypr-dynamic-cursors ]; # https://github.com/VirtCode/hypr-dynamic-cursors