update pacckages and uhm other stuff

This commit is contained in:
Reid 2024-12-12 21:17:18 -08:00
parent 74ef77bb1f
commit 3a08d19841
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
11 changed files with 189 additions and 71 deletions

View file

@ -67,6 +67,7 @@ in {
fonts = {
fontDir.enable = true;
fontconfig.enable = true;
fontconfig.useEmbeddedBitmaps = true;
fontconfig.defaultFonts = {
sansSerif = [ cfg.fonts.sansSerif.family ];
serif = [ cfg.fonts.serif.family ];

View file

@ -190,7 +190,13 @@ in {
follow_mouse = 1;
sensitivity = 0; # -1.0 - 1.0, 0 means no modification
# uhm?? why do i have to do this here. should be automatic from libinput
# whatever. ill just hardcode for now
# TODO
touchpad = {
disable_while_typing = false;
natural_scroll = true;
};
};
monitor=",highrr,auto,auto";
@ -203,7 +209,7 @@ in {
env = [
"XCURSOR_THEME,${config.modules.desktop.themes.cursorTheme.name}"
"XCURSOR_SIZE,24"
"XCURSOR_SIZE,${toString config.modules.desktop.themes.cursorTheme.size}"
];
general = {
@ -269,7 +275,7 @@ in {
# workspace moving
"workspace 1 silent, class:^firefox"
"workspace 2 silent, class:code-url-handler"
"workspace 2 silent, class:code"
"workspace 4 silent, class:vesktop"
];
@ -278,7 +284,7 @@ in {
"animation slide, waybar"
"animation popin, rofi"
"dimaround, rofi"
"blur, gtk-layer-shell"
"blur, nwg-drawer"
"blur, wob"
"blur, notifications"
"blur, waybar"
@ -300,10 +306,12 @@ in {
special = true;
};
drop_shadow = true;
shadow_range = 6;
shadow_render_power = 3;
shadow_ignore_window = true;
shadow = {
enabled = true;
range = 6;
render_power = 3;
ignore_window = true;
};
};
animations = {

View file

@ -41,6 +41,7 @@ in {
};
config = mkIf cfg.enable {
hm.home.packages = [ cfg.package ];
modules.desktop.execOnStart = [ "${cfg.startScript}" ];
};
}

View file

@ -25,10 +25,10 @@ in {
};
kvantumTheme = {
name = "Catppuccin-${pascalCase variant}-${pascalCase accent}";
name = "catppuccin-${variant}-${accent}";
package = pkgs.catppuccin-kvantum.override {
variant = pascalCase variant;
accent = pascalCase accent;
variant = variant;
accent = accent;
};
};
@ -40,6 +40,7 @@ in {
cursorTheme = {
name = "graphite-dark";
package = pkgs.graphite-cursors;
size = 24;
};
sddmTheme = {
@ -88,9 +89,9 @@ in {
col.active_border=''$${accent}
col.inactive_border=$surface0
}
decoration {
col.shadow=$crust
col.shadow_inactive=$crust
decoration:shadow {
color=$crust
color_inactive=$crust
}
misc {
background_color=$crust

View file

@ -29,6 +29,7 @@ in {
cursorTheme = {
name = mkOpt str "";
package = mkPackageOption pkgs "cursor" {};
size = mkOpt int 24;
};
sddmTheme = {
name = mkOpt str "";
@ -81,13 +82,18 @@ in {
settings."org/gnome/desktop/interface".gtk-theme = cfg.gtkTheme.name;
settings."org/gnome/desktop/interface".icon-theme = cfg.iconTheme.name;
settings."org/gnome/desktop/interface".cursor-theme = cfg.cursorTheme.name;
settings."org/gnome/desktop/interface".cursor-size = cfg.cursorTheme.size;
settings."org/gnome/shell/extensions/user-theme".name = cfg.gtkTheme.name;
};
hm.gtk = {
enable = true;
cursorTheme = cfg.cursorTheme;
cursorTheme = {
name = cfg.cursorTheme.name;
package = cfg.cursorTheme.package;
size = cfg.cursorTheme.size;
};
iconTheme = cfg.iconTheme;
theme = cfg.gtkTheme;
gtk3.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
@ -105,6 +111,7 @@ in {
x11.enable = true;
name = cfg.cursorTheme.name;
package = cfg.cursorTheme.package;
size = cfg.cursorTheme.size;
};
hm.services.dunst.iconTheme = {