This commit is contained in:
death916 2025-12-24 03:12:17 -08:00
parent 6a3ac09e09
commit b3e9b397ea
3 changed files with 79 additions and 117 deletions

View file

@ -103,7 +103,7 @@
home-manager.users.death916 = {
imports = [
./home-manager/home.nix
stylix.homeManagerModules.stylix
stylix.homeModules.stylix
];
};
}

View file

@ -183,9 +183,10 @@
xdg.portal = {
enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
];
extraPortals = with pkgs;
[
xdg-desktop-portal-gtk
];
};
programs.waybar = {
@ -290,16 +291,16 @@
};
};
};
style = config.stylix.waybar.css;
# style = config.stylix.waybar.css; # Stylix will manage this
};
programs.rofi = {
enable = true;
theme = config.stylix.rofi.theme;
# theme = config.stylix.rofi.theme; # Stylix will manage this
extraConfig = {
modi = "drun,run,ssh,window";
show-icons = true;
icon-theme = "Papirus-Dark"; # This might be overridden by stylix, but it's good to keep
icon-theme = "Papirus-Dark";
};
};
@ -324,7 +325,7 @@
padding = 8;
horizontal_padding = 8;
frame_width = 2;
frame_color = config.stylix.colors.base0C; # Blue accent
# frame_color = config.stylix.colors.base0C; # Stylix will manage this
separator_color = "frame";
word_wrap = true;
ellipsize = "middle";
@ -353,18 +354,18 @@
hide_duplicate_count = false;
show_indicators = true;
};
urgency_low = {
background = config.stylix.colors.base00;
foreground = config.stylix.colors.base05;
};
urgency_normal = {
background = config.stylix.colors.base00;
foreground = config.stylix.colors.base05;
};
urgency_critical = {
background = config.stylix.colors.base08; # Red accent
foreground = config.stylix.colors.base00;
};
# urgency_low = { # Stylix will manage this
# background = config.stylix.colors.base00;
# foreground = config.stylix.colors.base05;
# };
# urgency_normal = { # Stylix will manage this
# background = config.stylix.colors.base00;
# foreground = config.stylix.colors.base05;
# };
# urgency_critical = { # Stylix will manage this
# background = config.stylix.colors.base08;
# foreground = config.stylix.colors.base00;
# };
};
};
@ -373,29 +374,30 @@
};
fonts.fontconfig.enable = true;
home.packages = with pkgs; [
nerd-fonts.jetbrains-mono
noto-fonts
noto-fonts-cjk-sans
noto-fonts-color-emoji
font-awesome
roboto
grim
slurp
networkmanagerapplet
blueman
waybar
kitty
libnotify
kdePackages.dolphin
catppuccin-gtk
materia-theme
rose-pine-gtk-theme
nightfox-gtk-theme
materia-kde-theme
home.packages = with pkgs;
[
nerd-fonts.jetbrains-mono
noto-fonts
noto-fonts-cjk-sans
noto-fonts-color-emoji
font-awesome
roboto
grim
slurp
networkmanagerapplet
blueman
waybar
kitty
libnotify
kdePackages.dolphin
catppuccin-gtk
materia-theme
rose-pine-gtk-theme
nightfox-gtk-theme
materia-kde-theme
playerctl
wl-clipboard
unstablePkgs.wttrbar
];
}
playerctl
wl-clipboard
unstablePkgs.wttrbar
];
}

View file

