diff --git a/configs/hypr/hyprland.d/exec.conf b/configs/hypr/hyprland.d/exec.conf index 3720d31..beaec20 100644 --- a/configs/hypr/hyprland.d/exec.conf +++ b/configs/hypr/hyprland.d/exec.conf @@ -1,3 +1,2 @@ exec-once = nm-applet & -exec-once = $HOME/.configs/hypr/start-up-script.sh -# exec-once = hyprctl plugin load "$HYPR_PLUGIN_DIR/lib/libhyprexpo.so" +exec-once = $HOME/.config/hypr/start-up-script.sh diff --git a/configs/hypr/hyprland.d/keybindings.conf b/configs/hypr/hyprland.d/keybindings.conf index 6321152..5a73b5b 100644 --- a/configs/hypr/hyprland.d/keybindings.conf +++ b/configs/hypr/hyprland.d/keybindings.conf @@ -1,41 +1,97 @@ $mainMod = SUPER -bind = $mainMod, T, exec, $terminal -bind = $mainMod, space, exec, $menu -bind = $mainMod, B, exec, chromium --profile-directory=ProfilePersonal -bind = $mainMod Alt, B, exec, chromium --profile-directory=ProfileWork +# bind = $mainMod, T, exec, $terminal +# bind = $mainMod, space, exec, $menu +# bind = $mainMod, B, exec, chromium --profile-directory=ProfilePersonal +# bind = $mainMod Alt, B, exec, chromium --profile-directory=ProfileWork +# bind = $mainMod, E, exec, wofi-emoji +# bind = $mainMod, Q, killactive, +# bind = $mainMod, V, togglefloating, +# bind = $mainMod, Tab, cyclenext + +# #bind = $mainMod, G, overview:toggle + + +# # Move focus with mainMod + arrow keys +# bind = $mainMod, left, movetoworkspace, m-1 +# bind = $mainMod, right, movetoworkspace, m+1 +# bind = $mainMod Ctrl, right, movetoworkspace, emptym +# bind = $mainMod alt, up, movewindow, u +# bind = $mainMod alt, left, movewindow, l +# bind = $mainMod alt, right, movewindow, r +# bind = $mainMod alt, down, movewindow, d + +# # Move/resize windows with mainMod + LMB/RMB and dragging +# bindm = $mainMod, mouse:272, movewindow +# bindm = $mainMod, mouse:273, resizewindow + +# # Laptop multimedia keys for volume and LCD brightness +# bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ +# bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +# bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +# bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +# bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+ +# bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%- + +# # Requires playerctl +# bindl = , XF86AudioNext, exec, playerctl next +# bindl = , XF86AudioPause, exec, playerctl play-pause +# bindl = , XF86AudioPlay, exec, playerctl play-pause +# bindl = , XF86AudioPrev, exec, playerctl previous + +# === Launcher & Apps === +bind = $mainMod SHIFT, H, exec, show-hotkey-overlay +bind = $mainMod, T, exec, ghostty +bind = $mainMod, SPACE, exec, walker +bind = $mainMod, Z, exec, flatpak run app.zen_browser.zen +bind = $mainMod, B, exec, chromium bind = $mainMod, E, exec, wofi-emoji -bind = $mainMod, Q, killactive, -bind = $mainMod, V, togglefloating, -bind = $mainMod, Tab, cyclenext +bind = $mainMod ALT, L, exec, makoctl dismiss -a -#bind = $mainMod, G, overview:toggle +# === Audio and Brightness === +bindl = , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise +bindl = , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower +bindl = , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle +bindl = , XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle +bindl = , XF86MonBrightnessUp, exec, swayosd-client --brightness raise +bindl = , XF86MonBrightnessDown, exec, swayosd-client --brightness lower +# === Window Focus === +bind = $mainMod, LEFT, movefocus, l +bind = $mainMod, RIGHT, movefocus, r +bind = $mainMod, UP, movefocus, u +bind = $mainMod, DOWN, movefocus, d -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movetoworkspace, m-1 -bind = $mainMod, right, movetoworkspace, m+1 -bind = $mainMod Ctrl, right, movetoworkspace, emptym -bind = $mainMod alt, up, movewindow, u -bind = $mainMod alt, left, movewindow, l -bind = $mainMod alt, right, movewindow, r -bind = $mainMod alt, down, movewindow, d +# Next monitor +bind = $mainMod SHIFT, TAB, focusmonitor, e # e = next monitor -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow +# === Move / Swap Windows === +bind = $mainMod CTRL, LEFT, movetoworkspace, m-1 +bind = $mainMod CTRL, RIGHT, movetoworkspace, emptym +bind = $mainMod SHIFT, LEFT, movewindow, l +bind = $mainMod SHIFT, RIGHT, movewindow, r +bind = $mainMod SHIFT, UP, movetoworkspace, r +bind = $mainMod SHIFT, DOWN, movetoworkspace, l +# === Layout and Window Modes === +bind = $mainMod, W, togglesplit +bind = $mainMod, F, fullscreen, 0 # column maximize → regular fullscreen +bind = $mainMod SHIFT, F, fullscreen, 1 # true fullscreen +bind = $mainMod CTRL, F, resizeactive, exact 100% # reset height analog +bind = $mainMod, V, togglefloating -# Laptop multimedia keys for volume and LCD brightness -bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ -bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle -bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%- +# === Centering and Resizing === +bind = $mainMod, c, centerwindow +bind = $mainMod, MINUS, resizeactive, -10% 0 +bind = $mainMod, EQUAL, resizeactive, +10% 0 +bind = $mainMod SHIFT, MINUS, resizeactive, 0 -10% +bind = $mainMod SHIFT, EQUAL, resizeactive, 0 +10% -# Requires playerctl -bindl = , XF86AudioNext, exec, playerctl next -bindl = , XF86AudioPause, exec, playerctl play-pause -bindl = , XF86AudioPlay, exec, playerctl play-pause -bindl = , XF86AudioPrev, exec, playerctl previous +# === Misc === +bind = $mainMod, ESCAPE, exec, toggle-keyboard-shortcuts-inhibit # may need custom script +bind = , PRINT, exec, sh -c 'grim -g "$(slurp)" - | satty -f -' +bind = $mainMod, P, exec, sh -c 'grim -g "$(slurp)" - | satty -f -' +bind = $mainMod, R, exec, ~/.config/niri/screen-record.sh +bind = CTRL ALT, DELETE, exit, +bind = $mainMod, Q, killactive +bind = $mainMod CTRL, W, exec, sh -c '/home/ari/.config/niri/start-up-script.sh' diff --git a/configs/hypr/hyprland.d/layout.conf b/configs/hypr/hyprland.d/layout.conf index d9d35cb..ee2beb9 100644 --- a/configs/hypr/hyprland.d/layout.conf +++ b/configs/hypr/hyprland.d/layout.conf @@ -28,13 +28,13 @@ decoration { animations { enabled = yes + animation = fade, 0 } master { new_status = master } - misc { force_default_wallpaper = 1 disable_hyprland_logo = false focus_on_activate = true -} \ No newline at end of file +} diff --git a/configs/hypr/hyprland.d/plugins.conf b/configs/hypr/hyprland.d/plugins.conf new file mode 100644 index 0000000..30284f2 --- /dev/null +++ b/configs/hypr/hyprland.d/plugins.conf @@ -0,0 +1,13 @@ +plugin { + hyprbars { + enabled = true + } + hyprexpo { + columns = 3 + gap_size = 5 + bg_col = rgb(111111) + workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1 + + gesture_distance = 300 # how far is the "max" for the gesture + } +} diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 1c662a0..17e3458 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -203,12 +203,8 @@ hotkey-overlay { binds { Mod+Shift+H { show-hotkey-overlay; } Mod+T { spawn "ghostty"; } - // Mod+Space { spawn-sh "/run/current-system/sw/bin/rofi -show drun -theme $HOME/.config/rofi-collection/nord/nord.rasi"; } Mod+Space { spawn "walker"; } - // Mod+Space { spawn-sh "rofi -show drun -theme $HOME/.config/rofi-collection/nord/nord.rasi"; } - // Mod+Space { spawn-sh "/run/current-system/sw/bin/sherlock"; } Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; } - //Mod+B { spawn "chromium" "--profile-directory=ProfilePersonal"; } Mod+B { spawn "chromium"; } Mod+E { spawn "wofi-emoji"; } XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 52e01d0..454f195 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -141,6 +141,7 @@ in # Browser chromium + brave # Photo/video Editing krita @@ -214,6 +215,11 @@ in remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; + gamescopeSession.enable = true; + }; + programs.gamescope = { + enable = true; + capSysNice = true; }; # Chrome programs.chromium = { diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix index 4b622ed..9d1803f 100644 --- a/modules/nixos/desktop/tiler/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -32,13 +32,12 @@ in enable = true; extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; }; - # environment.sessionVariables = { - # HYPR_PLUGIN_DIR = hypr-plugin-dir; - # }; - # home-manager.users.${config.skyg.user.name} = { - # programs.hyprpanel = { - # enable = true; - # }; - # }; + home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = { + enable = true; + plugins = with pkgs; [ + hyprlandPlugins.hyprexpo + hyprlandPlugins.hyprbars + ]; + }; }; }