This commit is contained in:
mjallen18
2025-12-01 14:50:23 -06:00
parent 73581fd8f0
commit 47e2b0caf8
15 changed files with 375 additions and 44 deletions

View File

@@ -45,6 +45,7 @@
sops-nix.homeManagerModules.sops
nix-plist-manager.homeManagerModules.default
nix-index-database.homeModules.nix-index
stylix.homeModules.stylix
# Add any other external HM modules here
];

View File

@@ -10,7 +10,7 @@ in
programs.btop = {
enable = true;
settings = {
color_theme = "global";
color_theme = mkDefault "global";
theme_background = true;
truecolor = true;
force_tty = false;

View File

@@ -176,14 +176,14 @@ in
{
monitor = "";
path = "/run/wallpaper.jpg"; # supports png, jpg, webp (no animations, though)
color = "rgba(25, 20, 20, 1.0)";
color = mkForce "rgba(25, 20, 20, 1.0)";
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
blur_passes = "3"; # 0 disables blurring
blur_size = "7";
blur_passes = mkForce "3"; # 0 disables blurring
blur_size = mkForce "7";
noise = "0.0117";
contrast = "0.8916";
brightness = "0.8172";
brightness = mkForce "0.8172";
vibrancy = "0.1696";
vibrancy_darkness = "0.0";
}
@@ -195,7 +195,7 @@ in
text = "cmd[update:1000] echo -e \"$(LC_TIME=en_US.UTF-8 date +\"%A, %B %d\")\"";
color = "#eceff4";
font_size = "25";
font_family = "JetBrainsMono NFM";
font_family = lib.mkDefault "JetBrainsMono NFM";
position = "0, 350";
halign = "center";
valign = "center";
@@ -206,7 +206,7 @@ in
text = "cmd[update:1000] echo \"<span>$(date +\"%I:%M\")</span>\"";
color = "#eceff4";
font_size = "120";
font_family = "JetBrainsMono NFM Bold";
font_family = lib.mkDefault "JetBrainsMono NFM Bold";
position = "0, 230";
halign = "center";
valign = "center";
@@ -220,7 +220,7 @@ in
dots_spacing = 0.2;
dots_center = true;
font_size = 18;
font_family = "JetBrainsMono NFM Bold";
font_family = lib.mkDefault "JetBrainsMono NFM Bold";
position = "0, 0";
halign = "center";
valign = "center";
@@ -231,7 +231,7 @@ in
text = "cmd[update:30000] waybar-weather --hyprlock";
color = "#eceff4";
font_size = "25";
font_family = "JetBrainsMono NFM";
font_family = lib.mkDefault "JetBrainsMono NFM";
position = "-100, 100";
halign = "right";
valign = "bottom";
@@ -242,7 +242,7 @@ in
text = "cmd[update:1000] waybar-media";
color = "#eceff4";
font_size = "15";
font_family = "JetBrainsMono NFM";
font_family = lib.mkDefault "JetBrainsMono NFM";
position = "100, 100";
halign = "left";
valign = "bottom";
@@ -265,7 +265,7 @@ in
{
size = "200, 50";
position = "0, -80";
font_family = "JetBrainsMono NFM";
font_family = lib.mkDefault "JetBrainsMono NFM";
monitor = cfg.primaryDisplay;
dots_center = true;
fade_on_empty = true;
@@ -486,8 +486,8 @@ in
gaps_in = 5;
gaps_out = 10;
border_size = 1;
"col.active_border" = "rgb(8aadf4) rgb(24273A) rgb(24273A) rgb(8aadf4) 45deg";
"col.inactive_border" = "rgb(24273A) rgb(24273A) rgb(24273A) rgb(24273A) 45deg";
# "col.active_border" = "rgb(8aadf4) rgb(24273A) rgb(24273A) rgb(8aadf4) 45deg";
# "col.inactive_border" = "rgb(24273A) rgb(24273A) rgb(24273A) rgb(24273A) 45deg";
layout = "dwindle";
allow_tearing = cfg.allowTearing;
};

View File

@@ -57,7 +57,7 @@ in
dconf = {
enable = true;
settings = {
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
"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;
@@ -91,9 +91,9 @@ in
};
font = {
name = fontName;
package = fontPackage;
size = fontSize;
name = mkDefault fontName;
package = mkDefault fontPackage;
size = mkDefault fontSize;
};
};
};

View File

@@ -13,20 +13,20 @@ in
shellIntegration.enableZshIntegration = true;
font = {
name = cfg.font.name;
package = cfg.font.package;
size = cfg.font.size;
name = mkDefault cfg.font.name;
package = mkDefault cfg.font.package;
size = mkDefault cfg.font.size;
};
settings = {
bold_font = "auto";
bold_font = "auto";
italic_font = "auto";
bold_italic_font = "auto";
mouse_hide_wait = "2.0";
cursor_shape = "block";
url_style = "dotted";
confirm_os_window_close = "0";
background_opacity = "0.85";
background_opacity = mkForce "0.85";
# The basic colors
foreground = palette.colors.text;

View File

@@ -10,7 +10,7 @@ in
services.mako = {
enable = true;
settings = {
font = cfg.fontName;
font = mkDefault cfg.fontName;
icons = true;
ignore-timeout = true;
sort = "-time";
@@ -22,10 +22,10 @@ in
max-icon-size = 64;
default-timeout = 5000;
background-color = palette.colors.bg;
text-color = palette.colors.text;
border-color = palette.colors.primary;
progress-color = "over ${palette.colors.info}";
background-color = mkDefault palette.colors.bg;
text-color = mkDefault palette.colors.text;
border-color = mkDefault palette.colors.primary;
progress-color = mkDefault "over ${palette.colors.info}";
};
};
};

View File

@@ -45,7 +45,7 @@ let
@keyframes blinker {
50% {
color: ${palette.colors.danger};
color: @base08;
}
}

View File

@@ -0,0 +1,37 @@
{ pkgs, lib, ... }:
{
stylix = {
enable = true;
stylix.enableReleaseChecks = false;
base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
fonts = lib.mkForce {
serif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Serif";
};
sansSerif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
monospace = {
package = pkgs.nerd-fonts.jetbrains-mono;
name = "JetBrainsMono NFM";
};
emoji = {
package = pkgs.noto-fonts-color-emoji;
name = "Noto Color Emoji";
};
};
targets = {
hyprlock.enable = false;
gnome.enable = false;
gtk.enable = false;
qt.enable = false;
};
};
}

View File

@@ -65,6 +65,7 @@ in
sops-nix.homeManagerModules.sops
nix-plist-manager.homeManagerModules.default
nix-index-database.homeModules.nix-index
stylix.homeModules.stylix
# Add any other external HM modules here
]
++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ])

View File

@@ -7,8 +7,8 @@
hwRender = true;
fonts = [
{
name = "JetBrainsMono NFM";
package = pkgs.nerd-fonts.jetbrains-mono;
name = lib.mkDefault "JetBrainsMono NFM";
package = lib.mkDefault pkgs.nerd-fonts.jetbrains-mono;
}
];
};