diff --git a/modules/home/default.nix b/modules/home/default.nix index 0ba8a59..33fbd8e 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -51,7 +51,6 @@ in , ... }@user: { pkgs, ... }: { fonts = fontsModule; - # gtk = (import ./gtk.nix { inherit pkgs; }); home = homeModule // { username = name; homeDirectory = "/home/${name}"; diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix deleted file mode 100644 index be7822c..0000000 --- a/modules/home/gtk.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs }: -with pkgs; -{ - theme = { - name = "WhiteSur-Dark"; - package = whitesur-gtk-theme; - }; - font = { - name = "FiraCode"; - package = fira-code; - size = 8; - }; -} diff --git a/modules/nixos/desktop/stylix/default.nix b/modules/nixos/desktop/stylix/default.nix index 2631a80..311970c 100644 --- a/modules/nixos/desktop/stylix/default.nix +++ b/modules/nixos/desktop/stylix/default.nix @@ -6,8 +6,8 @@ in options = { skyg.nixos.desktop.stylix = { enable = (lib.mkEnableOption - "Enable Stylix") // { - default = true; + "Enable Stylix") // { + default = true; }; }; }; @@ -16,5 +16,26 @@ in stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; stylix.polarity = "dark"; stylix.autoEnable = true; + stylix.fonts = { + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + + monospace = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans Mono"; + }; + + emoji = { + package = pkgs.noto-fonts-color-emoji; + name = "Noto Color Emoji"; + }; + }; }; } diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix index 2aa1089..5f7488b 100644 --- a/modules/nixos/desktop/tiler/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -33,11 +33,11 @@ in extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; }; home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = { - enable = true; - plugins = with pkgs; [ - hyprlandPlugins.hyprexpo - hyprlandPlugins.hyprbars - ]; + enable = true; + plugins = with pkgs; [ + hyprlandPlugins.hyprexpo + hyprlandPlugins.hyprbars + ]; }; }; }