From 59e132964480cd022a235b0704105bd63a2a6d85 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 8 Nov 2024 10:20:22 +0100 Subject: [PATCH] New Hyprland keybinding, disable wayvnc and fix cursor --- hmModules/hyprland/default.nix | 37 +++++++++++--------------------- hmModules/hyprland/hyprland.conf | 5 +++-- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index 92ffe67..e10dbf0 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: +{ config, pkgs, ... }: let screenshotScript = pkgs.writeShellScriptBin "screenshot.sh" '' filename="$HOME/shots/$(date --iso-8601=seconds).png" @@ -20,15 +16,14 @@ let fi fi ''; -in -{ +in { imports = [ ./hyprpaper.nix ../waybar ../swayidle ../gammastep # ../wezterm - ../wayvnc + # ../wayvnc ../swaync ../foot ]; @@ -43,9 +38,7 @@ in brightnessctl ]; - systemd.user.sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; + systemd.user.sessionVariables = { NIXOS_OZONE_WL = "1"; }; services.network-manager-applet.enable = true; services.blueman-applet.enable = true; @@ -61,16 +54,14 @@ in name = "Adwaita"; package = pkgs.adwaita-icon-theme; }; - # cursorTheme = { - # name = "catppuccin-mocha-sapphire"; - # package = pkgs.catppuccin-cursors; - # size = 48; - # }; + cursorTheme = { + name = "catppuccin-mocha-sapphire"; + package = pkgs.catppuccin-cursors; + size = 40; + }; }; - qt = { - enable = true; - }; + qt = { enable = true; }; # services.kanshi = { # enable = true; @@ -100,16 +91,14 @@ in # }; home.file.".icons/catppuccin-mocha-sapphire" = { - source = "${pkgs.catppuccin-cursors.mochaSapphire}/share/icons/catppuccin-mocha-sapphire-cursors"; + source = + "${pkgs.catppuccin-cursors.mochaSapphire}/share/icons/catppuccin-mocha-sapphire-cursors"; recursive = true; }; wayland.windowManager.hyprland = { enable = true; - plugins = with pkgs.hyprlandPlugins; [ - hy3 - hyprspace - ]; + plugins = with pkgs.hyprlandPlugins; [ hy3 hyprspace ]; # TODO migrate to structured options extraConfig = builtins.readFile ./hyprland.conf; }; diff --git a/hmModules/hyprland/hyprland.conf b/hmModules/hyprland/hyprland.conf index 79ef97a..1243b85 100644 --- a/hmModules/hyprland/hyprland.conf +++ b/hmModules/hyprland/hyprland.conf @@ -5,9 +5,9 @@ cursor { } env = HYPRCURSOR_THEME,catppuccin-mocha-sapphire -env = HYPRCURSOR_SIZE,48 +env = HYPRCURSOR_SIZE,40 env = XCURSOR_THEME,catppuccin-mocha-sapphire -env = XCURSOR_SIZE,48 +env = XCURSOR_SIZE,40 $mod = SUPER @@ -35,6 +35,7 @@ bind = $mod, t, exec, footclient $SHELL bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)" bind = $mod, m, exec, emacsclient -c --eval '(notmuch-search "tag:new")' bind = $mod, g, exec, emacsclient -c --eval '(switch-to-buffer (gptel "*ChatGPT*"))' +bind = $mod, c, exec, emacsclient -c --eval '(org-roam-dailies-capture-today)' bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0 bind = $mod, s, exec, screenshot.sh bind = $mod, n, exec, logseq