From 85d550a92c047cc96a86bf2f57c31c9ba5267eca Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Sat, 4 Apr 2026 15:10:37 -0500 Subject: [PATCH] new . files --- nixos/roy-config/alacritty/alacritty.toml | 0 .../alacritty/catppuccin-frappe.toml | 0 nixos/roy-config/fish/config.fish | 0 nixos/roy-config/fish/fish_variables | 0 .../fish/functions/fish_greeting.fish | 0 .../fish/functions/fish_prompt.fish | 0 nixos/roy-config/hypr/hyprland.conf | 60 +++++++++++------ nixos/roy-config/waybar/config | 66 +++++++------------ nixos/roy-config/waybar/style.css | 5 +- 9 files changed, 67 insertions(+), 64 deletions(-) mode change 100755 => 100644 nixos/roy-config/alacritty/alacritty.toml mode change 100755 => 100644 nixos/roy-config/alacritty/catppuccin-frappe.toml mode change 100755 => 100644 nixos/roy-config/fish/config.fish mode change 100755 => 100644 nixos/roy-config/fish/fish_variables mode change 100755 => 100644 nixos/roy-config/fish/functions/fish_greeting.fish mode change 100755 => 100644 nixos/roy-config/fish/functions/fish_prompt.fish mode change 100755 => 100644 nixos/roy-config/hypr/hyprland.conf mode change 100755 => 100644 nixos/roy-config/waybar/config mode change 100755 => 100644 nixos/roy-config/waybar/style.css diff --git a/nixos/roy-config/alacritty/alacritty.toml b/nixos/roy-config/alacritty/alacritty.toml old mode 100755 new mode 100644 diff --git a/nixos/roy-config/alacritty/catppuccin-frappe.toml b/nixos/roy-config/alacritty/catppuccin-frappe.toml old mode 100755 new mode 100644 diff --git a/nixos/roy-config/fish/config.fish b/nixos/roy-config/fish/config.fish old mode 100755 new mode 100644 diff --git a/nixos/roy-config/fish/fish_variables b/nixos/roy-config/fish/fish_variables old mode 100755 new mode 100644 diff --git a/nixos/roy-config/fish/functions/fish_greeting.fish b/nixos/roy-config/fish/functions/fish_greeting.fish old mode 100755 new mode 100644 diff --git a/nixos/roy-config/fish/functions/fish_prompt.fish b/nixos/roy-config/fish/functions/fish_prompt.fish old mode 100755 new mode 100644 diff --git a/nixos/roy-config/hypr/hyprland.conf b/nixos/roy-config/hypr/hyprland.conf old mode 100755 new mode 100644 index b7c9ab7..e3a0681 --- a/nixos/roy-config/hypr/hyprland.conf +++ b/nixos/roy-config/hypr/hyprland.conf @@ -8,8 +8,24 @@ ################ # See https://wiki.hyprland.org/Configuring/Monitors/ +# built-in monitor monitor=,preferred,auto,1 +monitorv2 { + output = DP-1 + mode = 3840x2160@60 + position = auto + scale = 1.5 + transform = 0 +} + +monitorv2 { + output = HDMI-A-1 + mode = 2560x1440@59.95 + position = auto + scale = 1 + transform = 0 +} ################### ### MY PROGRAMS ### @@ -20,7 +36,7 @@ monitor=,preferred,auto,1 # Set programs that you use $terminal = alacritty $fileManager = dolphin -$menu = wofi --show drun +$menu = wofi --show=drun --prompt="Search Programs" ################# @@ -42,6 +58,12 @@ exec-once = waybar env = HYPRCURSOR_THEME,rose-pine-hyprcursor env = HYPRCURSOR_SIZE,18 +#################### +### SCRIPT PATHS ### +#################### + +$switchFocus = ~/.config/hypr/scripts/switch-to-unfocused-monitor.sh +$moveAndSwitch = ~/.config/hypr/scripts/move-workspace-to-unfocused-monitor.sh ##################### ### LOOK AND FEEL ### @@ -90,7 +112,6 @@ decoration { # https://wiki.hyprland.org/Configuring/Variables/#animations animations { enabled = false; - first_launch_animation = false; workspace_wraparound = false; } @@ -143,16 +164,6 @@ input { } } -# https://wiki.hyprland.org/Configuring/Variables/#gestures -gestures { - workspace_swipe = false -} - -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more -device { } - - ################### ### KEYBINDINGS ### ################### @@ -166,9 +177,8 @@ bind = $mainMod, Q, killactive, bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, Space, exec, $menu +bind = $mainMod, P, togglesplit, # dwindle bind = $mainMod SHIFT, Return, exec, firefox # Move focus with mainMod + hjkl @@ -201,12 +211,24 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 +# Move workspace to unfocused monitor (Does not currently support more than two monitors) +bind = $mainMod SHIFT, TAB, exec, sh -c $moveAndSwitch + +# Switch to unfocused monitor (Does not currently support more than two monitors) +bind = $mainMod, TAB, exec, sh -c $switchFocus + +# Rotate screen with arrows +# TODO: only works on builtin display (see scripts) +bind = $mainMod SHIFT, up, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,0" +bind = $mainMod SHIFT, down, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,2" +bind = $mainMod SHIFT, left, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,1" +bind = $mainMod SHIFT, right, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,3" + # Screenshot to clipboard bind = $mainMod SHIFT, S, exec, grim -g "$(slurp -d)" - | wl-copy -# Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SHIFT, S, movetoworkspace, special:magic +# Make display fullscreen (hide the waybar) +bind = $mainMod SHIFT, f, fullscreen # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 @@ -244,7 +266,7 @@ bindl = , XF86AudioPrev, exec, playerctl previous # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # Ignore maximize requests from apps. You'll probably like this. -windowrulev2 = suppressevent maximize, class:.* +# windowrulev2 = suppressevent maximize, class:.* # Fix some dragging issues with XWayland windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/nixos/roy-config/waybar/config b/nixos/roy-config/waybar/config old mode 100755 new mode 100644 index 366b16d..85e7e59 --- a/nixos/roy-config/waybar/config +++ b/nixos/roy-config/waybar/config @@ -9,57 +9,41 @@ "modules-right": ["wireplumber", "group/bat", "group/net"], "group/bat": { - "orientation": "horizontal", - "modules": ["battery"] + "orientation": "horizontal", + "modules": ["battery"] }, - "group/net": { - "orientation": "horizontal", - "modules": ["network", "bluetooth"] + "orientation": "horizontal", + "modules": ["network"] }, - "hyprland/workspaces": { - "format": "{name}", - "sort-by-number": true, - "persistent-workspaces": { - } + "format": "{name}", + "sort-by-number": true, + "persistent-workspaces": {} }, - "clock": { - "format": "{:%d.%m.%Y | %H:%M:%S}", - "interval": 1 + "format": "{:%d.%m.%Y | %H:%M:%S}", + "interval": 1 }, - "wireplumber": { - "format": "\udb81\udd7e {volume}%", - "max-volume": 100, - "scroll-step": 5 + "format": "\udb81\udd7e {volume}%", + "max-volume": 100, + "scroll-step": 5 }, - "battery": { - "bat": "BAT0", - "interval": 60, - "format": "{icon} {capacity}%", - "format-icons": ["\uf244", "\uf243", "\uf242", "\uf241", "\uf240"], + "bat": "BAT0", + "interval": 60, + "format": "{icon} {capacity}%", + "format-icons": ["\uf244", "\uf243", "\uf242", "\uf241", "\uf240"], }, - "network": { - "format": "", - "format-ethernet": "\udb83\udc9d ", - "format-wifi": "{icon} ", - "format-disconnected": "\udb83\udc9c ", - "format-icons": ["\udb82\udd2f", "\udb82\udd1f", "\udb82\udd22", "\udb82\udd25", "\udb82\udd28"], - "tooltip-format-wifi": "{essid} ({signalStrength}%)", - "tooltip-format-ethernet": "{ifname}", - "tooltip-format-disconnected": "Disconnected", - }, - - "bluetooth": { - "format": "\udb80\udcaf", - "format-disabled": "\udb80\udcb2", - "format-connected": "\udb80\udcb1", - "tooltip-format": "{controller_alias}\t{controller_address}", - "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}", - "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}" - }, + "format": "", + "format-ethernet": "\udb83\udc9d ", + "format-wifi": "{icon} ", + "format-disconnected": "\udb83\udc9c ", + "format-icons": ["\udb82\udd2f", "\udb82\udd1f", "\udb82\udd22", "\udb82\udd25", "\udb82\udd28"], + "tooltip-format-wifi": "{essid} ({signalStrength}%)", + "tooltip-format-ethernet": "{ifname}", + "tooltip-format-disconnected": "Disconnected", + } } diff --git a/nixos/roy-config/waybar/style.css b/nixos/roy-config/waybar/style.css old mode 100755 new mode 100644 index 48a9edb..d104e75 --- a/nixos/roy-config/waybar/style.css +++ b/nixos/roy-config/waybar/style.css @@ -34,10 +34,7 @@ border-radius: 3px; padding-left: 0.5em; padding-right: 0.5em; - margin-left: 0.3em; } #battery, -#network { - margin-right: 0.8em; -} +#network {}