diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/btop/default.nix index 6667b63..6f95ef8 100755 --- a/modules/home/programs/btop/default.nix +++ b/modules/home/programs/btop/default.nix @@ -9,8 +9,6 @@ in programs.btop = { enable = true; settings = { - color_theme = mkDefault "global"; - theme_background = true; truecolor = true; force_tty = false; presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"; diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index 4c0ac1c..4fb114e 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -7,7 +7,7 @@ with lib; let cfg = config.mjallen.programs.hyprland; - drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${config.gtk.iconTheme.name}"; + drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${config.stylix.icons.dark}"; in { imports = [ diff --git a/modules/home/programs/hyprland/options.nix b/modules/home/programs/hyprland/options.nix index 1c3ea60..1f242a6 100644 --- a/modules/home/programs/hyprland/options.nix +++ b/modules/home/programs/hyprland/options.nix @@ -152,18 +152,6 @@ with lib; description = "Any extra configuration options"; }; - iconThemeName = mkOption { - type = types.str; - default = "Colloid-Dark"; - description = "Icon theme name"; - }; - - gtkThemeName = mkOption { - type = types.str; - default = "Colloid-Dark"; - description = "GTK theme name"; - }; - defaultApps = mkOption { type = types.submodule { options = { diff --git a/modules/home/programs/hyprland/theme.nix b/modules/home/programs/hyprland/theme.nix index 539cff7..d755fde 100644 --- a/modules/home/programs/hyprland/theme.nix +++ b/modules/home/programs/hyprland/theme.nix @@ -16,11 +16,6 @@ let iconThemeVariant = "default"; # "default" | ... | "all" iconScheme = "nord"; # "default" | "nord" | "dracula" | ... - # Cursor - cursorTheme = "macOS"; - cursorThemePkg = pkgs.apple-cursor; - cursorSize = 24; - # GTK gtkTheme = "Colloid-dark-standard"; gtkThemePkg = pkgs.colloid-gtk-theme.override { @@ -36,56 +31,45 @@ let schemeVariants = [ iconScheme ]; colorVariants = [ iconThemeVariant ]; }; - - # Fonts - fontName = config.stylix.fonts.monospace.name; - fontPackage = config.stylix.fonts.monospace.package; - fontSize = 12; in { config = mkIf cfg.enable { - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface".color-scheme = mkForce "prefer-dark"; - "org/gnome/desktop/interface".cursor-theme = cursorTheme; - "org/gnome/desktop/interface".gtk-theme = gtkTheme; - "org/gnome/desktop/interface".icon-theme = iconTheme; - }; - }; + # dconf = { + # enable = true; + # settings = { + # "org/gnome/desktop/interface".color-scheme = mkForce "prefer-dark"; + # # "org/gnome/desktop/interface".cursor-theme = cursorTheme; + # "org/gnome/desktop/interface".gtk-theme = gtkTheme; + # "org/gnome/desktop/interface".icon-theme = iconTheme; + # }; + # }; - gtk = { - enable = true; + # gtk = { + # enable = true; - cursorTheme = { - name = cursorTheme; - package = cursorThemePkg; - }; + # cursorTheme = { + # name = cursorTheme; + # package = cursorThemePkg; + # }; - theme = { - name = gtkTheme; - package = gtkThemePkg; - }; + # theme = { + # name = gtkTheme; + # package = gtkThemePkg; + # }; - iconTheme = { - name = iconTheme; - package = iconThemePkg; - }; + # iconTheme = { + # name = iconTheme; + # package = iconThemePkg; + # }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = true; - }; + # gtk3.extraConfig = { + # gtk-application-prefer-dark-theme = true; + # }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = true; - }; - - font = { - name = mkDefault fontName; - package = mkDefault fontPackage; - size = mkDefault fontSize; - }; - }; + # gtk4.extraConfig = { + # gtk-application-prefer-dark-theme = true; + # }; + # }; }; } diff --git a/modules/home/programs/kitty/default.nix b/modules/home/programs/kitty/default.nix index c7d73e2..74a6685 100755 --- a/modules/home/programs/kitty/default.nix +++ b/modules/home/programs/kitty/default.nix @@ -11,12 +11,6 @@ in enable = true; shellIntegration.enableZshIntegration = true; - font = { - name = mkDefault cfg.font.name; - package = mkDefault cfg.font.package; - size = mkDefault cfg.font.size; - }; - settings = { bold_font = "auto"; italic_font = "auto"; @@ -25,80 +19,6 @@ in cursor_shape = "block"; url_style = "dotted"; confirm_os_window_close = "0"; - background_opacity = mkForce "0.85"; - - # # The basic colors - # foreground = config.lib.stylix.colors.base06; - # background = config.lib.stylix.colors.base00; - # selection_foreground = config.lib.stylix.colors.base00; - # selection_background = config.lib.stylix.colors.base0E; - - # # Cursor colors - # cursor = config.lib.stylix.colors.base0E; - # cursor_text_color = config.lib.stylix.colors.base00; - - # # URL underline color when hovering with mouse - # url_color = config.lib.stylix.colors.base0E; - - # # Kitty window border colors - # active_border_color = config.lib.stylix.colors.base0F; - # inactive_border_color = config.lib.stylix.colors.base01; - # bell_border_color = config.lib.stylix.colors.base0A; - - # # OS Window titlebar colors - # wayland_titlebar_color = config.lib.stylix.colors.base00; - # macos_titlebar_color = config.lib.stylix.colors.base00; - - # # Tab bar colors - # active_tab_foreground = config.lib.stylix.colors.base03; - # active_tab_background = config.lib.stylix.colors.base0E; - # inactive_tab_foreground = config.lib.stylix.colors.base06; - # inactive_tab_background = config.lib.stylix.colors.base01; - # tab_bar_background = config.lib.stylix.colors.base03; - - # # Colors for marks (marked text in the terminal) - # mark1_foreground = config.lib.stylix.colors.base00; - # mark1_background = config.lib.stylix.colors.base0F; - # mark2_foreground = config.lib.stylix.colors.base00; - # mark2_background = config.lib.stylix.colors.base0E; - # mark3_foreground = config.lib.stylix.colors.base00; - # mark3_background = config.lib.stylix.colors.base0C; - - # # The 16 terminal colors - - # # black - # color0 = config.lib.stylix.colors.base00; - - # # Autosuggestion - # color8 = config.lib.stylix.colors.base0F; - - # # red - # color1 = config.lib.stylix.colors.base08; - # color9 = config.lib.stylix.colors.base08; - - # # green - # color2 = config.lib.stylix.colors.base0B; - # color10 = config.lib.stylix.colors.base0B; - - # # yellow - # color3 = config.lib.stylix.colors.base0A; - # color11 = config.lib.stylix.colors.base0A; - - # # blue - # color4 = config.lib.stylix.colors.base0F; - # color12 = config.lib.stylix.colors.base0F; - - # # magenta - # color5 = config.lib.stylix.colors.base0E; - # color13 = config.lib.stylix.colors.base0E; - - # # cyan - # color6 = config.lib.stylix.colors.base0C; - # color14 = config.lib.stylix.colors.base0C; - - # # white - # color7 = config.lib.stylix.colors.base05; - # color15 = config.lib.stylix.colors.base06; }; }; }; diff --git a/modules/home/programs/kitty/options.nix b/modules/home/programs/kitty/options.nix index 9789e60..0385fe3 100644 --- a/modules/home/programs/kitty/options.nix +++ b/modules/home/programs/kitty/options.nix @@ -6,19 +6,5 @@ in { options.mjallen.programs.kitty = { enable = mkEnableOption "enable kitty terminal"; - - font = { - name = mkOption { - type = types.str; - default = "DejaVu Sans"; - }; - - package = mkOpt types.package pkgs.dejavu_fonts "Default font package"; - - size = mkOption { - type = with types; int; - default = 12; - }; - }; }; } diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index 92fb737..e11f823 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -1,4 +1,29 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: +let + # # Pull from global theme options + # themeSize = "standard"; # "standard" | "compact" + # themeAccent = "default"; # "default" | ... | "all" + # themeTweak = "normal"; # "normal" | "rimless" | "float" | "black" + # themeColor = "dark"; # "light" | "dark" + # iconThemeVariant = "default"; # "default" | ... | "all" + # iconScheme = "nord"; # "default" | "nord" | "dracula" | ... + + # # GTK + # gtkTheme = "Colloid-dark-standard"; + # gtkThemePkg = pkgs.colloid-gtk-theme.override { + # sizeVariants = [ themeSize ]; + # colorVariants = [ themeColor ]; + # themeVariants = [ themeAccent ]; + # tweaks = [ themeTweak ]; + # }; + + # # Icons + # iconTheme = "Colloid-nord-dark"; + # iconThemePkg = pkgs.colloid-icon-theme.override { + # schemeVariants = [ iconScheme ]; + # colorVariants = [ iconThemeVariant ]; + # }; +in { stylix = { enable = true; @@ -11,7 +36,7 @@ package = pkgs.apple-cursor; }; - fonts ={ + fonts = { serif = { package = pkgs.dejavu_fonts; name = "DejaVu Serif"; @@ -31,12 +56,30 @@ package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; + + sizes = { + applications = 12; + desktop = 14; + popups = config.stylix.fonts.sizes.desktop; + terminal = config.stylix.fonts.sizes.applications; + }; + }; + + icons = { + enable = true; + package = pkgs.colloid-icon-theme; + dark = "Colloid-nord-dark"; + light = "Colloid-nord-light"; + }; + + opacity = { + terminal = 0.85; }; targets = { hyprlock.enable = false; gnome.enable = false; - gtk.enable = false; + # gtk.enable = false; qt.enable = false; }; };