yank enough to make hosts build with stylix enabled
Some checks are pending
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

This commit is contained in:
Aly Raffauf 2024-08-14 22:41:54 -04:00
parent 6b7f115928
commit 7b1f0f8316
15 changed files with 49 additions and 328 deletions

View file

@ -11,12 +11,6 @@ in {
settings = { settings = {
colors = { colors = {
draw_bold_text_with_bright_colors = true; draw_bold_text_with_bright_colors = true;
primary = {
background = "${cfg.theme.colors.background}";
foreground = "${cfg.theme.colors.text}";
};
transparent_background_colors = true; transparent_background_colors = true;
}; };

View file

@ -6,7 +6,6 @@
./emacs ./emacs
./fastfetch ./fastfetch
./firefox ./firefox
./fuzzel
./helix ./helix
./keepassxc ./keepassxc
./kitty ./kitty

View file

@ -1,37 +0,0 @@
{
config,
lib,
...
}: let
cfg = config.ar.home;
in {
config = lib.mkIf cfg.apps.fuzzel.enable {
programs.fuzzel = {
enable = true;
settings = {
border = {
radius = 10;
width = 2;
};
main = {
font = "${cfg.theme.monospaceFont.name}:size=${toString cfg.theme.monospaceFont.size}";
icon-theme = "${config.gtk.iconTheme.name}";
layer = "overlay";
lines = 3;
terminal = lib.getExe cfg.defaultApps.terminal;
width = 36;
};
colors = {
background = "${cfg.theme.colors.background}CC";
border = "${cfg.theme.colors.primary}EE";
selection = "${cfg.theme.colors.background}FF";
selection-match = "${cfg.theme.colors.primary}FF";
selection-text = "${cfg.theme.colors.secondary}FF";
text = "${cfg.theme.colors.text}FF";
};
};
};
};
}

View file

@ -68,7 +68,6 @@
}; };
settings = { settings = {
theme = lib.mkDefault "adwaita-dark";
editor = { editor = {
auto-completion = true; auto-completion = true;
auto-format = true; auto-format = true;

View file

@ -10,19 +10,11 @@ in {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = {
name = cfg.theme.monospaceFont.name;
size = cfg.theme.monospaceFont.size + 1;
};
settings = { settings = {
background_opacity = "0.6";
confirm_os_window_close = "0"; confirm_os_window_close = "0";
notify_on_cmd_finish = "unfocused 10.0 command ${lib.getExe pkgs.libnotify} -i ${pkgs.kitty}/share/icons/hicolor/256x256/apps/kitty.png \"Job Finished\""; notify_on_cmd_finish = "unfocused 10.0 command ${lib.getExe pkgs.libnotify} -i ${pkgs.kitty}/share/icons/hicolor/256x256/apps/kitty.png \"Job Finished\"";
tab_bar_style = "powerline"; tab_bar_style = "powerline";
}; };
theme = lib.mkDefault "Adwaita dark";
}; };
}; };
} }

View file

