diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index 1958349..2596638 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: let @@ -53,34 +52,29 @@ in services.udiskie.enable = true; - home.pointerCursor = { - gtk.enable = true; - x11.enable = true; - package = pkgs.catppuccin-cursors; - name = "catppuccin-mocha-sapphire"; - size = 38; - }; - gtk = { enable = true; - theme = { - name = "Catppuccin-GTK-Purple-Dark-Compact"; - package = pkgs.magnetic-catppuccin-gtk.override { - accent = [ "purple" ]; - shade = "dark"; - size = "compact"; - }; - }; + # font.name = lib.mkForce "Sans,Symbols Nerd Font"; iconTheme = { name = "Adwaita"; package = pkgs.adwaita-icon-theme; }; + cursorTheme = { + name = "catppuccin-mocha-sapphire"; + package = pkgs.catppuccin-cursors; + size = 38; + }; }; qt = { enable = true; }; + home.file.".icons/catppuccin-mocha-sapphire" = { + source = "${pkgs.catppuccin-cursors.mochaSapphire}/share/icons/catppuccin-mocha-sapphire-cursors"; + recursive = true; + }; + wayland.windowManager.hyprland = { enable = true; plugins = with pkgs.hyprlandPlugins; [ diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index 43f7a4f..7fbe4bf 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -304,15 +304,8 @@ window-rule { match title=r#"^Emacs Selector$"# opacity 0.95 open-floating true - open-focused true } -window-rule { - match title=r#"^bTop$"# - opacity 0.95 - open-floating true - open-focused true -} @@ -343,9 +336,9 @@ binds { Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; } Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))"; } Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; } - Mod+Alt+L { spawn "swaylock"; } + Super+Alt+L { spawn "swaylock"; } Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; } - Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "210x60" "btop";} + // Example volume keys mappings for PipeWire & WirePlumber. // The allow-when-locked=true property makes them work even when the session is locked.