diff --git a/hm/desktop/cursor/default.nix b/hm/desktop/cursor/default.nix index 3517c9d..d60764e 100644 --- a/hm/desktop/cursor/default.nix +++ b/hm/desktop/cursor/default.nix @@ -1,66 +1,42 @@ { pkgs, + lib, + config, ... }: let - # Manjaro cursor theme. - # Also known as Maia but exact same one without git history and wrong credits. - # Not a big fan of Manjaro but that cursor theme slaps. - menda = pkgs.stdenvNoCC.mkDerivation rec { - pname = "menda-cursor"; - version = "2014-11-25"; + fringer-cursors = pkgs.stdenvNoCC.mkDerivation rec { + pname = "fringer-cursors"; + version = "1.0"; - src = pkgs.fetchFromGitHub { - owner = "anexation"; - repo = pname; - rev = "e3503252cbac2772e800929d12341c6a3284cd15"; - hash = "sha256-CR/nfydRjMADdJ4iBP00O24XENC2jbsbwNk0w63G3h4="; + src = pkgs.fetchurl { + url = "https://github.com/GeoffreyFrogeye/fringer-cursors/releases/download/v${version}/fringer-cursors-variants.tar.bz2"; + sha256 = "sha256-P4PhGTHto+DMn1VZ5ZvMWHYXWjHfw90GKBNDn908WgU="; }; + sourceRoot = "."; + installPhase = '' runHook preInstall mkdir -p $out/share/icons - mv Menda-Cursor $out/share/icons/menda-cursor - - # Add aliases for cursor missing from phinger - cd $out/share/icons/menda-cursor/cursors - ln -s default arrow - ln -s size_bdiag bd_double_arrow - ln -s crosshair cross_reverse - ln -s crosshair diamond_cross - ln -s help dnd-help - ln -s down-arrow down - ln -s size_hor ew-resize - ln -s size_fdiag fd_double_arrow - ln -s dnd-move grab - ln -s dnd-move grabbing - ln -s left-arrow left - ln -s size_bdiag ne-resize - ln -s size_bdiag nesw-resize - ln -s size_ver ns-resize - ln -s size_fdiag nw-resize - ln -s pencil pen - ln -s color-picker men - ln -s right-arrow right - ln -s size_fdiag se-resize - ln -s size_bdiag sw-resize - ln -s crosshair target - ln -s crosshair tcross - ln -s default top_left_arrow - ln -s up-arrow up - # Missing: kill, middle_finger, rock_and_roll, skull, wayland-cursor, x-cursor (not missing much) - + cp -r ./fringer-cursors* $out/share/icons runHook postInstall ''; + + meta = with lib; { + description = "Modernized Menda cursor theme"; + homepage = "https://github.com/GeoffreyFrogeye/fringer-cursors"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ geoffreyfrogeye ]; + }; }; - # Phinger is also not a bad cursor theme, more geometric, has dark/light theme, more cursors (resize ones). - # Could be nice to redo Menda with it as a base to get its benefits. in { config = { stylix.cursor = { - name = "menda-cursor"; - package = menda; + name = "fringer-cursors-${if config.stylix.polarity == "dark" then "light" else "dark"}"; + package = fringer-cursors; size = 32; }; };