@ -15,7 +15,6 @@ in {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
font = "${cfg.theme.monospaceFont.name} ${toString cfg.theme.monospaceFont.size}";
location = "center"; location = "center";
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
@ -25,7 +24,6 @@ in {
]; ];
terminal = lib.getExe cfg.defaultApps.terminal; terminal = lib.getExe cfg.defaultApps.terminal;
theme = "theme.rasi";
extraConfig = { extraConfig = {
case-sensitive = false; case-sensitive = false;
@ -68,157 +66,6 @@ in {
clear-after 60 clear-after 60
''; '';
"rofi/theme.rasi".text = ''
* {
selected-normal-foreground: ${cfg.theme.colors.secondary};
foreground: ${cfg.theme.colors.text};
normal-foreground: @foreground;
alternate-normal-background: transparent;
red: ${cfg.theme.colors.secondary}CC;
selected-urgent-foreground: ${cfg.theme.colors.secondary}CC;
blue: ${cfg.theme.colors.primary}CC;
urgent-foreground: ${cfg.theme.colors.primary}CC;
alternate-urgent-background: transparent;
active-foreground: ${cfg.theme.colors.primary}CC;
lightbg: rgba ( 238, 232, 213, 80 % );
selected-active-foreground: ${cfg.theme.colors.secondary};
alternate-active-background: transparent;
background: transparent;
bordercolor: ${cfg.theme.colors.background}99;
alternate-normal-foreground: @foreground;
normal-background: transparent;
lightfg: ${cfg.theme.colors.primary}CC;
selected-normal-background: ${cfg.theme.colors.background};
border-color: ${cfg.theme.colors.primary}CC;
spacing: 2;
separatorcolor: ${cfg.theme.colors.primary}CC;
urgent-background: transparent;
selected-urgent-background: ${cfg.theme.colors.primary}CC;
alternate-urgent-foreground: @urgent-foreground;
background-color: transparent;
alternate-active-foreground: @active-foreground;
active-background: transparent;
selected-active-background: ${cfg.theme.colors.background};
}
window {
background-color: ${cfg.theme.colors.background}CC;
border: 4;
border-color: @border-color;
border-radius: ${toString cfg.theme.borderRadius}px;
padding: 0;
}
mainbox {
border: 0;
padding: 0;
}
message {
border: 2px solid 0px 0px ;
border-color: @separatorcolor;
padding: 1px ;
}
textbox {
text-color: @foreground;
}
listview {
fixed-height: 0;
border: 2px solid 0px 0px ;
border-color: @separatorcolor;
spacing: 2px ;
scrollbar: false;
padding: 5px;
}
element {
border: 0;
padding: 5px;
border-radius: 10px;
}
element-text {
background-color: inherit;
text-color: inherit;
}
element.normal.normal {
background-color: @normal-background;
text-color: @normal-foreground;
}
element.normal.urgent {
background-color: @urgent-background;
text-color: @urgent-foreground;
}
element.normal.active {
background-color: @active-background;
text-color: @active-foreground;
}
element.selected.normal {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
element.selected.urgent {
background-color: @selected-urgent-background;
text-color: @selected-urgent-foreground;
}
element.selected.active {
background-color: @selected-active-background;
text-color: @selected-active-foreground;
}
element.alternate.normal {
background-color: @alternate-normal-background;
text-color: @alternate-normal-foreground;
}
element.alternate.urgent {
background-color: @alternate-urgent-background;
text-color: @alternate-urgent-foreground;
}
element.alternate.active {
background-color: @alternate-active-background;
text-color: @alternate-active-foreground;
}
scrollbar {
width: 0px ;
border: 0;
handle-width: 0px ;
padding: 0;
}
mode-switcher {
border: 2px solid 0px 0px ;
border-color: @separatorcolor;
}
button.selected {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
button {
background-color: @background;
text-color: @foreground;
}
inputbar {
spacing: 0;
text-color: @normal-foreground;
padding: 10px ;
}
case-indicator {
spacing: 0;
text-color: @normal-foreground;
}
entry {
spacing: 0;
text-color: @normal-foreground;
}
prompt {
spacing: 0;
text-color: @normal-foreground;
margin: 1px;
}
inputbar {
children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
}
textbox-prompt-colon {
expand: false;
str: ":";
margin: 0px 0.3em 0em 0em ;
text-color: @normal-foreground;
}
'';
"networkmanager-dmenu/config.ini".text = '' "networkmanager-dmenu/config.ini".text = ''
[dmenu] [dmenu]
dmenu_command = ${lib.getExe config.programs.rofi.package} dmenu_command = ${lib.getExe config.programs.rofi.package}

View file

@ -11,40 +11,40 @@ in {
programs.swaylock.enable = true; programs.swaylock.enable = true;
xdg.configFile."swaylock/config".text = '' # xdg.configFile."swaylock/config".text = ''
bs-hl-color=e78284 # bs-hl-color=e78284
caps-lock-bs-hl-color=e78284 # caps-lock-bs-hl-color=e78284
caps-lock-key-hl-color=e78284 # caps-lock-key-hl-color=e78284
color=303446 # color=303446
daemonize # daemonize
font="${cfg.theme.monospaceFont.name}" # font="${cfg.theme.monospaceFont.name}"
image=${cfg.theme.wallpaper} # image=${cfg.theme.wallpaper}
indicator-caps-lock # indicator-caps-lock
indicator-idle-visible # indicator-idle-visible
indicator-radius=120 # indicator-radius=120
indicator-thickness=20 # indicator-thickness=20
inside-caps-lock-color=303446cc # inside-caps-lock-color=303446cc
inside-clear-color=303446cc # inside-clear-color=303446cc
inside-color=303446cc # inside-color=303446cc
inside-ver-color=303446cc # inside-ver-color=303446cc
inside-wrong-color=303446cc # inside-wrong-color=303446cc
key-hl-color=a6d189 # key-hl-color=a6d189
line-caps-lock-color=${cfg.theme.colors.background}CC # line-caps-lock-color=${cfg.theme.colors.background}CC
line-clear-color=${cfg.theme.colors.background}CC # line-clear-color=${cfg.theme.colors.background}CC
line-color=${cfg.theme.colors.background}CC # line-color=${cfg.theme.colors.background}CC
line-ver-color=${cfg.theme.colors.background}CC # line-ver-color=${cfg.theme.colors.background}CC
line-wrong-color=${cfg.theme.colors.background}CC # line-wrong-color=${cfg.theme.colors.background}CC
ring-caps-lock-color=e78284cc # ring-caps-lock-color=e78284cc
ring-clear-color=85c1dccc # ring-clear-color=85c1dccc
ring-color=${cfg.theme.colors.primary}CC # ring-color=${cfg.theme.colors.primary}CC
ring-ver-color=a6d189cc # ring-ver-color=a6d189cc
ring-wrong-color=e78284cc # ring-wrong-color=e78284cc
scaling=fill # scaling=fill
separator-color=${cfg.theme.colors.background}CC # separator-color=${cfg.theme.colors.background}CC
text-caps-lock-color=c6d0f5 # text-caps-lock-color=c6d0f5
text-clear-color=c6d0f5 # text-clear-color=c6d0f5
text-ver-color=c6d0f5 # text-ver-color=c6d0f5
text-wrong-color=c6d0f5 # text-wrong-color=c6d0f5
''; # '';
}; };
} }

View file

@ -34,7 +34,6 @@ in {
userSettings = { userSettings = {
"diffEditor.ignoreTrimWhitespace" = false; "diffEditor.ignoreTrimWhitespace" = false;
"editor.fontFamily" = "'${cfg.theme.monospaceFont.name} ${toString cfg.theme.monospaceFont.size}', 'monospace', monospace";
"editor.fontSize" = cfg.theme.monospaceFont.size + 3; "editor.fontSize" = cfg.theme.monospaceFont.size + 3;
"editor.formatOnPaste" = true; "editor.formatOnPaste" = true;
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
@ -83,13 +82,13 @@ in {
"window.menuBarVisibility" = "hidden"; "window.menuBarVisibility" = "hidden";
"window.titleBarStyle" = lib.mkDefault "native"; "window.titleBarStyle" = lib.mkDefault "native";
"window.zoomPerWindow" = false; "window.zoomPerWindow" = false;
"workbench.colorTheme" = # "workbench.colorTheme" =
if cfg.theme.darkMode # if cfg.theme.darkMode
then "Adwaita Dark" # then "Adwaita Dark"
else "Adwaita Light"; # else "Adwaita Light";
"workbench.iconTheme" = "vs-seti"; # "workbench.iconTheme" = "vs-seti";
"workbench.preferredDarkColorTheme" = "Adwaita Dark"; # "workbench.preferredDarkColorTheme" = "Adwaita Dark";
"workbench.preferredLightColorTheme" = "Adwaita Light"; # "workbench.preferredLightColorTheme" = "Adwaita Light";
}; };
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [

View file

@ -100,7 +100,6 @@ in {
size = 8; size = 8;
}; };
"col.shadow" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.shadow}EE)";
dim_special = 0.5; dim_special = 0.5;
drop_shadow = true; drop_shadow = true;
@ -149,8 +148,6 @@ in {
}; };
general = { general = {
"col.active_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.secondary}CC) rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}CC) 45deg";
"col.inactive_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}99)";
allow_tearing = false; allow_tearing = false;
border_size = 4; border_size = 4;
gaps_in = 5; gaps_in = 5;
@ -164,20 +161,8 @@ in {
}; };
group = { group = {
"col.border_active" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.secondary}CC) rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}CC) 45deg";
"col.border_inactive" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}99)";
"col.border_locked_active" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.secondary}CC) rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}CC) 45deg";
"col.border_locked_inactive" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}99)";
groupbar = { groupbar = {
"col.active" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}CC)";
"col.inactive" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}CC)";
"col.locked_active" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}CC)";
"col.locked_inactive" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}CC)";
font_family = cfg.theme.sansFont.name;
font_size = cfg.theme.sansFont.size;
height = 24; height = 24;
text_color = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.text}FF)";
}; };
}; };
@ -187,7 +172,6 @@ in {
}; };
misc = { misc = {
background_color = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.background}FF)";
disable_hyprland_logo = true; disable_hyprland_logo = true;
disable_splash_rendering = true; disable_splash_rendering = true;
focus_on_activate = true; focus_on_activate = true;

