From a1495dd99943e775a2fd8cd7bedd40233829b443 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Fri, 29 Nov 2024 07:21:16 +0400 Subject: [PATCH] fix cursor --- config/hyprland/hyprland.conf | 10 ++- flake.lock | 107 +++++++++++++++++++++++++++ flake.nix | 1 + modules/desktop/hyprland/default.nix | 8 +- 4 files changed, 119 insertions(+), 7 deletions(-) diff --git a/config/hyprland/hyprland.conf b/config/hyprland/hyprland.conf index 8c1c0405..eebaf941 100644 --- a/config/hyprland/hyprland.conf +++ b/config/hyprland/hyprland.conf @@ -41,11 +41,13 @@ exec-once = sleep 2; nextcloud --background # source = ~/.config/hypr/myColors.conf # Some default env vars. -env = XCURSOR_SIZE,20 -env = XCURSOR_THEME,Catppuccin Mocha Dark -env = HYPRCURSOR_SIZE,20 +env = XCURSOR_SIZE,24 +#env = XCURSOR_THEME,Catppuccin Mocha Dark +env = XCURSOR_THEME,BreezeX-RosePine-Linux +env = HYPRCURSOR_SIZE,24 # Hyer cursor -env = HYPRCURSOR_THEME,catppuccin-mocha-dark-cursors +#env = HYPRCURSOR_THEME,catppuccin-mocha-dark-cursors +env = HYPRCURSOR_THEME,rose-pine-hyprcursor # Nvidia Environment Vars env = LIBVA_DRIVER_NAME,nvidia diff --git a/flake.lock b/flake.lock index ea199072..c00c0098 100644 --- a/flake.lock +++ b/flake.lock @@ -415,6 +415,28 @@ "type": "github" } }, + "hyprlang_3": { + "inputs": { + "nixpkgs": [ + "rose-pine-hyprcursor", + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprpaper": { "inputs": { "hyprlang": "hyprlang_2", @@ -665,6 +687,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -700,9 +738,30 @@ "hyprpaper": "hyprpaper", "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_3", + "rose-pine-hyprcursor": "rose-pine-hyprcursor", "sops-nix": "sops-nix" } }, + "rose-pine-hyprcursor": { + "inputs": { + "hyprlang": "hyprlang_3", + "nixpkgs": "nixpkgs_5", + "utils": "utils" + }, + "locked": { + "lastModified": 1718180692, + "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "type": "github" + }, + "original": { + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -784,6 +843,54 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 0f8c01d3..fcfa1fa0 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprpaper.url = "github:hyprwm/hyprpaper"; + rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; }; outputs = { self, nixpkgs, home-manager, NixOS-WSL, agenix, emacs-overlay diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index 2029dd01..51b8b213 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -74,6 +74,8 @@ in { # brightness # TODO(sako):: find one for wayland catppuccin-cursors.mochaDark + inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default + rose-pine-cursor # screenshot sway-contrib.grimshot # todo figure this out @@ -129,10 +131,10 @@ in { home-manager.users.sako = { pkgs, ... }: { home.pointerCursor = { # name = "Catppuccin-Mocha-Dark"; - name = "catppuccin-mocha-dark-cursors"; - size = 16; + name = "BreezeX-RosePine-Linux"; + size = 24; gtk.enable = true; - package = pkgs.catppuccin-cursors.mochaDark; + package = pkgs.rose-pine-cursor; }; gtk = { enable = true;