ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: major theme refactor

Browse source 
new profile catagory: theme. refactor modules for wallpaper, fonts, gtk,
and qt. adjusted modules that depend on old theming modules
This commit is contained in:
ooks-io 2024-04-06 22:38:54 +13:00
parent 7d910ba77c
commit f5e87f2a79
34 changed files with 217 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

3
home/modules/desktop/wayland/bar/waybar/default.nix
View file

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
let
fonts = config.homeModules.theme.fonts;
cfg = config.homeModules.desktop.wayland.bar.waybar;
monitorWidth = (lib.head config.monitors).width - 20;
inherit (config.colorscheme) colors;
@ -78,7 +79,7 @@ in
};
style = /* css */ ''
* {
font-family: "${config.fontProfiles.monospace.family}";
font-family: "${fonts.monospace.family}";
font-size: 19px;
border: solid #${colors.base05};
}

5
home/modules/desktop/wayland/launcher/rofi/default.nix
View file

@ -1,6 +1,7 @@
{ lib, config, pkgs, ... }:
let
fonts = config.homeModules.theme.fonts;
cfg = config.homeModules.desktop.wayland.launcher.rofi;
in
@ -8,7 +9,7 @@ in
config = lib.mkIf cfg.enable {
programs.rofi = {
enable = true;
font = "${config.fontProfiles.monospace.family}";
font = "${fonts.monospace.family}";
package = pkgs.rofi-wayland;
terminal = "${config.home.sessionVariables.TERMINAL}";
theme = let
@ -24,7 +25,7 @@ in
background-color = mkLiteral "@background";
border-color = mkLiteral "@foreground";
text-color = mkLiteral "@foreground";
font = mkLiteral "'${config.fontProfiles.monospace.family} 14'";
font = mkLiteral "'${fonts.monospace.family} 14'";
};
"window" = {

3
home/modules/desktop/wayland/launcher/tofi/default.nix
View file

@ -2,6 +2,7 @@
let
cfg = config.homeModules.desktop.wayland.launcher.tofi;
fonts = config.homeModules.theme.fonts;
inherit (config.colorscheme) colors;
in
@ -24,7 +25,7 @@ in
result-spacing = 10
selection-background-padding = 30
prompt-padding = 10
font = "${config.fontProfiles.monospace.family}"
font = "${fonts.monospace.family}"
font-size = 14
prompt-text = " "
background-color = #0000

5
home/modules/desktop/wayland/lockscreen/hyprlock/default.nix
View file

@ -2,6 +2,7 @@
let
cfg = config.homeModules.desktop.wayland.lockscreen.hyprlock;
fonts = config.homeModules.theme.fonts;
inherit (config.colorscheme) colors;
in
@ -55,7 +56,7 @@ in
};
color = "0xff${colors.base08}";
font_size = 30;
font_family = "${config.fontProfiles.monospace.family}";
font_family = "${fonts.monospace.family}";
}
{
monitor = "";
@ -66,7 +67,7 @@ in
};
color = "0xff${colors.base0B}";
font_size = 20;
font_family = "${config.fontProfiles.monospace.family}";
font_family = "${fonts.monospace.family}";
}
];
};

6
home/modules/desktop/wayland/lockscreen/swaylock/default.nix
View file

@ -2,6 +2,8 @@
let
inherit (config.colorscheme) colors;
fonts = config.homeModules.theme.fonts;
wallpaperPath = config.homeModules.theme.wallpaper.path;
cfg = config.homeModules.desktop.wayland.lockscreen.swaylock;
in
{
@ -10,8 +12,8 @@ in
programs.swaylock = {
enable = true;
settings = {
image = "${config.wallpaper}";
font = config.fontProfiles.monospace.family;
image = "${wallpaperPath}";
font = fonts.monospace.family;
color = "#${colors.base01}";
ring-color = "#${colors.base02}";
inside-wrong-color = "#${colors.base08}";

3
home/modules/desktop/wayland/notification/mako/default.nix
View file

@ -1,6 +1,7 @@
{ config, lib, ... }:
let
inherit (config.colorscheme) colors kind;
fonts = config.homeModules.theme.fonts;
cfg = config.homeModules.desktop.wayland.notification.mako;
in {
config = lib.mkIf cfg.enable {
@ -11,7 +12,7 @@ in {
"${config.gtk.iconTheme.package}/share/icons/Papirus-Dark"
else
"${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
font = "${config.fontProfiles.regular.family} 12";
font = "${fonts.regular.family} 12";
padding = "10,10";
anchor = "top-right";
width = 300;

1
home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix
View file

@ -9,5 +9,6 @@
./misc.nix
./monitor.nix
./gestures.nix
./hyprpaper.nix
];
}

3
home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix
View file

@ -9,13 +9,10 @@ in
wayland.windowManager.hyprland.settings = {
exec = [
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
"${pkgs.swaybg}/bin/swaybg -i ${config.wallpaper} --mode fill"
];
exec-once = [
"${pkgs._1password-gui}/bin/1password --silent"
"${pkgs.live-buds-cli}/bin/earbuds -d"
"eww daemon && eww open bar"
"systemctl --user start clight"
"waybar"
];
};

19
home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix Normal file
View file

@ -0,0 +1,19 @@
{ lib, config, inputs, ... }:
let
cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
wallpaperPath = config.homeModules.theme.wallpaper.path;
in
{
imports = [ inputs.hyprpaper.homeManagerModules.hyprpaper ];
config = lib.mkIf cfg.enable {
services.hyprpaper = {
enable = true;
preloads = ["${wallpaperPath}"];
wallpapers = [", ${wallpaperPath}"];
ipc = false;
};
};
}