Use stylix instead of unmaintained nix-colors

This commit is contained in:
2026-06-01 23:06:54 +02:00
parent 5ecb1594d1
commit f6c123e3bf
13 changed files with 391 additions and 167 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
}:
with lib; {
home.file = {
".config/starship.toml".source = ./starship.toml;
# ".config/starship.toml".source = ./starship.toml;
".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish;
};
+1 -16
View File
@@ -211,9 +211,6 @@
gaps_out = 5;
layout = "dwindle";
# "col.active_border" = "0xff${palette.base0C} 0xff${palette.base0D} 270deg";
# "col.inactive_border" = "0xff${palette.base00}";
};
decoration = {
@@ -253,7 +250,7 @@
};
exec = [
"hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
# "hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
"correct-workspace-locations"
];
@@ -442,18 +439,6 @@
"$mod SHIFT,W,exec,${makoctl} restore"
]
);
# plugin = {
# hyprbars = {
# bar_text_size = 10;
# bar_height = 16;
# bar_text_font = "Ubuntu Nerd Font";
# bar_precedence_over_border = true;
# bar_color = "rgb(${palette.base01})";
# hyprbars-button = [ "rgb(${palette.base03}), 14, 󰖭, hyprctl dispatch killactive" ];
# };
# };
};
};
}
@@ -1,15 +1,5 @@
{
options,
config,
lib,
pkgs,
inputs,
...
}: let
inherit
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
{config, ...}: let
palette = config.lib.stylix.colors;
in {
programs.hyprlock.enable = true;
programs.hyprlock.settings = {
@@ -1,30 +1,10 @@
{
options,
config,
lib,
pkgs,
inputs,
...
}: let
inherit
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
in {
{pkgs, ...}: {
home.packages = with pkgs; [libnotify];
services.mako = {
enable = true;
settings = {
defaultTimeout = "5000"; # milliseconds, can be overwritten by notification sender
backgroundColor = "#${palette.base00}";
textColor = "#${palette.base05}";
borderColor = "#${palette.base0D}";
progressColor = "over #${palette.base02}";
extraConfig = ''
[urgency=high]
border-color=#${palette.base09}
# '';
};
};
}
@@ -1,12 +1,5 @@
{
options,
config,
pkgs,
lib,
inputs,
...
}: let
palette = (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}).palette;
{config, ...}: let
palette = config.lib.stylix.colors;
in {
programs.waybar = {
enable = true;
@@ -14,23 +7,23 @@ in {
settings.mainBar = builtins.fromJSON (builtins.readFile ./config.json);
};
xdg.configFile."waybar/style.css".source = ./style.css;
xdg.configFile."waybar/theme.css".text = ''
/*
bg - background
fg - foreground
*/
# xdg.configFile."waybar/style.css".source = ./style.css;
# xdg.configFile."waybar/theme.css".text = ''
# /*
# bg - background
# fg - foreground
# */
/* Main Colors */
@define-color background #${palette.base00};
@define-color foreground #${palette.base05};
# /* Main Colors */
# @define-color background #${palette.base00};
# @define-color foreground #${palette.base05};
/* Workspace Button Colors */
@define-color hover-bg #${palette.base01};
@define-color hover-fg #${palette.base05};
@define-color active-bg #${palette.base02};
@define-color active-fg #${palette.base0A};
@define-color urgent-bg #${palette.base08};
@define-color urgent-fg #${palette.base00};
'';
# /* Workspace Button Colors */
# @define-color hover-bg #${palette.base01};
# @define-color hover-fg #${palette.base05};
# @define-color active-bg #${palette.base02};
# @define-color active-fg #${palette.base0A};
# @define-color urgent-bg #${palette.base08};
# @define-color urgent-fg #${palette.base00};
# '';
}
@@ -1,15 +1,9 @@
{
options,
config,
lib,
pkgs,
inputs,
...
}: let
inherit
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
palette = config.lib.stylix.colors;
in {
home.packages = with pkgs; [wlogout];
+63 -69
View File
@@ -1,86 +1,80 @@
{
options,
config,
lib,
pkgs,
inputs,
...
}: let
inherit
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
palette = config.lib.stylix.colors;
in {
home.packages = with pkgs; [wofi];
xdg.configFile."wofi/config".source = ./config;
xdg.configFile."wofi/style.css".text = ''
window {
margin: 5px;
border: 5px solid #181926;
background-color: #${palette.base00};
border-radius: 15px;
font-family: "JetBrainsMono";
font-size: 14px;
}
# xdg.configFile."wofi/style.css".text = ''
# window {
# margin: 5px;
# border: 5px solid #181926;
# background-color: #${palette.base00};
# border-radius: 15px;
# font-family: "JetBrainsMono";
# font-size: 14px;
# }
#input {
all: unset;
min-height: 36px;
padding: 4px 10px;
margin: 4px;
border: none;
color: #${palette.base05};
font-weight: bold;
background-color: #${palette.base01};
outline: none;
border-radius: 15px;
margin: 10px;
margin-bottom: 2px;
}
# #input {
# all: unset;
# min-height: 36px;
# padding: 4px 10px;
# margin: 4px;
# border: none;
# color: #${palette.base05};
# font-weight: bold;
# background-color: #${palette.base01};
# outline: none;
# border-radius: 15px;
# margin: 10px;
# margin-bottom: 2px;
# }
#inner-box {
margin: 4px;
padding: 10px;
font-weight: bold;
border-radius: 15px;
}
# #inner-box {
# margin: 4px;
# padding: 10px;
# font-weight: bold;
# border-radius: 15px;
# }
#outer-box {
margin: 0px;
padding: 3px;
border: none;
border-radius: 15px;
border: 5px solid #${palette.base01};
}
# #outer-box {
# margin: 0px;
# padding: 3px;
# border: none;
# border-radius: 15px;
# border: 5px solid #${palette.base01};
# }
#scroll {
margin-top: 5px;
border: none;
border-radius: 15px;
margin-bottom: 5px;
}
# #scroll {
# margin-top: 5px;
# border: none;
# border-radius: 15px;
# margin-bottom: 5px;
# }
#text:selected {
color: #${palette.base01};
margin: 0px 0px;
border: none;
border-radius: 15px;
}
# #text:selected {
# color: #${palette.base01};
# margin: 0px 0px;
# border: none;
# border-radius: 15px;
# }
#entry {
margin: 0px 0px;
border: none;
border-radius: 15px;
background-color: transparent;
}
# #entry {
# margin: 0px 0px;
# border: none;
# border-radius: 15px;
# background-color: transparent;
# }
#entry:selected {
margin: 0px 0px;
border: none;
border-radius: 15px;
background: #${palette.base0D};
background-size: 400% 400%;
}
'';
# #entry:selected {
# margin: 0px 0px;
# border: none;
# border-radius: 15px;
# background: #${palette.base0D};
# background-size: 400% 400%;
# }
# '';
}
@@ -1,5 +1,5 @@
{pkgs, ...}: {
imports = [../../gtk];
imports = [./stylix.nix];
services.blueman-applet.enable = true;
services.nextcloud-client.enable = true;
@@ -0,0 +1,10 @@
{
pkgs,
inputs,
...
}: {
imports = [inputs.stylix.homeModules.stylix];
stylix.enable = true;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
}
+3 -3
View File
@@ -3,9 +3,9 @@
pkgs,
...
}: {
home.file = {
".config/starship.toml".source = ./starship.toml;
};
# home.file = {
# ".config/starship.toml".source = ./starship.toml;
# };
home.packages = with pkgs; [starship];