View file

@ -29,34 +29,6 @@ in {
bars = []; bars = [];
modifier = modifier; modifier = modifier;
colors = {
background = "${cfg.theme.colors.primary}CC";
focused = {
background = "${cfg.theme.colors.primary}CC";
border = "${cfg.theme.colors.primary}CC";
childBorder = "${cfg.theme.colors.primary}CC";
indicator = "${cfg.theme.colors.primary}CC";
text = "${cfg.theme.colors.text}";
};
focusedInactive = {
background = "${cfg.theme.colors.inactive}99";
border = "${cfg.theme.colors.inactive}99";
childBorder = "${cfg.theme.colors.inactive}99";
indicator = "${cfg.theme.colors.inactive}99";
text = "${cfg.theme.colors.text}";
};
unfocused = {
background = "${cfg.theme.colors.inactive}99";
border = "${cfg.theme.colors.inactive}99";
childBorder = "${cfg.theme.colors.inactive}99";
indicator = "${cfg.theme.colors.inactive}99";
text = "${cfg.theme.colors.text}";
};
};
defaultWorkspace = "workspace number 1"; defaultWorkspace = "workspace number 1";
floating.criteria = [ floating.criteria = [
@ -79,12 +51,6 @@ in {
newWindow = "focus"; newWindow = "focus";
}; };
fonts = {
names = [cfg.theme.sansFont.name];
style = "Bold";
size = cfg.theme.sansFont.size + 0.0;
};
gaps = { gaps = {
inner = 5; inner = 5;
outer = 6; outer = 6;

View file

@ -10,13 +10,10 @@ in {
services.mako = { services.mako = {
actions = true; actions = true;
anchor = "bottom-right"; anchor = "bottom-right";
backgroundColor = "${cfg.theme.colors.background}99";
borderColor = "${cfg.theme.colors.primary}CC";
borderRadius = cfg.theme.borderRadius; borderRadius = cfg.theme.borderRadius;
borderSize = 4; borderSize = 4;
defaultTimeout = 10000; defaultTimeout = 10000;
enable = true; enable = true;
font = "${cfg.theme.sansFont.name} ${toString cfg.theme.sansFont.size}";
groupBy = "app-name"; groupBy = "app-name";
height = 300; height = 300;
iconPath = "${pkgs.papirus-icon-theme}/share/icons/Papirus/"; iconPath = "${pkgs.papirus-icon-theme}/share/icons/Papirus/";
@ -24,9 +21,7 @@ in {
layer = "top"; layer = "top";
margin = "20,0"; margin = "20,0";
padding = "15"; padding = "15";
progressColor = "source ${cfg.theme.colors.secondary}";
sort = "+time"; sort = "+time";
textColor = "${cfg.theme.colors.text}";
width = 400; width = 400;
extraConfig = '' extraConfig = ''

View file

@ -57,9 +57,7 @@ self: {
}; };
gitui.enable = true; gitui.enable = true;
helix.settings.theme = "rose-pine-moon";
home-manager.enable = true; home-manager.enable = true;
kitty.theme = "Rosé Pine Moon";
rbw = { rbw = {
enable = true; enable = true;
@ -114,21 +112,5 @@ self: {
gammastep.enable = true; gammastep.enable = true;
randomWallpaper.enable = true; randomWallpaper.enable = true;
}; };
theme = {
enable = true;
borderRadius = 0;
colors = {
text = "#e0def4";
background = "#2a273f";
primary = "#3e8fb0";
secondary = "#f6c177";
inactive = "#393552";
shadow = "#232136";
};
wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-6d7xmx.jpg";
};
}; };
} }

View file

@ -92,10 +92,5 @@ self: {
gammastep.enable = true; gammastep.enable = true;
randomWallpaper.enable = false; randomWallpaper.enable = false;
}; };
theme = {
enable = true;
wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-6d66dl.jpg";
};
}; };
} }

View file

@ -9,4 +9,10 @@
]; ];
environment.systemPackages = with pkgs; [git inxi python3]; environment.systemPackages = with pkgs; [git inxi python3];
stylix = {
enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml";
image = ../../_img/hyprland.png;
};
} }