From b643f80dbb7ad5cb1ab1780f250b58e75da3ce25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Mon, 5 Jan 2026 15:03:57 +0100 Subject: [PATCH] [Fix] Hyprland config --- flake.lock | 30 ++++++++--------- home/Aloria.nix | 2 ++ home/hyprland/default.nix | 71 ++++++++++++++++++++++----------------- home/ssh/default.nix | 8 ++++- home/vicinae/default.nix | 8 ++++- 5 files changed, 72 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 7e4c3a7..c938af2 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1767606757, + "narHash": "sha256-lCl9QyHHHG/lKkpZu9nhJ5ri30FUD66VWNMJp167wPY=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "c4eabb884b01366f25c3f80823b12dd595ed603a", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -252,11 +252,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1766139198, - "narHash": "sha256-hYSbijPD3nvKZ9LObykgOO1C0s0/IM7Zv6BtTXB1F9g=", + "lastModified": 1767602452, + "narHash": "sha256-dtAvNihXmUiFC4npKNByp7UwW8hILrCzcc0ZnzejWgw=", "owner": "nix-community", "repo": "NUR", - "rev": "5a370962ea203522236dade2aed4094069cb331d", + "rev": "af0cd55eba4021bf93701eeab00e86018fb7aaf5", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1765982567, - "narHash": "sha256-lii6QTyRYIaQk9eDsvwzSZ1ZlICQoP/sIAWDGlXVpbI=", + "lastModified": 1767587590, + "narHash": "sha256-2OVoKCCZ4sCEZJ03LOaNJ9tDVIHCrxyk5/ME/UtqiC0=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "69f8a116929b9bc5f4b0e3b822a148ae657bb9c6", + "rev": "5ea9b53a5febfc63ee6fc5010500ccaac974a6bf", "type": "github" }, "original": { diff --git a/home/Aloria.nix b/home/Aloria.nix index baefbe8..acda695 100644 --- a/home/Aloria.nix +++ b/home/Aloria.nix @@ -21,7 +21,9 @@ in home.packages = with pkgs; [ # jetbrains.pycharm-professional rclone + opencode zed-editor + google-cloud-sdk distrobox gnome-disk-utility moonlight-qt diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index a8a9184..0ffa38e 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,18 +1,12 @@ { pkgs, ... }: let playerctl = "${pkgs.playerctl}/bin/playerctl"; - wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste"; nautilus = "${pkgs.nautilus}/bin/nautilus"; gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar"; wpctl = "${pkgs.wireplumber}/bin/wpctl"; terminal-name = "foot"; terminal = "${pkgs.foot}/bin/footclient"; jq = "${pkgs.jq}/bin/jq"; - # workspace_command_prefix = "split-"; - # hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces ]; - - # workspace_command_prefix = "split:"; - # hyprland_plugins = [ pkgs.hyprlandPlugins.hyprsplit ]; # Disable split-monitor-workspaces workspace_command_prefix = ""; @@ -73,10 +67,10 @@ in { settings = { ipc = "on"; splash = false; - preload = [ "${./files/wallpaper.png}" ]; - wallpaper = [ - ",${./files/wallpaper.png}" - ]; + wallpaper = { + path = "${./files/wallpaper.png}"; + monitor = ""; + }; }; }; @@ -133,22 +127,39 @@ in { "WLR_RENDERER_ALLOW_SOFTWARE,1" ]; debug = { disable_logs = false; }; + + # UPDATED: New Window Rule Syntax (0.53.0) windowrule = [ - "float, title:^(rofi)(.*)$" - "center, title:^(rofi)(.*)$" - "noborder, title:^(rofi)(.*)$" - "stayfocused, title:^()$,class:^(steam)$" - "minsize 1 1, title:^()$,class:^(steam)$" - "stayfocused, title:^()$,class:^(steam)$" - "workspace 8, class:thunderbird" - "workspace 9, class:spotify" - "workspace 10, class:Slack" - "bordersize 0, floating:0, onworkspace:w[tv1]" - "rounding 0, floating:0, onworkspace:w[tv1]" - "bordersize 0, floating:0, onworkspace:f[1]" - "rounding 0, floating:0, onworkspace:f[1]" + "float on, match:title ^(rofi)(.*)$" + "center on, match:title ^(rofi)(.*)$" + "border_size 0, match:title ^(rofi)(.*)$" # 'noborder' is replaced by border_size 0 + + # Combined matches (replaces old multi-rule logic) + "stay_focused on, match:title ^()$, match:class ^(steam)$" + "min_size 1 1, match:title ^()$, match:class ^(steam)$" + "stay_focused on, match:title ^()$, match:class ^(steam)$" + + "workspace 8, match:class thunderbird" + "workspace 9, match:class spotify" + "workspace 10, match:class Slack" + + # Windowrulev2-style logic updated to new prop syntax + "border_size 0, match:float 0, match:workspace w[tv1]" + "rounding 0, match:float 0, match:workspace w[tv1]" + "border_size 0, match:float 0, match:workspace f[1]" + "rounding 0, match:float 0, match:workspace f[1]" ]; - layerrule = [ "noanim,ags_bar_0" "noanim,selection" "blur,vicinae" "ignorealpha 0, vicinae" "noanim, vicinae"]; + + # UPDATED: New Layer Rule Syntax (0.53.0) + # Syntax: effect value, match:namespace regex + layerrule = [ + "no_anim on, match:namespace ags_bar_0" + "no_anim on, match:namespace selection" + "blur on, match:namespace vicinae" + "ignore_alpha 0, match:namespace vicinae" + "no_anim on, match:namespace vicinae" + ]; + general = { gaps_in = 1; gaps_out = pkgs.lib.mkDefault 5; @@ -160,14 +171,14 @@ in { input = { kb_layout = "us"; follow_mouse = 1; - kb_options = pkgs.lib.mkDefault "compose:rctrl, shift:both_capslock, caps:ctrl_modifier"; + kb_options = pkgs.lib.mkDefault "compose:rctrl, caps:ctrl_modifier"; numlock_by_default = true; }; binds = { scroll_event_delay = 1; }; xwayland = { force_zero_scaling = true; }; misc = { disable_hyprland_logo = 1; - enable_anr_dialog = false; + # Removed 'enable_anr_dialog' (deprecated/removed in recent versions) }; decoration = { rounding = 1; @@ -189,6 +200,7 @@ in { preserve_split = "yes"; force_split = 2; }; + gesture = [ "3, horizontal, workspace" ]; @@ -236,14 +248,14 @@ in { "CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock" "$mainMod, C, exec, vicinae vicinae://extensions/vicinae/clipboard/history" "$mainMod, W, exec, vicinae vicinae://extensions/vicinae/wm/switch-windows" - "$mainMod, Escape, exec, vicinae open -q \"Power Management\"" + "$mainMod, Escape, exec, vicinae open -q \"Power Management \"" ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%" ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-" ",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0" ",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-" ",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - ",mouse_right, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0" - ",mouse_left, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-" + # ",mouse:273, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0" + # ",mouse:272, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-" ",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ",XF86AudioNext, exec, ${playerctl} next" ",XF86AudioPrev, exec, ${playerctl} previous" @@ -274,7 +286,6 @@ in { "$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1" ] ++ ( # workspaces - # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} builtins.concatLists (builtins.genList (x: let ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10)); diff --git a/home/ssh/default.nix b/home/ssh/default.nix index 65debd6..70e6865 100644 --- a/home/ssh/default.nix +++ b/home/ssh/default.nix @@ -4,7 +4,6 @@ programs.ssh = { enable = true; enableDefaultConfig = false; - includes = [ "gpulab_hosts_config" ]; matchBlocks = { "*" = { host = "*"; @@ -79,6 +78,13 @@ user = "server"; forwardAgent = true; }; + gcp = { + host = "gcp"; + hostname = "34.126.140.76"; + port = 22; + user = "user"; + forwardAgent = true; + }; }; }; } diff --git a/home/vicinae/default.nix b/home/vicinae/default.nix index 89642b3..410f549 100644 --- a/home/vicinae/default.nix +++ b/home/vicinae/default.nix @@ -5,6 +5,12 @@ services.vicinae = { enable = true; - autoStart = true; + systemd = { + enable = true; + autoStart = true; + environment = { + QT_SCALE_FACTOR="1.5"; + }; + }; }; }