modules/themes: switch to phinger-cursors, update border colors
This commit is contained in:
parent
aa7a00d330
commit
c1caf6d844
1 changed files with 21 additions and 5 deletions
|
@ -7,12 +7,15 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib) mkEnableOption mkOption mkIf attrNames;
|
inherit (lib) mkEnableOption mkOption mkIf attrNames;
|
||||||
|
inherit (lib.strings) removePrefix;
|
||||||
inherit (lib.types) path package enum;
|
inherit (lib.types) path package enum;
|
||||||
inherit (lib') generateGtkColors;
|
inherit (lib') generateGtkColors rgba;
|
||||||
cfg = config.theme;
|
cfg = config.theme;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./gtk.nix
|
./gtk.nix
|
||||||
|
inputs.niri.nixosModules.niri
|
||||||
|
inputs.hyprland.nixosModules.default
|
||||||
];
|
];
|
||||||
options.theme = {
|
options.theme = {
|
||||||
enable = mkEnableOption "theme";
|
enable = mkEnableOption "theme";
|
||||||
|
@ -42,14 +45,14 @@ in {
|
||||||
description = ''
|
description = ''
|
||||||
Name of the cursor theme.
|
Name of the cursor theme.
|
||||||
'';
|
'';
|
||||||
default = "Bibata-Modern-Ice";
|
default = "phinger-cursors-dark";
|
||||||
};
|
};
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = package;
|
type = package;
|
||||||
description = ''
|
description = ''
|
||||||
Package providing the cursor theme.
|
Package providing the cursor theme.
|
||||||
'';
|
'';
|
||||||
default = pkgs.bibata-cursors;
|
default = pkgs.phinger-cursors;
|
||||||
};
|
};
|
||||||
size = mkOption {
|
size = mkOption {
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -74,6 +77,20 @@ in {
|
||||||
services.swaync.style =
|
services.swaync.style =
|
||||||
generateGtkColors lib scheme.palette;
|
generateGtkColors lib scheme.palette;
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland.settings = {
|
||||||
|
env = [
|
||||||
|
"HYPRCURSOR_THEME,phinger-cursors-light"
|
||||||
|
"HYPRCURSOR_SIZE,32"
|
||||||
|
];
|
||||||
|
general = {
|
||||||
|
border_size = 4;
|
||||||
|
"col.active_border" = "rgb(${removePrefix "#" scheme.palette.base0E})";
|
||||||
|
};
|
||||||
|
decoration = {
|
||||||
|
rounding = 10;
|
||||||
|
blur.enabled = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
programs = {
|
programs = {
|
||||||
niri = {
|
niri = {
|
||||||
settings = {
|
settings = {
|
||||||
|
@ -86,7 +103,6 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
foot.settings.colors = let
|
foot.settings.colors = let
|
||||||
inherit (lib.strings) removePrefix;
|
|
||||||
# because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
|
# because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
|
||||||
palette = builtins.mapAttrs (_: color: removePrefix "#" color) scheme.palette;
|
palette = builtins.mapAttrs (_: color: removePrefix "#" color) scheme.palette;
|
||||||
in {
|
in {
|
||||||
|
@ -133,7 +149,7 @@ in {
|
||||||
selection = "${scheme.palette.base03}ff";
|
selection = "${scheme.palette.base03}ff";
|
||||||
selection-text = "${scheme.palette.base06}ff";
|
selection-text = "${scheme.palette.base06}ff";
|
||||||
selection-match = "${scheme.palette.base0D}ff";
|
selection-match = "${scheme.palette.base0D}ff";
|
||||||
border = "${scheme.palette.base0D}ff";
|
border = "${scheme.palette.base0E}ff";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue