diff --git a/home/pc/common/home.nix b/home/pc/common/home.nix index e4bf599..7d9b746 100644 --- a/home/pc/common/home.nix +++ b/home/pc/common/home.nix @@ -1,4 +1,11 @@ { inputs, lib, pkgs, ... }: +let + cursorTheme = { + name = "Bibata-Modern-Ice"; + package = pkgs.bibata-cursors; + size = 3; + }; +in { imports = [ inputs.zen-browser.homeModules.default @@ -37,20 +44,16 @@ }; home.pointerCursor = { - name = "catppuccin-mocha-pink-cursors"; - package = pkgs.catppuccin-cursors.mochaPink; - size = 6; + name = cursorTheme.name; + package = cursorTheme.package; + size = cursorTheme.size; x11.enable = true; gtk.enable = true; }; gtk = { enable = true; - cursorTheme = { - name = "catppuccin-mocha-pink-cursors"; - package = pkgs.catppuccin-cursors.mochaPink; - size = 6; - }; + inherit cursorTheme; }; programs.home-manager.enable = true; diff --git a/home/pc/common/river/default.nix b/home/pc/common/river/default.nix index 3e904d1..6baf51a 100644 --- a/home/pc/common/river/default.nix +++ b/home/pc/common/river/default.nix @@ -1,11 +1,13 @@ -{ hostName, pkgs, wallpaper, ... }: +{ config, hostName, pkgs, wallpaper, ... }: { home.packages = [ pkgs.river-bsp-layout ]; xdg.configFile."river/init" = { source = pkgs.replaceVars ./init.sh { - inherit wallpaper; - inherit hostName; + inherit wallpaper; + inherit hostName; + cursorName = config.home.pointerCursor.name; + cursorSize = config.home.pointerCursor.size; }; executable = true; }; diff --git a/home/pc/common/river/init.sh b/home/pc/common/river/init.sh index c0cce72..70a3ffc 100644 --- a/home/pc/common/river/init.sh +++ b/home/pc/common/river/init.sh @@ -3,7 +3,10 @@ # https://codeberg.org/river/river-classic/src/branch/main/example/init riverctl map normal Super Q spawn havoc + riverctl map normal Super D spawn "rofi -show run" +riverctl map normal Super+Shift P spawn "rofi -show pm -modi pm:rofi-power-menu" +riverctl map normal Super+Shift S spawn "gscreenshot -c -s" riverctl map normal Super C close riverctl map normal Super+Shift M exit @@ -64,6 +67,8 @@ riverctl border-color-focused 0xf5c2e7 riverctl border-color-unfocused 0x313244 riverctl border-width 2 +riverctl xcursor-theme @cursorName@ @cursorSize@ + riverctl set-repeat 30 300 riverctl default-layout bsp-layout