reidlab/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: reidlab:85a498a82c0099c0aaa71e50deabe4c3080524f9
Branches Tags
reidlab:main
..
compare: reidlab:493f8e703add87806ddf91c916edec685690bba9
Branches Tags
reidlab:main

No commits in common. "85a498a82c0099c0aaa71e50deabe4c3080524f9" and "493f8e703add87806ddf91c916edec685690bba9" have entirely different histories.
85a498a82c ... 493f8e703a

4 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/desktop/hyprland.nix
View file

@ -63,15 +63,11 @@ in {
", XF86AudioLowerVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%- && wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/[^0-9]//g' > ${wobSock}" ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%- && wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/[^0-9]//g' > ${wobSock}"
", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5% | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}" ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5% | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}"
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%- | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}" ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%- | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}"
", XF86KbdBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s +5% | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}"
", XF86KbdBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s 5%- | sed -n 's/.*(\\([0-9]*\\)%).*/\\1/p' > ${wobSock}"
] else [ ] else [
", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5%" ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5%"
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-" ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-"
", XF86KbdBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s +5%"
", XF86KbdBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -d '*:kbd_backlight' s 5%-"
]); ]);
bindl = ([ # "bind locked" bindl = ([ # "bind locked"
",switch:Lid Switch,exec,${lib.getExe config.modules.desktop.hyprlock.package}" ",switch:Lid Switch,exec,${lib.getExe config.modules.desktop.hyprlock.package}"

1
modules/desktop/hyprlock.nix
View file

@ -30,7 +30,6 @@ in {
background = [ background = [
{ {
path = toString ../../assets/lockscreen.png; path = toString ../../assets/lockscreen.png;
color = "rgb(${base00})";
blur_passes = 3; blur_passes = 3;
blur_size = 6; blur_size = 6;
} }

8
modules/desktop/themes/catppuccin/default.nix
View file

@ -24,14 +24,6 @@ in {
}; };
}; };
kvantumTheme = {
name = "Catppuccin-${pascalCase variant}-${pascalCase accent}";
package = pkgs.catppuccin-kvantum.override {
variant = pascalCase variant;
accent = pascalCase accent;
};
};
iconTheme = { iconTheme = {
name = "WhiteSur-dark"; name = "WhiteSur-dark";
package = pkgs.whitesur-icon-theme; package = pkgs.whitesur-icon-theme;

20
modules/desktop/themes/default.nix
View file

@ -18,10 +18,6 @@ in {
name = mkOpt str ""; name = mkOpt str "";
package = mkPackageOption pkgs "gtk" {}; package = mkPackageOption pkgs "gtk" {};
}; };
kvantumTheme = {
name = mkOpt str "";
package = mkPackageOption pkgs "kvantum" {};
};
iconTheme = { iconTheme = {
name = mkOpt str ""; name = mkOpt str "";
package = mkPackageOption pkgs "icon" {}; package = mkPackageOption pkgs "icon" {};
@ -88,10 +84,10 @@ in {
gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1"; gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
}; };
hm.qt = { qt = {
enable = true; enable = true;
platformTheme.name = "kvantum"; platformTheme = "gnome";
style.name = "kvantum"; style = "adwaita";
}; };
hm.home.pointerCursor = { hm.home.pointerCursor = {
@ -131,15 +127,5 @@ in {
}; };
hm.programs.rofi.theme = cfg.rofi; hm.programs.rofi.theme = cfg.rofi;
hm.xdg.configFile ={
"Kvantum/${cfg.kvantumTheme.name}".source = "${cfg.kvantumTheme.package}/share/Kvantum/${cfg.kvantumTheme.name}";
"Kvantum/kvantum.kvconfig" = {
text = ''
[General]
theme=${cfg.kvantumTheme.name}
'';
};
};
}; };
} }