diff --git a/config/optional/dev.nix b/config/optional/dev.nix index fe94282..641cd36 100644 --- a/config/optional/dev.nix +++ b/config/optional/dev.nix @@ -6,6 +6,9 @@ }: lib.optionalAttrs (!minimal) { environment.systemPackages = with pkgs; [ + python3 + jq + nix-update gnumake pciutils gcc diff --git a/users/common/graphical/wayland/hyprland.nix b/users/common/graphical/wayland/hyprland.nix index 75ebdf1..f48d37c 100644 --- a/users/common/graphical/wayland/hyprland.nix +++ b/users/common/graphical/wayland/hyprland.nix @@ -28,21 +28,21 @@ window_title=$(echo "$window_info" | ${pkgs.jq}/bin/jq '.title') # Check if the title matches the characteristics of the Bitwarden popup window - if [[ "$window_title" == *"(Bitwarden - Free Password Manager) - Bitwarden"* ]]; then + if [[ "$window_title" == '"Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox"' ]]; then # echo $window_id, $window_title # hyprctl dispatch togglefloating address:0x$window_id # hyprctl dispatch resizewindowpixel exact 20% 40%,address:0x$window_id # hyprctl dispatch movewindowpixel exact 40% 30%,address:0x$window_id - hyprctl --batch "dispatch togglefloating address:0x$window_id ; dispatch resizewindowpixel exact 20% 40%,address:0x$window_id ; dispatch movewindowpixel exact 40% 30%,address:0x$window_id" + hyprctl --batch "dispatch togglefloating address:0x$window_id ; dispatch resizewindowpixel exact "512 768",address:0x$window_id ; dispatch movewindowpixel exact "3800 -400",address:0x$window_id" fi ;; esac } # Listen to the Hyprland socket for events and process each line with the handle function - ${pkgs.socat}/bin/socat -U - UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock | while read -r line; do handle "$line"; done + ${pkgs.socat}/bin/socat -U - UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock | while read -r line; do handle "$line"; done ''; in { wayland.windowManager.hyprland = { @@ -128,13 +128,12 @@ in { "SUPER + SHIFT,period,movetoworkspace,+1" "SUPER,b,exec,firefox" - "SUPER,m,exec,thunderbird" "SUPER,t,exec,kitty" ",Menu,exec,fuzzel" "SUPER,c,exec,${lib.getExe pkgs.scripts.clone-term}" - "CTRL,F7,sendshortcut,SHIFT+CTRL,m,WebCord" - "CTRL,F8,sendshortcut,CTRL+SHIFT,d,WebCord" + "CTRL,F7,pass,discord" + "CTRL,F8,pass,discord" "CTRL,F9,exec,systemctl --user start swww-update-wallpaper" "SUPER + SHIFT,q,exit" diff --git a/users/patrick/default.nix b/users/patrick/default.nix index 4e915b6..00c93d0 100644 --- a/users/patrick/default.nix +++ b/users/patrick/default.nix @@ -38,7 +38,7 @@ lib.optionalAttrs (!minimal) { environment.systemPackages = with pkgs; [ # xournalpp needs this or else it will crash - gnome3.adwaita-icon-theme + adwaita-icon-theme ]; age.secrets = { smb-creds = { diff --git a/users/patrick/patrick.nix b/users/patrick/patrick.nix index 02981f8..4c46310 100644 --- a/users/patrick/patrick.nix +++ b/users/patrick/patrick.nix @@ -17,8 +17,6 @@ signal-desktop telegram-desktop chromium - python3 - jq osu-lazer-bin mumble zotero