diff --git a/dots/.config/gtk/settings.ini.nix b/dots/.config/gtk/settings.ini.nix new file mode 100644 index 0000000..bac319e --- /dev/null +++ b/dots/.config/gtk/settings.ini.nix @@ -0,0 +1,35 @@ +{ + lib, + config, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.horseman.dots.gtk; + username = config.horseman.username; + + catppuccin = config.horseman.catppuccin; +in { + options = { + horseman.dots.gtk = { + enable = mkEnableOption "~/.config/gtk-4.0/settings.ini"; + }; + }; + + config = let + settings = '' + [Settings] + gtk-theme-name=Adwaita + gtk-icon-theme-name=Adwaita + gtk-font-name=Adwaita Sans 11 + gtk-cursor-theme-name=catppuccin-${catppuccin}-dark-cursors + gtk-cursor-theme-size=24 + gtk-application-prefer-dark-theme=0 + ''; + in + mkIf cfg.enable { + home-manager.users.${username}.home.file = { + ".config/gtk-4.0/settings.ini".text = settings; + ".config/gtk-3.0/settings.ini".text = settings; + }; + }; +} diff --git a/dots/default.nix b/dots/default.nix index 059ab0d..b909d4b 100644 --- a/dots/default.nix +++ b/dots/default.nix @@ -6,5 +6,6 @@ ./.config/kitty/kitty.conf.nix ./.config/wofi/style.css.nix ./.config/waybar/style.css.nix + ./.config/gtk/settings.ini.nix ]; } diff --git a/modules/hardware/wifi.nix b/modules/hardware/wifi.nix index 9acb5b3..d66cf91 100644 --- a/modules/hardware/wifi.nix +++ b/modules/hardware/wifi.nix @@ -46,6 +46,10 @@ in { pskRaw = "ext:psk_sticky"; }; + "Woestgaafsecure" = { + pskRaw = "ext:psk_sticky"; + }; + "Utrecht University" = { authProtocols = ["WPA-EAP"]; auth = '' diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index 4661ed2..00148b2 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -8,6 +8,9 @@ cfg = config.horseman.wm.hyprland; colors = config.horseman.catppuccin.colors; + flavor = config.horseman.catppuccin.flavor; + + cursorSize = 24; in { imports = [ ./options.nix @@ -40,9 +43,11 @@ in { wl-clipboard # Clipboard fuzzel # Launcher xdg-desktop-portal-hyprland # XDG Portal (needed but idk why) + catppuccin-cursors."${flavor}Dark" # Cursors ]; horseman.hardware.keyd.enable = true; + horseman.dots.gtk.enable = true; nix-hyprland = { enable = true; @@ -53,16 +58,17 @@ in { "hyprpaper" "systemctl --user start hyprpolkitagent" "waybar" + "hyprctl setcursor catppuccin-${flavor}-dark-cursors 24" ]; env = [ { name = "XCURSOR_SIZE"; - value = "24"; + value = toString cursorSize; } { name = "HYPRCURSOR_SIZE"; - value = "24"; + value = toString cursorSize; } ]; @@ -141,6 +147,8 @@ in { sensitivity = 0.0; touchpad.naturalScroll = true; numlockByDefault = true; + + touchpad.disableWhileTyping = true; }; group = { diff --git a/modules/wm/hyprland/keybindings.nix b/modules/wm/hyprland/keybindings.nix index 0c2ec5c..4344774 100644 --- a/modules/wm/hyprland/keybindings.nix +++ b/modules/wm/hyprland/keybindings.nix @@ -441,6 +441,13 @@ in { params = ""; } + { + flags = []; + mods = []; + key = "XF86AudioMute"; + dispatcher = "exec"; + params = "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 0%"; + } { flags = ["e" "l"]; mods = [];