From c1caf6d844d37f64639b81e081d2c60d53928021 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Fri, 13 Dec 2024 16:51:24 +0100 Subject: [PATCH] modules/themes: switch to phinger-cursors, update border colors --- modules/theme/default.nix | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/modules/theme/default.nix b/modules/theme/default.nix index d9eb56b..fc8b9c6 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -7,12 +7,15 @@ ... }: let inherit (lib) mkEnableOption mkOption mkIf attrNames; + inherit (lib.strings) removePrefix; inherit (lib.types) path package enum; - inherit (lib') generateGtkColors; + inherit (lib') generateGtkColors rgba; cfg = config.theme; in { imports = [ ./gtk.nix + inputs.niri.nixosModules.niri + inputs.hyprland.nixosModules.default ]; options.theme = { enable = mkEnableOption "theme"; @@ -42,14 +45,14 @@ in { description = '' Name of the cursor theme. ''; - default = "Bibata-Modern-Ice"; + default = "phinger-cursors-dark"; }; package = mkOption { type = package; description = '' Package providing the cursor theme. ''; - default = pkgs.bibata-cursors; + default = pkgs.phinger-cursors; }; size = mkOption { description = '' @@ -74,6 +77,20 @@ in { services.swaync.style = 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 = { niri = { settings = { @@ -86,7 +103,6 @@ in { }; foot.settings.colors = let - inherit (lib.strings) removePrefix; # because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b palette = builtins.mapAttrs (_: color: removePrefix "#" color) scheme.palette; in { @@ -133,7 +149,7 @@ in { selection = "${scheme.palette.base03}ff"; selection-text = "${scheme.palette.base06}ff"; selection-match = "${scheme.palette.base0D}ff"; - border = "${scheme.palette.base0D}ff"; + border = "${scheme.palette.base0E}ff"; }; };