From 3188c6ecbb22d143082959cda9a7a0e096c0375f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 24 Jul 2025 11:31:55 -0400 Subject: [PATCH] updating latest hypr --- configs/hypr/hyprland.conf | 8 + configs/hypr/hyprland.d/envs.conf | 2 + configs/hypr/hyprland.d/exec.conf | 2 + configs/hypr/hyprland.d/inputs.conf | 11 ++ configs/hypr/hyprland.d/keybindings.conf | 41 ++++ configs/hypr/hyprland.d/layout.conf | 39 ++++ configs/hypr/hyprland.d/monitors.conf | 10 + configs/hypr/hyprland.d/plugins.conf | 23 +++ configs/hypr/hyprland.d/window-rules.conf | 2 + configs/hyprland/mine/dunst/dunstrc | 77 -------- configs/hyprland/mine/hypr/.gitignore | 1 - configs/hyprland/mine/hypr/hypridle.conf | 40 ---- .../mine/hypr/hyprland.d/bg-proc.conf | 8 - .../hyprland/mine/hypr/hyprland.d/consts.conf | 6 - .../mine/hypr/hyprland.d/keybindings.conf | 60 ------ .../mine/hypr/hyprland.d/monitors.conf | 1 - .../mine/hypr/hyprland.d/slack-ws.conf | 1 - .../hypr/hyprland.d/special-window-rules.conf | 25 --- .../mine/hypr/hyprland.d/visuals.conf | 87 --------- configs/hyprland/mine/hypr/hyprlock.conf | 140 -------------- configs/hyprland/mine/hypr/monitors.conf | 10 - configs/hyprland/mine/hypr/syn_hyprland.conf | 2 - configs/hyprland/mine/nwg-bar/bar.json | 27 --- configs/hyprland/mine/nwg-bar/style.css | 35 ---- configs/hyprland/mine/waybar/config | 129 ------------- configs/hyprland/mine/waybar/style.css | 181 ------------------ configs/hyprpanel/config.json | 12 ++ configs/hyprpanel/modules.json | 1 + .../modules.scss} | 0 configs/niri-config.kdl | 12 +- flake.nix | 15 +- modules/nixos/desktop/default.nix | 1 + modules/nixos/desktop/hyprland.nix | 13 +- 33 files changed, 169 insertions(+), 853 deletions(-) create mode 100644 configs/hypr/hyprland.conf create mode 100644 configs/hypr/hyprland.d/envs.conf create mode 100644 configs/hypr/hyprland.d/exec.conf create mode 100644 configs/hypr/hyprland.d/inputs.conf create mode 100644 configs/hypr/hyprland.d/keybindings.conf create mode 100644 configs/hypr/hyprland.d/layout.conf create mode 100644 configs/hypr/hyprland.d/monitors.conf create mode 100644 configs/hypr/hyprland.d/plugins.conf create mode 100644 configs/hypr/hyprland.d/window-rules.conf delete mode 100644 configs/hyprland/mine/dunst/dunstrc delete mode 100644 configs/hyprland/mine/hypr/.gitignore delete mode 100644 configs/hyprland/mine/hypr/hypridle.conf delete mode 100644 configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf delete mode 100644 configs/hyprland/mine/hypr/hyprland.d/consts.conf delete mode 100644 configs/hyprland/mine/hypr/hyprland.d/keybindings.conf delete mode 120000 configs/hyprland/mine/hypr/hyprland.d/monitors.conf delete mode 100644 configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf delete mode 100644 configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf delete mode 100644 configs/hyprland/mine/hypr/hyprland.d/visuals.conf delete mode 100644 configs/hyprland/mine/hypr/hyprlock.conf delete mode 100644 configs/hyprland/mine/hypr/monitors.conf delete mode 100644 configs/hyprland/mine/hypr/syn_hyprland.conf delete mode 100644 configs/hyprland/mine/nwg-bar/bar.json delete mode 100644 configs/hyprland/mine/nwg-bar/style.css delete mode 100644 configs/hyprland/mine/waybar/config delete mode 100644 configs/hyprland/mine/waybar/style.css create mode 100644 configs/hyprpanel/config.json create mode 100644 configs/hyprpanel/modules.json rename configs/{hyprland/mine/hypr/workspaces.conf => hyprpanel/modules.scss} (100%) diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf new file mode 100644 index 0000000..b969615 --- /dev/null +++ b/configs/hypr/hyprland.conf @@ -0,0 +1,8 @@ + +$terminal = ghostty +$fileManager = dolphin +$menu = fuzzel +$browser = chromium + +source = ~/.config/hypr/hyprland.d/*.conf + diff --git a/configs/hypr/hyprland.d/envs.conf b/configs/hypr/hyprland.d/envs.conf new file mode 100644 index 0000000..dfabf35 --- /dev/null +++ b/configs/hypr/hyprland.d/envs.conf @@ -0,0 +1,2 @@ +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 diff --git a/configs/hypr/hyprland.d/exec.conf b/configs/hypr/hyprland.d/exec.conf new file mode 100644 index 0000000..0b13e4d --- /dev/null +++ b/configs/hypr/hyprland.d/exec.conf @@ -0,0 +1,2 @@ +exec-once = nm-applet & +exec-once = hyprctl plugin load "$HYPR_PLUGIN_DIR/lib/libhyprexpo.so" diff --git a/configs/hypr/hyprland.d/inputs.conf b/configs/hypr/hyprland.d/inputs.conf new file mode 100644 index 0000000..e0a1182 --- /dev/null +++ b/configs/hypr/hyprland.d/inputs.conf @@ -0,0 +1,11 @@ + +input { + kb_layout = us + touchpad { + natural_scroll = true + } +} + +gestures { + workspace_swipe = true +} \ No newline at end of file diff --git a/configs/hypr/hyprland.d/keybindings.conf b/configs/hypr/hyprland.d/keybindings.conf new file mode 100644 index 0000000..6321152 --- /dev/null +++ b/configs/hypr/hyprland.d/keybindings.conf @@ -0,0 +1,41 @@ + +$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, 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 diff --git a/configs/hypr/hyprland.d/layout.conf b/configs/hypr/hyprland.d/layout.conf new file mode 100644 index 0000000..08a1201 --- /dev/null +++ b/configs/hypr/hyprland.d/layout.conf @@ -0,0 +1,39 @@ +general { + gaps_in = 0 + gaps_out = 0 + border_size = 1 + resize_on_border = true + allow_tearing = false + layout = master +} + +decoration { + rounding = 2 + rounding_power = 2 + active_opacity = 1.0 + inactive_opacity = 0.8 + shadow { + enabled = true + range = 4 + render_power = 3 + color = rgba(1a1a1aee) + } + blur { + enabled = true + size = 3 + passes = 1 + vibrancy = 0.1696 + } +} + +animations { + enabled = yes +} +master { + new_status = master +} + +misc { + force_default_wallpaper = 1 + disable_hyprland_logo = false +} \ No newline at end of file diff --git a/configs/hypr/hyprland.d/monitors.conf b/configs/hypr/hyprland.d/monitors.conf new file mode 100644 index 0000000..6ec55f5 --- /dev/null +++ b/configs/hypr/hyprland.d/monitors.conf @@ -0,0 +1,10 @@ + +# Laptop Internal Monitor +monitor=desc:BOE 0x0BCA,2256x1504,0x0,1 + +# Home External Monitors +monitor=desc:Samsung Electric Company S22R35x H4TR503886, 1920x1080@60.0, 980x-1080, 1.0 +monitor=desc:Samsung Electric Company S22R35x H4TR604392,1920x1080@60.0,-960x-1080,1.0 + +# Other monitors +monitor=*,preffered,auto,1 diff --git a/configs/hypr/hyprland.d/plugins.conf b/configs/hypr/hyprland.d/plugins.conf new file mode 100644 index 0000000..810559f --- /dev/null +++ b/configs/hypr/hyprland.d/plugins.conf @@ -0,0 +1,23 @@ +# .config/hypr/hyprland.conf +plugin { + hyprexpo { + columns = 2 + gap_size = 2 + skip_empty = true + bg_col = rgb(111111) + workspace_method = center current + enable_gesture = true + gesture_fingers = 3 + gesture_distance = 300 + gesture_positive = false + } + hyprbars { + enabled = true + bar_height = 20 + + hyprbars-button = rgb(ff4040), 10, 󰖭, hyprctl dispatch killactive + hyprbars-button = rgb(eeee11), 10, , hyprctl dispatch fullscreen 1 + + on_double_click = hyprctl dispatch fullscreen 1 + } +} \ No newline at end of file diff --git a/configs/hypr/hyprland.d/window-rules.conf b/configs/hypr/hyprland.d/window-rules.conf new file mode 100644 index 0000000..9cc043d --- /dev/null +++ b/configs/hypr/hyprland.d/window-rules.conf @@ -0,0 +1,2 @@ +windowrule = suppressevent maximize, class:.* +windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/configs/hyprland/mine/dunst/dunstrc b/configs/hyprland/mine/dunst/dunstrc deleted file mode 100644 index 5ee5a9c..0000000 --- a/configs/hyprland/mine/dunst/dunstrc +++ /dev/null @@ -1,77 +0,0 @@ -[global] - monitor = 0 - follow = mouse - geometry = "0x0-30+20" - indicate_hidden = yes - shrink = no - transparency = 0 - notification_height = 0 - separator_height = 2 - padding = 8 - horizontal_padding = 8 - frame_width = 3 - frame_color = "#aaaaaa" - separator_color = auto - sort = yes - idle_threshold = 120 - font = Fira Code 10 - line_height = 0 - markup = full - format = "%s\n%b" - alignment = center - show_age_threshold = 60 - word_wrap = yes - ellipsize = middle - ignore_newline = no - stack_duplicates = true - hide_duplicate_count = false - show_indicators = yes - icon_position = left - max_icon_size = 32 - # icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ - sticky_history = yes - history_length = 20 - dmenu = /usr/bin/dmenu -p dunst: - browser = /usr/bin/brave - always_run_script = true - title = Dunst - class = Dunst - startup_notification = true - verbosity = mesg - corner_radius = 5 - mouse_left_click = do_action - mouse_middle_click = close_all - mouse_right_click = close_current - -[experimental] - per_monitor_dpi = false - -[shortcuts] - close = ctrl+space - close_all = ctrl+shift+space - history = ctrl+grave - context = ctrl+shift+period - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#2b2b2b" - foreground = "#ffffff" - timeout = 5 - # Icon for notifications with low urgency, uncomment to enable - # icon = /home/brodie/.config/dunst/normal.png - -[urgency_normal] - background = "#2b2b2b" - foreground = "#ffffff" - timeout = 5 - # Icon for notifications with normal urgency, uncomment to enable - # icon = /home/brodie/.config/dunst/normal.png - -[urgency_critical] - background = "#900000" - foreground = "#ffffff" - frame_color = "#ff0000" - timeout = 5 - # Icon for notifications with critical urgency, uncomment to enable - # icon = /home/brodie/.config/dunst/critical.png diff --git a/configs/hyprland/mine/hypr/.gitignore b/configs/hyprland/mine/hypr/.gitignore deleted file mode 100644 index 17c58b1..0000000 --- a/configs/hyprland/mine/hypr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -hyprland.conf \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hypridle.conf b/configs/hyprland/mine/hypr/hypridle.conf deleted file mode 100644 index 7e373b0..0000000 --- a/configs/hyprland/mine/hypr/hypridle.conf +++ /dev/null @@ -1,40 +0,0 @@ -general { - # lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances. - before_sleep_cmd = loginctl lock-session # lock before suspend. - after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. -} - -listener { - timeout = 150 # 2.5min. - on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. - on-resume = brightnessctl -r # monitor backlight restor. -} - -# turn off keyboard backlight, uncomment this section if have keyboard backlight. -listener { - timeout = 150 # 2.5min. - on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight. - on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight. -} - -listener { - timeout = 295 - on-timeout = hyprctl notify 0 5000 'rgb(ff0000)' 'Locking..' - on-resume = hyprctl notify 0 5000 'rgb(ff0000)' 'Stopping lock process..' -} - -listener { - timeout = 300 # 5min - on-timeout = loginctl lock-session # lock screen when timeout has passed -} - -listener { - timeout = 380 # 5.5min - on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed - on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. -} - -listener { - timeout = 1800 # 30min - on-timeout = systemctl suspend # suspend pc -} diff --git a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf deleted file mode 100644 index 12a3d03..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf +++ /dev/null @@ -1,8 +0,0 @@ -exec-once = lxqt-policykit-agent -exec-once = dunst --config $HOME/.config/dunstrc --startup_notification -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = swww-daemon -exec-once = hypridle -# exec-once = waybar -exec-once = nwg-panel -exec-once = nwg-dock-hyprland diff --git a/configs/hyprland/mine/hypr/hyprland.d/consts.conf b/configs/hyprland/mine/hypr/hyprland.d/consts.conf deleted file mode 100644 index 5916633..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/consts.conf +++ /dev/null @@ -1,6 +0,0 @@ -$term = alacritty -$browser = firefox -$filemanager = nautilus -$editor = code -$applauncher = wofi --show drun -$cmdlauncher = wofi --show run diff --git a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf deleted file mode 100644 index 9f36d17..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf +++ /dev/null @@ -1,60 +0,0 @@ -$mainMod = SUPER - -# bind = $mainMod, tab, overview, toggle - -# Apps. -bind = $mainMod, C, exec, $editor -bind = $mainMod, space, exec, $applauncher -bind = $mainMod, R, exec, $cmdlauncher -bind = $mainMod, T, exec, $term -bind = $mainMod, B, exec, $browser - -# My Binds -bind = $mainMod, Q, killactive, -bind = ALT, F4, killactive, -bind = $mainMod, V, togglefloating, -bind = $mainMod, F, fullscreen -bind = $mainMod, P, exec, rofimoji - -# Screen shot -bind = $mainMod, s, exec, hyprshot -m region -r | swappy -f - -# bind = $mainMod, , exec wl-screenrec --audio -g "$(slurp)" - -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - - -# Switch workspaces with mainMod -bind = $mainMod, right, workspace, +1 -bind = $mainMod, left, workspace, -1 - -# Move active window to a workspace with mainMod + SHIFT -bind = $mainMod CTRL, right, movetoworkspace, +1 -bind = $mainMod CTRL, left, movetoworkspace, -1 - -# Resize actions -bind = $mainMod SHIFT, right, resizeactive, 10 0 -bind = $mainMod SHIFT, left, resizeactive, -10 0 -bind = $mainMod SHIFT, up, resizeactive, 0 -10 -bind = $mainMod SHIFT, down, resizeactive, 0 10 - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow -bindm = $mainMod, ALT_L, resizewindow - -# Brigthness -bind = ,XF86MonBrightnessDown, exec, brightnessctl s 20%- -bind = ,XF86MonBrightnessUp, exec, brightnessctl s +20% - -# Volume -binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+ && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) -binde =, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%- && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) -bind =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) diff --git a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf deleted file mode 120000 index f0eb2ef..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf +++ /dev/null @@ -1 +0,0 @@ -../monitors.conf \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf b/configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf deleted file mode 100644 index d12fcbf..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf +++ /dev/null @@ -1 +0,0 @@ -workspace = name:‍, monitor:DP-10, default:true, persistent:true, on-created-empty:[fullscreen] slack \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf deleted file mode 100644 index 868bdb5..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Extras -windowrulev2 = float,class:(nwg-.*) -windowrulev2 = float,class:(org\.kde\..*) -windowrulev2 = float,class:(.*blueman.*) -windowrulev2 = float,class:(firefox) - -# Vscode -windowrulev2 = fakefullscreen,class:(Code) -windowrulev2 = fakefullscreen, class:^(code-url-handler)$ - - -# VLC -windowrulev2 = fullscreen,class:(vlc.*) - -# Rofi Randomness (mostly for rofimoji) -windowrulev2 = float,class:(Rofi) -windowrulev2 = size 30% 90%,class:(Rofi) -windowrulev2 = move 5% 5%,class:(Rofi) - -$centerable = (Slack|nm-connection-editor|pavucontrol|system-config-printer|lxqt-policykit-agent|amdgpu_top|.*blueman.*|thunar|xdg-desktop-portal-gtk) - -# Centerable & Floatable -windowrulev2 = float, class:$centerable -windowrulev2 = size 90% 90%, class:$centerable -windowrulev2 = move 5% 5%, class:$centerable diff --git a/configs/hyprland/mine/hypr/hyprland.d/visuals.conf b/configs/hyprland/mine/hypr/hyprland.d/visuals.conf deleted file mode 100644 index c1fc638..0000000 --- a/configs/hyprland/mine/hypr/hyprland.d/visuals.conf +++ /dev/null @@ -1,87 +0,0 @@ - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 5 - blur { - enabled = true - size = 3 - passes = 1 - new_optimizations = true - } - - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = true - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - -gestures { - workspace_swipe = on - workspace_swipe_fingers = 4 - workspace_swipe_create_new = true -} - -general { - border_size = 1 - no_border_on_floating = false - gaps_in = 3 - gaps_out = 3 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - layout = dwindle - resize_on_border = true - extend_border_grab_area = true - hover_icon_on_border = true -} - - -# # INPUT DEVICES -input { - kb_layout = us - numlock_by_default = false - repeat_rate = 25 - repeat_delay = 600 - accel_profile = adaptive - scroll_method = 2fg - follow_mouse = 1 - mouse_refocus = true - float_switch_override_focus = 1 - touchpad { - natural_scroll = yes - clickfinger_behavior = yes - disable_while_typing = true - scroll_factor = 1.0 - tap_button_map = lrm - tap-to-click = true - } -} - -# # MISC SETTINGS -misc { - disable_hyprland_logo = true - vrr = 0 - mouse_move_enables_dpms = false - key_press_enables_dpms = false - layers_hog_keyboard_focus = true - focus_on_activate = false - mouse_move_focuses_monitor = true -} - -# unscale XWayland -xwayland { - force_zero_scaling = true -} - -env = GDK_SCALE,2 -env = XCURSOR_SIZE,32 \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprlock.conf b/configs/hyprland/mine/hypr/hyprlock.conf deleted file mode 100644 index 5a46246..0000000 --- a/configs/hyprland/mine/hypr/hyprlock.conf +++ /dev/null @@ -1,140 +0,0 @@ -# source = /home/justin/.cache/wal/colors-hyprland.conf - -# BACKGROUND -background { - monitor = - #path = screenshot - # path = /home/justin/Pictures/wal.png - color = rgba(255, 0, 0, 1) - blur_passes = 2 - contrast = 1 - brightness = 0.5 - vibrancy = 0.2 - vibrancy_darkness = 0.2 -} - -# GENERAL -general { - no_fade_in = true - no_fade_out = true - hide_cursor = false - grace = 0 - disable_loading_bar = true -} - -# INPUT FIELD -input-field { - monitor = - size = 250, 60 - outline_thickness = 2 - dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = true - outer_color = rgba(0, 0, 0, 0) - inner_color = rgba(0, 0, 0, 0.2) - font_color = $foreground - fade_on_empty = false - rounding = -1 - check_color = rgb(204, 136, 34) - placeholder_text = Input Password... - hide_input = false - position = 0, -200 - halign = center - valign = center -} - -# DATE -label { - monitor = - text = cmd[update:1000] echo "$(date +"%A, %B %d")" - color = rgba(242, 243, 244, 0.75) - font_size = 22 - font_family = JetBrains Mono - position = 0, 300 - halign = center - valign = center -} - -# TIME -label { - monitor = - text = cmd[update:1000] echo "$(date +"%-I:%M")" - color = rgba(242, 243, 244, 0.75) - font_size = 95 - font_family = JetBrains Mono Extrabold - position = 0, 200 - halign = center - valign = center -} - - - -# Profile Picture -# image { -# monitor = -# path = /home/justin/Pictures/profile_pictures/justin_square.png -# size = 100 -# border_size = 2 -# border_color = $foreground -# position = 0, -100 -# halign = center -# valign = center -# } - -# # Desktop Environment -# image { -# monitor = -# path = /home/justin/Pictures/profile_pictures/hypr.png -# size = 75 -# border_size = 2 -# border_color = $foreground -# position = -50, 50 -# halign = right -# valign = bottom -# } - -# CURRENT SONG -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whatsong.sh)" -# color = $foreground -# #color = rgba(255, 255, 255, 0.6) -# font_size = 18 -# font_family = Metropolis Light, Font Awesome 6 Free Solid -# position = 0, 50 -# halign = center -# valign = bottom -# } - -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whoami.sh)" -# color = $foreground -# font_size = 14 -# font_family = JetBrains Mono -# position = 0, -10 -# halign = center -# valign = top -# } - -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/battery.sh)" -# color = $foreground -# font_size = 24 -# font_family = JetBrains Mono -# position = -90, -10 -# halign = right -# valign = top -# } - -# label { -# monitor = -# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/network-status.sh)" -# color = $foreground -# font_size = 24 -# font_family = JetBrains Mono -# position = -20, -10 -# halign = right -# valign = top -# } \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/monitors.conf b/configs/hyprland/mine/hypr/monitors.conf deleted file mode 100644 index 596a9c2..0000000 --- a/configs/hyprland/mine/hypr/monitors.conf +++ /dev/null @@ -1,10 +0,0 @@ -monitor=eDP-1,2256x1504@60.0,0x0,1.175 - -# Home External Monitors -monitor=DP-9,1920x1080@60.0,1420x-1085,1.0 -monitor=DP-10,1920x1080@60.0,-500x-1085,1.0 - -monitor=DP-11,1920x1080@60.0,1420x-1085,1.0 -monitor=DP-12,1920x1080@60.0,-500x-1085,1.0 - -monitor=*,preffered,auto,1 diff --git a/configs/hyprland/mine/hypr/syn_hyprland.conf b/configs/hyprland/mine/hypr/syn_hyprland.conf deleted file mode 100644 index ea7fee2..0000000 --- a/configs/hyprland/mine/hypr/syn_hyprland.conf +++ /dev/null @@ -1,2 +0,0 @@ -source = ~/.config/hypr/hyprland.d/*.conf -debug:enable_stdout_logs = true \ No newline at end of file diff --git a/configs/hyprland/mine/nwg-bar/bar.json b/configs/hyprland/mine/nwg-bar/bar.json deleted file mode 100644 index a874e8e..0000000 --- a/configs/hyprland/mine/nwg-bar/bar.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "label": "Sleep", - "exec": "systemctl suspend", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-suspend.svg" - }, - { - "label": "Hibernate", - "exec": "systemctl hibernate", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-hibernate.svg" - }, - { - "label": "Logout", - "exec": "hyprctl dispatch exit", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-log-out.svg" - }, - { - "label": "Reboot", - "exec": "systemctl reboot", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-reboot.svg" - }, - { - "label": "Shutdown", - "exec": "systemctl -i poweroff", - "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-shutdown.svg" - } -] \ No newline at end of file diff --git a/configs/hyprland/mine/nwg-bar/style.css b/configs/hyprland/mine/nwg-bar/style.css deleted file mode 100644 index 50e547d..0000000 --- a/configs/hyprland/mine/nwg-bar/style.css +++ /dev/null @@ -1,35 +0,0 @@ -window { - background-color: rgba (0, 0, 0, 1.0) -} - -/* Outer bar container, takes all the window width/height */ -#outer-box { - margin: 0px -} - -/* Inner bar container, surrounds buttons */ -#inner-box { - background-color: rgba (0, 0, 0, 0.85); - border-radius: 10px; - border-style: none; - border-width: 1px; - border-color: rgba (156, 142, 122, 0.7); - padding: 5px; - margin: 5px -} - -button, image { - background: none; - border: none; - box-shadow: none -} - -button { - padding-left: 10px; - padding-right: 10px; - margin: 5px -} - -button:hover { - background-color: rgba (255, 255, 255, 0.1) -} diff --git a/configs/hyprland/mine/waybar/config b/configs/hyprland/mine/waybar/config deleted file mode 100644 index bc45b55..0000000 --- a/configs/hyprland/mine/waybar/config +++ /dev/null @@ -1,129 +0,0 @@ -{ - "layer": "bottom", - "position": "bottom", - "mod": "dock", - "exclusive": true, - "gtk-layer-shell": true, - "margin-bottom": -1, - "passthrough": false, - "height": 41, - "modules-left": [ - "custom/os_button", - "hyprland/workspaces" - // "wlr/taskbar" - ], - "modules-center": [], - "modules-right": [ - "cpu", - // "temperature", - "memory", - // "disk", - // "tray", - "pulseaudio", - "network", - "battery", - "clock" - ], - "hyprland/workspaces": { - "icon-size": 32, - "spacing": 16, - "on-scroll-up": "hyprctl dispatch workspace r+1", - "on-scroll-down": "hyprctl dispatch workspace r-1" - }, - "custom/os_button": { - "format": "☕", - "on-click": "nwg-bar", - "tooltip": false - }, - "cpu": { - "interval": 5, - "format": "💻 {usage}%", - "max-length": 10 - }, - "temperature": { - "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon", - "input-filename": "temp2_input", - "critical-threshold": 75, - "tooltip": false, - "format-critical": "({temperatureC}°C)", - "format": "({temperatureC}°C)" - }, - "disk": { - "interval": 30, - "format": "💾 {percentage_used}%", - "path": "/", - "tooltip": true, - "unit": "GB", - "tooltip-format": "Available {free} of {total}" - }, - "memory": { - "interval": 10, - "format": "🐏 {percentage}%", - "max-length": 10, - "tooltip": true, - "tooltip-format": "RAM - {used:0.1f}GiB used" - }, - "wlr/taskbar": { - "format": "{icon} {title:.17}", - "icon-size": 28, - "spacing": 3, - "on-click-middle": "close", - "tooltip-format": "{title}", - "ignore-list": [], - "on-click": "activate" - }, - "tray": { - "icon-size": 18, - "spacing": 3 - }, - "clock": { - "format": " {:%R\n %d.%m.%Y}", - "actions": { - "on-click-right": "mode", - "on-click-forward": "tz_up", - "on-click-backward": "tz_down", - "on-scroll-up": "shift_up", - "on-scroll-down": "shift_down" - } - }, - "network": { - "format-wifi": " {icon}", - "format-ethernet": " 🔌 ", - "format-disconnected": " 🟥" - }, - "battery": { - "states": { - "good": 95, - "warning": 30, - "critical": 20 - }, - "format": "{icon} {capacity}%", - "format-charging": "🔋 {capacity}%", - "format-plugged": "🔌 {capacity}%", - "format-alt": "{time} {icon}", - "format-icons": [ - "🔋" - ] - }, - "pulseaudio": { - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-icons": { - "alsa_output.pci-0000_00_1f.3.analog-stereo": "", - "alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "", - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "phone-muted": "", - "portable": "", - "car": "", - "default": [ - "", - "" - ] - }, - "scroll-step": 1, - "on-click": "pavucontrol" - } -} \ No newline at end of file diff --git a/configs/hyprland/mine/waybar/style.css b/configs/hyprland/mine/waybar/style.css deleted file mode 100644 index f038def..0000000 --- a/configs/hyprland/mine/waybar/style.css +++ /dev/null @@ -1,181 +0,0 @@ - -/*base background color*/ -@define-color bg_main rgba(25, 25, 25, 0.65); -@define-color bg_main_tooltip rgba(0, 0, 0, 0.7); - - -/*base background color of selections */ -@define-color bg_hover rgba(200, 200, 200, 0.3); -/*base background color of active elements */ -@define-color bg_active rgba(100, 100, 100, 0.5); - -/*base border color*/ -@define-color border_main rgba(255, 255, 255, 0.2); - -/*text color for entries, views and content in general */ -@define-color content_main white; -/*text color for entries that are unselected */ -@define-color content_inactive rgba(255, 255, 255, 0.25); - -* { - text-shadow: none; - box-shadow: none; - border: none; - border-radius: 0; - font-family: "Fira Code", "Ubuntu"; - font-weight: 600; - font-size: 12.7px; -} - -window#waybar { - background: @bg_main; - border-top: 1px solid @border_main; - color: @content_main; -} - -tooltip { - background: @bg_main_tooltip; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: @border_main; -} -tooltip label{ - color: @content_main; -} - -#custom-os_button { - font-family: "JetBrainsMono Nerd Font"; - font-size: 24px; - padding-left: 12px; - padding-right: 20px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#custom-os_button:hover { - background: @bg_hover; - color: @content_main; -} - -#workspaces { - color: transparent; - margin-right: 1.5px; - margin-left: 1.5px; -} -#workspaces button { - padding: 3px; - color: @content_inactive; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#workspaces button.active { - color: @content_main; - border-bottom: 3px solid white; -} -#workspaces button.focused { - color: @bg_active; -} -#workspaces button.urgent { - background: rgba(255, 200, 0, 0.35); - border-bottom: 3px dashed @warning_color; - color: @warning_color; -} -#workspaces button:hover { - background: @bg_hover; - color: @content_main; -} - -#taskbar { -} - -#taskbar button { - min-width: 130px; - border-bottom: 3px solid rgba(255, 255, 255, 0.3); - margin-left: 2px; - margin-right: 2px; - padding-left: 8px; - padding-right: 8px; - color: white; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} - -#taskbar button.active { - border-bottom: 3px solid white; - background: @bg_active; -} - -#taskbar button:hover { - border-bottom: 3px solid white; - background: @bg_hover; - color: @content_main; -} - -#cpu, #disk, #memory { - padding:3px; -} - -#temperature { - color: transparent; - font-size: 0px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#temperature.critical { - padding-right: 3px; - color: @warning_color; - font-size: initial; - border-bottom: 3px dashed @warning_color; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} - -#window { - border-radius: 10px; - margin-left: 20px; - margin-right: 20px; -} - -#tray{ - margin-left: 5px; - margin-right: 5px; -} -#tray > .passive { - border-bottom: none; -} -#tray > .active { - border-bottom: 3px solid white; -} -#tray > .needs-attention { - border-bottom: 3px solid @warning_color; -} -#tray > widget { - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#tray > widget:hover { - background: @bg_hover; -} - -#pulseaudio { - font-family: "JetBrainsMono Nerd Font"; - padding-left: 3px; - padding-right: 3px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#pulseaudio:hover { - background: @bg_hover; -} - -#network { - padding-left: 3px; - padding-right: 3px; -} - -#language { - padding-left: 5px; - padding-right: 5px; -} - -#clock { - padding-right: 5px; - padding-left: 5px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); -} -#clock:hover { - background: @bg_hover; -} diff --git a/configs/hyprpanel/config.json b/configs/hyprpanel/config.json new file mode 100644 index 0000000..9630994 --- /dev/null +++ b/configs/hyprpanel/config.json @@ -0,0 +1,12 @@ +{ + "bar.customModules.storage.paths": [ + "/" + ], + "scalingPriority": "both", + "menus.power.lowBatteryNotification": true, + "menus.dashboard.shortcuts.enabled": false, + "menus.clock.time.military": true, + "menus.clock.weather.location": "Toronto", + "menus.clock.weather.unit": "imperial", + "theme.bar.menus.switch.puck": "#99c1f1" +} \ No newline at end of file diff --git a/configs/hyprpanel/modules.json b/configs/hyprpanel/modules.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/configs/hyprpanel/modules.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/workspaces.conf b/configs/hyprpanel/modules.scss similarity index 100% rename from configs/hyprland/mine/hypr/workspaces.conf rename to configs/hyprpanel/modules.scss diff --git a/configs/niri-config.kdl b/configs/niri-config.kdl index a834d2f..9005db3 100644 --- a/configs/niri-config.kdl +++ b/configs/niri-config.kdl @@ -24,8 +24,8 @@ environment { // ========================= // Outputs // ========================= -output "eDP-1" { - mode "1920x1080@120.030" +output "BOE 0x0BCA Unknown" { + mode "2256x1504@60" scale 1 transform "normal" position x=0 y=0 @@ -39,14 +39,14 @@ output "PNP(GWD) ARZOPA \\x15\\xd9F\\x1675US0000" { } // Two Screens in Office output "Samsung Electric Company S22R35x H4TR604392" { - mode "1920x1080@60.000" + mode "1920x1080@74.973" scale 1 transform "normal" position x=-960 y=-1080 } output "Samsung Electric Company S22R35x H4TR503886" { - mode "1920x1080@60.000" + mode "1920x1080@74.973" scale 1 transform "normal" position x=980 y=-1080 @@ -165,7 +165,8 @@ binds { Mod+F { maximize-column; } Mod+Shift+F { fullscreen-window; } Mod+Ctrl+F { reset-window-height; } - + Mod+V { toggle-window-floating; } + Mod+C { center-column; } Mod+Minus { set-column-width "-10%"; } @@ -174,7 +175,6 @@ binds { Mod+Shift+Minus { set-window-height "-10%"; } Mod+Shift+Equal { set-window-height "+10%"; } - Mod+V { toggle-window-floating; } Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } Print { screenshot; } diff --git a/flake.nix b/flake.nix index 2375175..3cc3b44 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,6 @@ systems.url = "github:nix-systems/default"; # Nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - # Hyprland - hyprland.url = "github:hyprwm/Hyprland"; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; # Flatpak nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager @@ -27,8 +21,6 @@ outputs = { self - , hyprland - , hyprland-plugins , nixos-hardware , nixpkgs , systems @@ -80,14 +72,11 @@ nix-flatpak ; specialArgs = { - inputs = { - inherit - hyprland hyprland-plugins; - }; + inputs = { }; }; }; # Libs - lib = (importmodules/lib.nix ({ + lib = (import modules/lib.nix ({ nixpkgs = nixpkgs; home-manager = home-manager; } // libConfig)); diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 1f8f15d..544607e 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -12,6 +12,7 @@ in ./crypto.nix ./gnome.nix ./tiler.nix + ./hyprland.nix ]; options = { diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix index 367e4dc..8582c70 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/hyprland.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let cfg = config.skyg.nixos.desktop.hyprland; - hyprPluginPkgs = inputs.hyprland-plugins.packages.${pkgs.system}; hypr-plugin-dir = pkgs.symlinkJoin { name = "hyrpland-plugins"; - paths = with hyprPluginPkgs; [ + paths = with pkgs.hyprlandPlugins; [ hyprexpo - #...plugins + hyprbars + hyprspace ]; }; in @@ -24,6 +24,11 @@ in withUWSM = true; }; programs.uwsm.enable = true; - environment.sessionVariables = { HYPR_PLUGIN_DIR = hypr-plugin-dir; }; + environment.systemPackages = with pkgs; [ + hyprls + ]; + environment.sessionVariables = { + HYPR_PLUGIN_DIR = hypr-plugin-dir; + }; }; }