@ -3,106 +3,66 @@
{
stylix.enable = true;
stylix.wallpaper.paths = [ "/home/death916/Pictures/wallpapers/jameswebb1.jpg" ];
stylix.wallpaper.mode = "fill"; # Or "stretch", "zoom", "fit"
stylix.image = "/home/death916/Pictures/wallpapers/jameswebb1.jpg";
stylix.colors = {
# Base colors (dark to light)
stylix.base16Scheme = {
base00 = "#0f0f0f"; # background
base01 = "#1a1a1a"; # slightly lighter background for elements (generated)
base02 = "#706a6a"; # bright_black (for secondary elements, borders)
base03 = "#808080"; # comments/less prominent text (generated)
base04 = "#b0b0b0"; # dim foreground (generated)
base01 = "#1a1a1a"; # slightly lighter background
base02 = "#706a6a"; # bright_black
base03 = "#808080"; # comments
base04 = "#b0b0b0"; # dim foreground
base05 = "#eadccc"; # foreground
base06 = "#f0f0f0"; # brighter foreground (generated)
base07 = "#ffffff"; # white (pure white for contrast)
# Accent colors
base06 = "#f0f0f0"; # brighter foreground
base07 = "#ffffff"; # white
base08 = "#e25d6c"; # red
base09 = "#f4bb54"; # yellow
base0A = "#e8ab3b"; # cyan
base0B = "#cea37f"; # green
base0C = "#e2be8a"; # blue
base0D = "#e8ab3b"; # cyan (using cyan for purple-ish if needed, or adjust)
base0E = "#ede4c8"; # magenta (using original magenta)
base0F = "#ff8800"; # a generic amber/orange (generated, could be 'yellow')
base0D = "#e8ab3b"; # cyan (duplicate)
base0E = "#ede4c8"; # magenta
base0F = "#ff8800"; # amber/orange
};
stylix.cursor = {
package = pkgs.catppuccin-cursors; # Existing cursor
name = "Catppuccin-Mocha-Dark-Cursors"; # Existing cursor
size = 24; # Existing size
package = pkgs.catppuccin-cursors;
name = "Catppuccin-Mocha-Dark-Cursors";
size = 24;
};
stylix.fonts = {
monospace = {
package = pkgs.nerd-fonts.jetbrains-mono;
name = "JetBrainsMono Nerd Font";
size = 10;
};
serif = {
package = pkgs.noto-fonts;
name = "Noto Serif"; # Placeholder
size = 10;
};
sansSerif = {
package = pkgs.noto-fonts;
name = "Noto Sans"; # Placeholder
size = 10;
name = "Noto Sans";
};
serif = {
package = pkgs.noto-fonts;
name = "Noto Serif";
};
emoji = {
package = pkgs.noto-fonts-color-emoji;
name = "Noto Color Emoji";
size = 10;
};
sizes = {
applications = 10;
desktop = 10;
terminal = 10;
waybar = 10;
};
};
stylix.targets = {
desktop.enable = true; # Theme desktop environment components
hyprland.enable = true;
waybar.enable = true;
rofi.enable = true;
dunst.enable = true;
gtk.enable = true;
kde.enable = true; # KDE is for QT applications
kde.enable = true;
plymouth.enable = true;
plasma.enable = true; # For KDE Plasma
plasma.enable = true;
};
stylix.extraPackageModules = [
({ config, pkgs, ... }: {
programs.hyprland.settings.general.col.active_border = "rgb(${config.stylix.colors.base0C})"; # Blue
programs.hyprland.settings.general.col.inactive_border = "rgb(${config.stylix.colors.base00})"; # Background
})
];
programs.waybar = {
enable = true;
settings = config.stylix.waybar.settings; # Let stylix manage waybar settings
style = config.stylix.waybar.css; # Let stylix generate the CSS
};
programs.rofi = {
enable = true;
theme = config.stylix.rofi.theme; # Let stylix manage rofi theme
};
services.dunst = {
enable = true;
settings = {
global = {
frame_color = config.stylix.colors.base0C; # Blue accent
background = config.stylix.colors.base00;
foreground = config.stylix.colors.base05;
};
urgency_low = {
background = config.stylix.colors.base00;
foreground = config.stylix.colors.base05;
};
urgency_normal = {
background = config.stylix.colors.base00;
foreground = config.stylix.colors.base05;
};
urgency_critical = {
background = config.stylix.colors.base08; # Red accent
foreground = config.stylix.colors.base00;
};
};
};
}
}