diff --git a/hm/desktop/cursor/default.nix b/hm/desktop/cursor/default.nix new file mode 100644 index 0000000..445028a --- /dev/null +++ b/hm/desktop/cursor/default.nix @@ -0,0 +1,42 @@ +{ + pkgs, + ... +}: +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"; + + src = pkgs.fetchFromGitHub { + owner = "anexation"; + repo = pname; + rev = "e3503252cbac2772e800929d12341c6a3284cd15"; + hash = "sha256-CR/nfydRjMADdJ4iBP00O24XENC2jbsbwNk0w63G3h4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + mv Menda-Cursor $out/share/icons/menda-cursor + runHook postInstall + ''; + }; + # Phinger is also not a bad cursor theme, more geometric, has dark/light theme, + # but overall same amount of cursor and not very green innit. + + # That being said, it doesn't seem that cursor change immediately on apply, + # so my idea of dark cursor on light theme and vice-versa might not fly anyways. +in +{ + config = { + home.pointerCursor = { + name = "menda-cursor"; + package = menda; + size = 32; + gtk.enable = true; + }; + }; +} diff --git a/hm/desktop/default.nix b/hm/desktop/default.nix index e0d9b28..09d1c0f 100644 --- a/hm/desktop/default.nix +++ b/hm/desktop/default.nix @@ -10,6 +10,7 @@ ./autorandr ./background ./browser + ./cursor ./frobar/module.nix ./i3.nix ./lock @@ -20,6 +21,7 @@ ./terminal ]; config = lib.mkIf config.frogeye.desktop.xorg { + xsession = { enable = true; # Not using config.xdg.configHome because it needs to be $HOME-relative paths and path manipulation is hard @@ -112,31 +114,30 @@ unclutter.enable = true; dunst = { enable = true; - settings = - with config.lib.stylix.colors.withHashtag; { - global = { - separator_color = lib.mkForce base05; - idle_threshold = 120; - markup = "full"; - max_icon_size = 48; - }; - - urgency_low = { - background = lib.mkForce base01; - foreground = lib.mkForce base03; - frame_color = lib.mkForce base05; - }; - urgency_normal = { - background = lib.mkForce base02; - foreground = lib.mkForce base05; - frame_color = lib.mkForce base05; - }; - urgency_critical = { - background = lib.mkForce base08; - foreground = lib.mkForce base06; - frame_color = lib.mkForce base05; - }; + settings = with config.lib.stylix.colors.withHashtag; { + global = { + separator_color = lib.mkForce base05; + idle_threshold = 120; + markup = "full"; + max_icon_size = 48; }; + + urgency_low = { + background = lib.mkForce base01; + foreground = lib.mkForce base03; + frame_color = lib.mkForce base05; + }; + urgency_normal = { + background = lib.mkForce base02; + foreground = lib.mkForce base05; + frame_color = lib.mkForce base05; + }; + urgency_critical = { + background = lib.mkForce base08; + foreground = lib.mkForce base06; + frame_color = lib.mkForce base05; + }; + }; }; keynav.enable = true; };