diff --git a/configs/ABOUTME.md b/configs/ABOUTME.md index 11304b9..af6a5d4 100644 --- a/configs/ABOUTME.md +++ b/configs/ABOUTME.md @@ -4,13 +4,18 @@ Application configuration files that are symlinked into `~/.config/` via `system.userActivationScripts` (using `skygUtils.makeHyperlinkScriptToConfigs` from `modules/skyg-utils.nix`). +Most entries link `~/.config/` -> `configs/`. Some are host-scoped +and live under `configs//` — e.g. the Hyprland module links +`~/.config/hypr` -> `configs//hypr` (defaulting to the machine's +hostName). `makeHyperlinkScriptToConfigs` takes an optional `targetPath` for +these cases where the source subdir and `~/.config` target differ. + ## Contents | Path | Description | |---|---| | `niri/` | Niri Wayland compositor config | -| `hypr/` | Hyprland compositor config | -| `hyprpanel/` | HyprPanel bar/widget config | +| `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout + noctalia); linked to `~/.config/hypr` | | `extra.nu` | Extra NuShell config sourced at shell startup | | `fwbook.knsv` | fwbook-specific Kanshi display profile | | `libinput-gestures.conf` | Touchpad gesture bindings | diff --git a/configs/fwbook/hypr/ABOUTME.md b/configs/fwbook/hypr/ABOUTME.md new file mode 100644 index 0000000..aeb2020 --- /dev/null +++ b/configs/fwbook/hypr/ABOUTME.md @@ -0,0 +1,51 @@ +# configs/fwbook/hypr/ + +Host-specific Hyprland configuration for `fwbook`. Symlinked to `~/.config/hypr` +by the `skyg.nixos.desktop.tiler.hyprland` module, which defaults its +`configName` to the machine hostName (`configs/${hostName}/hypr`). + +## Why it lives here (and not configs/hypr) + +The Hyprland module links `configs//hypr` -> `~/.config/hypr`, with +`configName` defaulting to the hostName. Keeping the config under +`configs/fwbook/` lets each host own its own Hyprland tweaks (monitors, etc.) +without stepping on other machines. The old shared `configs/hypr/` (waybar + +hyprpanel) was removed when this replaced it. + +## Design + +- **Layout:** Hyprland's native `scrolling` layout (0.54+), no plugins required. + This mirrors niri's scrollable-tiling model. See `hyprland.d/general.conf`. +- **Shell:** noctalia (`noctalia-shell`), autostarted in `hyprland.d/autostart.conf`. + There is intentionally no waybar/hyprpanel here. +- **Keybinds:** `hyprland.d/keybindings.conf` mirrors `configs/niri/shared/binds.kdl` + and `configs/niri/noctalia/binds.kdl` as closely as Hyprland allows. +- **Overview:** there is no native Hyprland overview, and no overview plugin that + reliably builds against current Hyprland (hyprexpo was retired from the + official plugins repo; the community fork chases `main`). `Mod+Tab` falls back + to `cyclenext` instead of niri's `toggle-overview`. + +## Files + +``` +hypr/ +├── hyprland.conf # variables + sources hyprland.d/*.conf +├── screen-record.sh # wf-recorder toggle (bound to Mod+R) +└── hyprland.d/ + ├── env.conf # cursor size + Wayland/Qt/Electron env hints + ├── general.conf # scrolling layout, gaps/border/rounding + ├── monitors.conf # translated from configs/niri/shared/outputs.kdl + ├── inputs.conf # touchpad tap + natural scroll, kb us, swipe + ├── window-rules.conf # float small dialogs/utilities + ├── keybindings.conf # niri + noctalia binds, scrolling dispatchers + └── autostart.conf # noctalia, hypridle (via UWSM) +``` + +## Bindings without a clean 1:1 niri mapping + +- `Mod+Shift+H` (show-hotkey-overlay) — no native Hyprland equivalent; left commented. +- `Mod+Escape` (toggle-keyboard-shortcuts-inhibit) — no native equivalent; omitted. +- `Mod+W` (toggle-column-tabbed-display) — mapped to `togglegroup` as the nearest analog. +- `Mod+Tab` (toggle-overview) — no native overview / no buildable plugin; mapped to `cyclenext`. +- Workspace-to-monitor moves (niri used touchpad scroll) — approximated with + `Mod + mouse wheel`. diff --git a/configs/fwbook/hypr/hyprland.conf b/configs/fwbook/hypr/hyprland.conf new file mode 100644 index 0000000..a46c29b --- /dev/null +++ b/configs/fwbook/hypr/hyprland.conf @@ -0,0 +1,26 @@ +# ========================= +# Hyprland (fwbook) +# ========================= +# Mirrors the niri setup in configs/niri, adapted to Hyprland's native +# scrolling layout + the noctalia shell. This directory is symlinked to +# ~/.config/hypr by the skyg hyprland module +# (skyg.nixos.desktop.tiler.hyprland), defaulting to configs/${hostName}/hypr. + +# ========================= +# Variables +# ========================= +$mainMod = SUPER +$terminal = ghostty +$browser = chromium +$fileManager = nautilus + +# ========================= +# Sourced configuration +# ========================= +source = ~/.config/hypr/hyprland.d/env.conf +source = ~/.config/hypr/hyprland.d/general.conf +source = ~/.config/hypr/hyprland.d/monitors.conf +source = ~/.config/hypr/hyprland.d/inputs.conf +source = ~/.config/hypr/hyprland.d/window-rules.conf +source = ~/.config/hypr/hyprland.d/keybindings.conf +source = ~/.config/hypr/hyprland.d/autostart.conf diff --git a/configs/fwbook/hypr/hyprland.d/autostart.conf b/configs/fwbook/hypr/hyprland.d/autostart.conf new file mode 100644 index 0000000..3291bc6 --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/autostart.conf @@ -0,0 +1,11 @@ +# ========================= +# Autostart +# ========================= +# Launched via UWSM (`uwsm app --`) so processes land in the correct +# systemd scope for the graphical session. + +# noctalia shell (bar / launcher / control center / notifications) +exec-once = uwsm app -- noctalia-shell + +# Idle management +exec-once = uwsm app -- hypridle diff --git a/configs/fwbook/hypr/hyprland.d/env.conf b/configs/fwbook/hypr/hyprland.d/env.conf new file mode 100644 index 0000000..adbb4ca --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/env.conf @@ -0,0 +1,11 @@ +# ========================= +# Environment +# ========================= +# Mirrors the environment block in configs/niri/shared/general.kdl. + +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 +env = NIXOS_OZONE_WL,1 +env = QT_QPA_PLATFORM,wayland +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 +env = ELECTRON_OZONE_PLATFORM_HINT,auto diff --git a/configs/fwbook/hypr/hyprland.d/general.conf b/configs/fwbook/hypr/hyprland.d/general.conf new file mode 100644 index 0000000..34dac4f --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/general.conf @@ -0,0 +1,36 @@ +# ========================= +# General / Layout +# ========================= +# Native scrolling layout (Hyprland 0.54+) — no plugins needed. This mirrors +# niri's scrollable-tiling model. Gaps/border/corner-radius mirror +# configs/niri/shared/layout.kdl (gaps 5, border 2, corner radius 12). + +general { + gaps_in = 5 + gaps_out = 5 + border_size = 2 + layout = scrolling + resize_on_border = true +} + +decoration { + rounding = 12 +} + +# https://wiki.hypr.land/Configuring/Layouts/Scrolling-Layout/ +scrolling { + # Default column width as a fraction of the screen [0.1 - 1.0]. + column_width = 0.5 + # A lone column fills the screen (matches niri's single-column feel). + fullscreen_on_one_column = true + # Center the focused column when it comes into view (niri-like). + focus_fit_method = 0 + follow_focus = true + explicit_column_widths = 0.333, 0.5, 0.667, 1.0 +} + +# Disable Hyprland's built-in hot-corner-esque behaviours (niri: hot-corners off). +misc { + disable_hyprland_logo = true + focus_on_activate = true +} diff --git a/configs/fwbook/hypr/hyprland.d/inputs.conf b/configs/fwbook/hypr/hyprland.d/inputs.conf new file mode 100644 index 0000000..11126c3 --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/inputs.conf @@ -0,0 +1,26 @@ +# ========================= +# Input +# ========================= +# Mirrors configs/niri/shared/general.kdl (touchpad tap + natural scroll) +# and the old inputs (kb_layout = us). + +input { + kb_layout = us + follow_mouse = 1 + + touchpad { + natural_scroll = true + tap-to-click = true + disable_while_typing = true + } + + touchscreen { + transform = 0 + } +} + +# Three-finger horizontal swipe to move across workspaces (niri-like). +gestures { + workspace_swipe = true + workspace_swipe_fingers = 3 +} diff --git a/configs/fwbook/hypr/hyprland.d/keybindings.conf b/configs/fwbook/hypr/hyprland.d/keybindings.conf new file mode 100644 index 0000000..6490899 --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/keybindings.conf @@ -0,0 +1,123 @@ +# ========================= +# Keybindings +# ========================= +# Mirrors configs/niri/shared/binds.kdl and configs/niri/noctalia/binds.kdl, +# adapted to Hyprland's scrolling-layout dispatchers (layoutmsg ...). + +$mainMod = SUPER + +# ========================= +# General / Apps +# ========================= +# niri: Mod+Shift+H show-hotkey-overlay — no native Hyprland equivalent. +# bind = $mainMod SHIFT, H, exec, +bind = $mainMod, T, exec, $terminal +bind = $mainMod, B, exec, $browser +bind = $mainMod, E, exec, wofi-emoji +bind = $mainMod, Q, killactive + +# ========================= +# Navigation +# ========================= +bind = $mainMod, Left, movefocus, l +bind = $mainMod, Right, movefocus, r +# niri workspaces are vertical stacks; map Up/Down to workspace switching. +bind = $mainMod, Up, workspace, e-1 +bind = $mainMod, Down, workspace, e+1 + +# niri: toggle-overview — no native Hyprland overview (and no maintained plugin +# that builds against current Hyprland), so fall back to cycling windows. +bind = $mainMod, Tab, cyclenext +# niri: focus-monitor-next +bind = $mainMod SHIFT, Tab, focusmonitor, +1 + +# ========================= +# Window Management +# ========================= +# niri swap-window-left/right -> scrolling swapcol +bind = $mainMod CTRL, Right, layoutmsg, swapcol r +bind = $mainMod CTRL, Left, layoutmsg, swapcol l +# niri move-window-to-workspace-up/down +bind = $mainMod CTRL, Up, movetoworkspace, e-1 +bind = $mainMod CTRL, Down, movetoworkspace, e+1 + +# niri: toggle-column-tabbed-display (closest: group/tab windows together) +bind = $mainMod, W, togglegroup +# niri: maximize-column (fill screen, keep bar) +bind = $mainMod, F, fullscreen, 1 +# niri: fullscreen-window (true fullscreen) +bind = $mainMod SHIFT, F, fullscreen, 0 +# niri: reset-window-height (scrolling has no per-window height; refit column) +bind = $mainMod CTRL, F, layoutmsg, fit_into_view +# niri: toggle-window-floating +bind = $mainMod, V, togglefloating +# niri: center-column (recenter focused column in view) +bind = $mainMod, C, layoutmsg, focus current + +# ========================= +# Resizing +# ========================= +# niri set-column-width -/+10% -> scrolling colresize +bind = $mainMod, Minus, layoutmsg, colresize -0.1 +bind = $mainMod, Equal, layoutmsg, colresize +0.1 +# niri set-window-height -/+10% +bind = $mainMod SHIFT, Minus, resizeactive, 0 -10% +bind = $mainMod SHIFT, Equal, resizeactive, 0 +10% + +# ========================= +# Screenshots & Recording +# ========================= +bind = , Print, exec, grim -g "$(slurp)" - | satty -f - +bind = $mainMod, P, exec, grim -g "$(slurp)" - | satty -f - +bind = $mainMod, R, exec, ~/.config/hypr/screen-record.sh + +# ========================= +# Session +# ========================= +# niri: Mod+Escape toggle-keyboard-shortcuts-inhibit — no native equivalent. +bind = CTRL ALT, Delete, exit + +# ========================= +# Monitor Movement +# ========================= +# niri move-column-to-monitor-{down,left,right,up} +bind = $mainMod ALT, Down, movewindow, mon:d +bind = $mainMod ALT, Left, movewindow, mon:l +bind = $mainMod ALT, Right, movewindow, mon:r +bind = $mainMod ALT, Up, movewindow, mon:u + +# niri moved workspaces between monitors via touchpad scroll; approximate with +# Mod + mouse wheel (move current workspace to next/prev monitor). +bind = $mainMod, mouse_down, movecurrentworkspacetomonitor, +1 +bind = $mainMod, mouse_up, movecurrentworkspacetomonitor, -1 + +# ========================= +# Mouse drag (move / resize windows) +# ========================= +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# ========================= +# Noctalia shell (mirrors configs/niri/noctalia/binds.kdl) +# ========================= +bind = $mainMod, Space, exec, noctalia-shell ipc call launcher toggle +bind = $mainMod, S, exec, noctalia-shell ipc call controlCenter toggle +bind = $mainMod, Comma, exec, noctalia-shell ipc call settings toggle + +# Clipboard history +bind = $mainMod ALT, P, exec, rofi -modi "clipboard:greenclip print" -show clipboard +# Dismiss all notifications +bind = $mainMod ALT, L, exec, noctalia-shell ipc call notifications dismissAll + +# Media & brightness +bind = $mainMod SHIFT, Up, exec, noctalia-shell ipc call volume increase +bind = $mainMod SHIFT, Down, exec, noctalia-shell ipc call volume decrease +bind = $mainMod SHIFT, Right, exec, playerctl next +bind = $mainMod SHIFT, Left, exec, playerctl previous +bind = $mainMod SHIFT, Space, exec, playerctl play-pause + +bindl = , XF86AudioRaiseVolume, exec, noctalia-shell ipc call volume increase +bindl = , XF86AudioLowerVolume, exec, noctalia-shell ipc call volume decrease +bindl = , XF86AudioMute, exec, noctalia-shell ipc call volume muteOutput +bindl = , XF86MonBrightnessUp, exec, noctalia-shell ipc call brightness increase +bindl = , XF86MonBrightnessDown, exec, noctalia-shell ipc call brightness decrease diff --git a/configs/fwbook/hypr/hyprland.d/monitors.conf b/configs/fwbook/hypr/hyprland.d/monitors.conf new file mode 100644 index 0000000..d7d997e --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/monitors.conf @@ -0,0 +1,24 @@ +# ========================= +# Monitors +# ========================= +# Translated from configs/niri/shared/outputs.kdl. +# Format: monitor = name-or-desc, resolution@hz, positionXxY, scale + +# Laptop internal panel +monitor = eDP-1, 2256x1504@60, 859x1080, 1.5 + +# Work monitor (ASUS VE278) +monitor = desc:Ancor Communications Inc ASUS VE278 E5LMTF016849, 1920x1080@60, 1027x0, 1 + +# Assorted external displays +monitor = DP-9, 1920x1080@74.97, 0x0, 1 +monitor = desc:Samsung Electric Company S22R35x H4TR604392, 1920x1080@60, 106x0, 1 +monitor = DP-10, 1920x1080@74.97, 1920x0, 1 +monitor = desc:Samsung Electric Company S22R35x H4TR503886, 1920x1080@60, 2026x0, 1 +monitor = desc:PNP(GWD) ARZOPA, 1920x1080@60, 2860x1080, 1 +monitor = DP-2, 1920x1080@60, 3115x1504, 1 +monitor = desc:Dell Inc. DELL SE3223Q 1WDWKK3, preferred, 4780x0, 2 +monitor = desc:Dell Inc. DELL SE3223Q 1TRXKK3, preferred, 6700x0, 2 + +# Fallback for anything not explicitly configured above +monitor = , preferred, auto, auto diff --git a/configs/fwbook/hypr/hyprland.d/window-rules.conf b/configs/fwbook/hypr/hyprland.d/window-rules.conf new file mode 100644 index 0000000..5ba98d0 --- /dev/null +++ b/configs/fwbook/hypr/hyprland.d/window-rules.conf @@ -0,0 +1,13 @@ +# ========================= +# Window Rules +# ========================= +# Rounding/clip is handled globally in general.conf (decoration.rounding = 12), +# mirroring the niri window-rule (geometry-corner-radius 12, clip-to-geometry). +# Below: float the small control/dialog utilities so they don't tile. + +windowrulev2 = float, class:^(pavucontrol)$ +windowrulev2 = float, class:^(blueman-manager)$ +windowrulev2 = float, class:^(org.gnome.Calculator)$ +windowrulev2 = float, title:^(Open File)$ +windowrulev2 = float, title:^(Save File)$ +windowrulev2 = float, class:^(xdg-desktop-portal-gtk)$ diff --git a/configs/fwbook/hypr/screen-record.sh b/configs/fwbook/hypr/screen-record.sh new file mode 100755 index 0000000..05a06c4 --- /dev/null +++ b/configs/fwbook/hypr/screen-record.sh @@ -0,0 +1,32 @@ +#!/bin/sh +set -e + +_SCREEN_RECORD_DIR="$HOME/Videos/ScreenRecordings" +mkdir -p "$_SCREEN_RECORD_DIR" + + +if pgrep -x "wf-recorder" > /dev/null; then + last_cmd=$(pgrep -x "wf-recorder" -a) + filepath="${last_cmd##* -f }" + filepath="${filepath%% *}" + pgrep -x "wf-recorder" && pkill -INT -x wf-recorder + notify-send -h string:wf-recorder:record -t 5000 "Finished Recording. Saved at $filepath." + echo $filepath | xclip -selection clipboard + exit 0 +fi + +dims=$(slurp) +notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "3" + +sleep 1 + +notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "2" + +sleep 1 + +notify-send -h string:wf-recorder:record -t 950 "Recording in:" "1" + +sleep 1 + +dateTime=$(date +%Y-%m-%d-%H_%M_%S) +wf-recorder --bframes max_b_frames -g "${dims}" -f $_SCREEN_RECORD_DIR/$dateTime.mp4 \ No newline at end of file diff --git a/configs/hypr/dms/colors.conf b/configs/hypr/dms/colors.conf deleted file mode 100644 index 30f8195..0000000 --- a/configs/hypr/dms/colors.conf +++ /dev/null @@ -1,25 +0,0 @@ -# ! Auto-generated file. Do not edit directly. -# Remove source = ./dms/colors.conf from your config to override. - -$primary = rgb(42a5f5) -$outline = rgb(8c9199) -$error = rgb(f2b8b5) - -general { - col.active_border = $primary - col.inactive_border = $outline -} - -group { - col.border_active = $primary - col.border_inactive = $outline - col.border_locked_active = $error - col.border_locked_inactive = $outline - - groupbar { - col.active = $primary - col.inactive = $outline - col.locked_active = $error - col.locked_inactive = $outline - } -} diff --git a/configs/hypr/hypridle.conf b/configs/hypr/hypridle.conf deleted file mode 100644 index 9d2934b..0000000 --- a/configs/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 = notify-send 'Locking..' - on-resume = notify-send 'Stopping lock process..' -} - -listener { - timeout = 300 # 5min - on-timeout = hyprlock && 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 = 380 # 5.5min - on-timeout = systemctl suspend # suspend pc -} diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf deleted file mode 100644 index 1bb2650..0000000 --- a/configs/hypr/hyprland.conf +++ /dev/null @@ -1,6 +0,0 @@ -$terminal = ghostty -$fileManager = dolphin -$menu = dms ipc call spotlight toggle -$browser = chromium - -source = ~/.config/hypr/hyprland.d/*.conf diff --git a/configs/hypr/hyprland.d/envs.conf b/configs/hypr/hyprland.d/envs.conf deleted file mode 100644 index dfabf35..0000000 --- a/configs/hypr/hyprland.d/envs.conf +++ /dev/null @@ -1,2 +0,0 @@ -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_SIZE,24 diff --git a/configs/hypr/hyprland.d/exec.conf b/configs/hypr/hyprland.d/exec.conf deleted file mode 100644 index 938509d..0000000 --- a/configs/hypr/hyprland.d/exec.conf +++ /dev/null @@ -1,2 +0,0 @@ -# exec-once = nm-applet & -# exec-once = $HOME/.config/hypr/start-up-script.sh diff --git a/configs/hypr/hyprland.d/inputs.conf b/configs/hypr/hyprland.d/inputs.conf deleted file mode 100644 index 1286ffd..0000000 --- a/configs/hypr/hyprland.d/inputs.conf +++ /dev/null @@ -1,9 +0,0 @@ - -input { - kb_layout = us - touchpad { - natural_scroll = true - } -} - -gesture = 3, horizontal, workspace diff --git a/configs/hypr/hyprland.d/keybindings.conf b/configs/hypr/hyprland.d/keybindings.conf deleted file mode 100644 index a294854..0000000 --- a/configs/hypr/hyprland.d/keybindings.conf +++ /dev/null @@ -1,107 +0,0 @@ - -$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 - -# === Launcher & Apps === -bind = $mainMod SHIFT, H, exec, show-hotkey-overlay -bind = $mainMod, Z, exec, flatpak run app.zen_browser.zen -bind = $mainMod, B, exec, chromium -bind = $mainMod, E, exec, wofi-emoji -# bind = $mainMod ALT, L, exec, makoctl dismiss -a - -# === 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 - -bindl = , XF86AudioRaiseVolume, exec, dms ipc call audio increment 10 -bindl = , XF86AudioLowerVolume, exec, dms ipc call audio decrement 10 -bindl = , XF86AudioMute, exec, dms ipc call audio mute -bindl = , XF86AudioMicMute, exec, dms ipc call audio micmute -bindl = , XF86MonBrightnessUp, exec, dms ipc call brightness increment 10 "" -bindl = , XF86MonBrightnessDown, exec, dms ipc call brightness decrement 10 "" - - -# === Window Focus === -bind = $mainMod, LEFT, movefocus, l -bind = $mainMod, RIGHT, movefocus, r -bind = $mainMod, UP, movefocus, u -bind = $mainMod, DOWN, movefocus, d - -# Next monitor -bind = $mainMod SHIFT, TAB, focusmonitor, e # e = next monitor - - -# Overview -bind = $mainMod, TAB, exec, dms ipc call hypr toggleOverview - -# === 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 - -# === 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% - -# === 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 deleted file mode 100644 index ee2beb9..0000000 --- a/configs/hypr/hyprland.d/layout.conf +++ /dev/null @@ -1,40 +0,0 @@ -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 - animation = fade, 0 -} -master { - new_status = master -} -misc { - force_default_wallpaper = 1 - disable_hyprland_logo = false - focus_on_activate = true -} diff --git a/configs/hypr/hyprland.d/monitors.conf b/configs/hypr/hyprland.d/monitors.conf deleted file mode 100644 index 6ec55f5..0000000 --- a/configs/hypr/hyprland.d/monitors.conf +++ /dev/null @@ -1,10 +0,0 @@ - -# 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 deleted file mode 100644 index 30284f2..0000000 --- a/configs/hypr/hyprland.d/plugins.conf +++ /dev/null @@ -1,13 +0,0 @@ -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/hypr/hyprland.d/window-rules.conf b/configs/hypr/hyprland.d/window-rules.conf deleted file mode 100644 index 9cc043d..0000000 --- a/configs/hypr/hyprland.d/window-rules.conf +++ /dev/null @@ -1,2 +0,0 @@ -windowrule = suppressevent maximize, class:.* -windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/configs/hypr/hyprlock b/configs/hypr/hyprlock deleted file mode 100644 index 7172b87..0000000 --- a/configs/hypr/hyprlock +++ /dev/null @@ -1,96 +0,0 @@ -$userName = "ari" -$profilePhoto = /var/lib/AccountsService/icons/$userName -$background = rgb(255,0,0) -$foreground = rgb(0,255,0) - -# BACKGROUND -background { - monitor = - # path = /home/justin/Pictures/wal.png - color = $background - 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 = $profilePhoto - size = 100 - border_size = 2 - border_color = $foreground - position = 0, -100 - halign = center - valign = center -} - -# Desktop Environment -image { - monitor = - path = $profilePhoto - size = 75 - border_size = 2 - border_color = $foreground - position = -50, 50 - halign = right - valign = bottom -} diff --git a/configs/hypr/start-up-script.sh b/configs/hypr/start-up-script.sh deleted file mode 100755 index 6819893..0000000 --- a/configs/hypr/start-up-script.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -killall -q waybar -sleep 1 - -waybar --config /home/ari/nixos-setup/configs/hypr/waybar/bottom-bar.jsonc --style /home/ari/nixos-setup/configs/hypr/waybar/bottom-bar.css & -waybar --config /home/ari/nixos-setup/configs/hypr/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/hypr/waybar/top-bar.css & -waypaper --restore - -killall -q hypridle -hypridle & - -killall -q swayosd-server -swayosd-server & -killall -q walker -walker --gapplication-service & - -notify-send "Hyprland Startup Script" "Completed 🎉" diff --git a/configs/hypr/waybar/bottom-bar.css b/configs/hypr/waybar/bottom-bar.css deleted file mode 100644 index ea867ca..0000000 --- a/configs/hypr/waybar/bottom-bar.css +++ /dev/null @@ -1,88 +0,0 @@ -* { - font-family: "Fira Code", "SF Pro Display", sans-serif; - font-size: 10px; -} - -window#waybar { - background-color: transparent; - color: #ffffff; -} - -window#waybar.hidden { - opacity: 0.2; -} - -/* === Reset button styles === */ - -/* button { - box-shadow: none; - border: none; - border-radius: 0; - transition: background-color 0.15s ease, border-color 0.15s ease; -} - -button:hover { - background: none; - box-shadow: none; - text-shadow: none; - border: none; - -gtk-icon-effect: none; - -gtk-icon-shadow: none; -} */ - -/* === Workspaces as a tray === */ -/* #workspaces { - margin: 0 10px; - padding: 0 4px; - background: transparent; - border-bottom: 2px solid rgba(255, 255, 255, 0.15); -} - -#workspaces button { - background: transparent; - color: #ffffff; - margin: 0 6px; - padding: 6px 10px; - border-radius: 0; - border-bottom: 2px solid transparent; -} - -#workspaces button:hover { - border-bottom: 2px solid rgba(255, 255, 255, 0.5); -} - -#workspaces button.focused { - border-bottom: 2px solid rgba(255, 255, 255, 0.9); -} - -#workspaces button.urgent { - border-bottom: 2px solid #eb4d4b; -} */ - -/* === Taskbar as a tray === */ -/* #taskbar { - background: transparent; - margin: 0 10px; - padding: 0 4px; - border-bottom: 2px solid rgba(255, 255, 255, 0.15); -} - -#taskbar button { - color: #f0f0ff; - margin: 0 6px; - padding: 6px 10px; - border-radius: 0; - border-bottom: 2px solid transparent; -} - -#taskbar button:hover { - border-bottom: 2px solid rgba(255, 255, 255, 0.5); -} - -#taskbar button.active { - border-bottom: 2px solid rgba(255, 255, 255, 0.9); -} - -#taskbar button.active:hover { - border-bottom: 2px solid rgba(255, 255, 255, 1.0); -} */ \ No newline at end of file diff --git a/configs/hypr/waybar/bottom-bar.jsonc b/configs/hypr/waybar/bottom-bar.jsonc deleted file mode 100644 index 0c80c42..0000000 --- a/configs/hypr/waybar/bottom-bar.jsonc +++ /dev/null @@ -1,20 +0,0 @@ -{ - "reload_style_on_change": true, - "layer": "top", - "position": "bottom", - "height": 10, - "margin-top": 0, - "margin-bottom": 4, - "margin-left": 4, - "margin-right": 4, - "spacing": 0, - "modules-left": ["hyprland/workspaces"], - "modules-center": ["wlr/taskbar"], - "modules-right": [], - "niri/workspaces": {}, - "wlr/taskbar": { - "tooltip": true, - "tooltip-format": "{title}", - "on-click": "activate", - }, -} diff --git a/configs/hypr/waybar/mocha.css b/configs/hypr/waybar/mocha.css deleted file mode 100644 index 67f20b5..0000000 --- a/configs/hypr/waybar/mocha.css +++ /dev/null @@ -1,26 +0,0 @@ -@define-color rosewater #f5e0dc; -@define-color flamingo #f2cdcd; -@define-color pink #f5c2e7; -@define-color mauve #cba6f7; -@define-color red #f38ba8; -@define-color maroon #eba0ac; -@define-color peach #fab387; -@define-color yellow #f9e2af; -@define-color green #a6e3a1; -@define-color teal #94e2d5; -@define-color sky #89dceb; -@define-color sapphire #74c7ec; -@define-color blue #89b4fa; -@define-color lavender #b4befe; -@define-color text #cdd6f4; -@define-color subtext1 #bac2de; -@define-color subtext0 #a6adc8; -@define-color overlay2 #9399b2; -@define-color overlay1 #7f849c; -@define-color overlay0 #6c7086; -@define-color surface2 #585b70; -@define-color surface1 #45475a; -@define-color surface0 #313244; -@define-color base #1e1e2e; -@define-color mantle #181825; -@define-color crust #11111b; \ No newline at end of file diff --git a/configs/hypr/waybar/top-bar.css b/configs/hypr/waybar/top-bar.css deleted file mode 100644 index ea5065d..0000000 --- a/configs/hypr/waybar/top-bar.css +++ /dev/null @@ -1,265 +0,0 @@ -* { - font-family: "Fira Code"; - font-size: 14px; -} - -window#waybar { - background-color: rgba(30, 30, 46, 0.5); - color: #ffffff; -} - -window#waybar.hidden { - opacity: 0.2; -} - -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - -button { - box-shadow: none; - border: none; - border-radius: 0; - transition-property: none; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -button:hover { - background: none; - box-shadow: none; - text-shadow: none; - border: none; - -gtk-icon-effect: none; - -gtk-icon-shadow: none; -} - -#workspaces button { - background-color: transparent; - color: #ffffff; -} - -#workspaces button:hover { - background: rgba(0, 0, 0, 0.2); -} - -#workspaces button.focused { - background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; -} - -#workspaces button.urgent { - background-color: #eb4d4b; -} - -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; -} - -#clock, -#battery, -#cpu, -#memory, -#disk, -#temperature, -#backlight, -#network, -#pulseaudio, -#wireplumber, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#keyboard-state, -#scratchpad, -#custom-logout, -#mpd { - padding: 0px 10px; - margin-right: 1px; - color: #f0f0ff; - border-radius: 5px; -} - -#window, -#workspaces { - margin: 0 4px; -} - -.modules-left>widget:first-child>#workspaces { - margin-left: 0; -} - -.modules-right>widget:last-child>#workspaces { - margin-right: 0; -} - -#clock { - font-weight: bold; -} - -#battery { - margin-left: 4px; -} - -#battery.charging, -#battery.plugged { - color: #ffffff; - background-color: rgba(38, 166, 91, 0.9); -} - -@keyframes blink { - to { - background-color: rgba(255, 255, 255, 0.9); - color: #000000; - } -} - -#battery.critical:not(.charging) { - background-color: rgba(245, 60, 60, 0.9); - color: #fff; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - -label:focus { - background-color: rgba(0, 0, 0, 0.9); -} - -#network.disconnected { - background-color: rgba(245, 60, 60, 0.9); -} - - -#taskbar { - margin-left: 4px; -} - -#taskbar button { - color: #f0f0ff; - background-color: rgba(30, 30, 46, 0.6); -} - -#taskbar button:first-child { - border-radius: 99px 0 0 99px; -} - -#taskbar button:last-child { - border-radius: 0 99px 99px 0; -} - -#taskbar button:first-child:last-child { - border-radius: 99px; -} - -#taskbar button:hover { - background-color: rgba(49, 50, 68, 0.6); -} - -#taskbar button.active { - background-color: rgba(88, 91, 112, 0.6); -} - -#taskbar button.active:hover { - background-color: rgba(108, 112, 134, 0.6); -} - - -#pulseaudio.muted { - background-color: rgba(46, 32, 30, 0.9); -} - -slider { - min-height: 0px; - min-width: 0px; - opacity: 0; - background-image: none; - border: none; - box-shadow: none; -} - -trough { - min-height: 10px; - min-width: 80px; - border-radius: 5px; - background-color: black; -} - -highlight { - min-width: 10px; - border-radius: 5px; - background-color: green; -} - -#wireplumber { - background-color: rgba(255, 240, 245, 0.8); - color: #000000; -} - -#wireplumber.muted { - background-color: rgba(245, 60, 60, 0.9); -} - - -#temperature.critical { - background-color: rgba(235, 77, 75, 0.8); -} - -#tray { - background-color: rgba(41, 128, 185, 0.8); -} - -#tray>.passive { - -gtk-icon-effect: dim; -} - -#tray>.needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#language { - background: #00b093; - color: #740864; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state { - background: rgba(151, 225, 173, 0.8); - color: #000000; -} - -#keyboard-state>label { - margin-left: 2.5px; - margin-right: 2.5px; - padding: 0 5px; -} - -#keyboard-state>label.locked { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad.empty { - background-color: transparent; -} \ No newline at end of file diff --git a/configs/hypr/waybar/top-bar.jsonc b/configs/hypr/waybar/top-bar.jsonc deleted file mode 100644 index 34fa3be..0000000 --- a/configs/hypr/waybar/top-bar.jsonc +++ /dev/null @@ -1,190 +0,0 @@ -{ - "reload_style_on_change": true, - "layer": "top", // Waybar at top layer - "height": 32, // Waybar height (to be removed for auto height) - "margin-top": 4, - "margin-left": 4, - "margin-right": 4, - "spacing": 0, // Gaps between modules (4px) - "modules-left": [ - "niri/window" - ], - "modules-center": [ - "privacy", - "clock", - ], - "modules-right": [ - "group/controls", - "battery", - "group/sound", - "group/backlight", - "tray", - "mpd", - // "jack", - // "wireplumber", - "custom/logout" - ], - // Modules configuration - "group/sound": { - "click-to-reveal": true, - "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "transition-left-to-right": true - }, - "modules": [ - "pulseaudio", - "pulseaudio/slider" - ] - }, - "group/backlight": { - "click-to-reveal": true, - "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "transition-left-to-right": true - }, - "modules": [ - "backlight", - "backlight/slider" - ] - }, - "pulseaudio/slider": { - "min": 0, - "max": 100, - "orientation": "horizontal", - }, - "custom/logout": { - "format": "⏻", - "tooltip": true, - "on-click": "nwg-bar" - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format-icons": { - "locked": "", - "unlocked": "" - }, - "format": { - "numlock": "N {icon}", - "capslock": "C {icon}" - } - }, - "niri/window": { - "icon": true, - "format": "{app_id}/{title}" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - "spacing": 10 - }, - "custom/controls": { - "format": "🎛️", - "tooltip": true - }, - "group/controls": { - "click-to-reveal": true, - "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "transition-left-to-right": false - }, - "modules": [ - "custom/controls", - "network", - "cpu", - "memory", - "temperature", - "idle_inhibitor", - "keyboard-state" - ] - }, - "clock": { - "tooltip-format": "{:%Y %B}\n{calendar}", - "format": "{:%e %B %H:%M}", - "on-click": "gnome-calendar" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "temperature": { - "critical-threshold": 80, - "format": "{temperatureC}°C {icon}", - "format-icons": [ - "", - "", - "" - ] - }, - "backlight": { - "format": "{icon}", - "format-icons": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "battery": { - "states": { - "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - "format-icons": [ - "", - "", - "", - "", - "" - ] - }, - "network": { - "format": "{ifname} {essid}", - "tooltip-format": "{ifname} {ipaddr}/{cidr} {essid} {icon} {frequency} {signaldBm}", - "on-click": "nmcli device wifi rescan && ghostty -e nmtui" - }, - "pulseaudio": { - "format": "{icon}", - "format-bluetooth": "{volume}% {icon}", - "format-bluetooth-muted": " {icon}", - "format-muted": "", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": [ - "", - "", - "" - ] - }, - "on-click": "/run/current-system/sw/bin/flatpak run org.pipewire.Helvum" - // "on-click": "/run/current-system/sw/bin/pavucontrol" - } -} \ No newline at end of file diff --git a/configs/hyprpanel/config.json b/configs/hyprpanel/config.json deleted file mode 100644 index 9630994..0000000 --- a/configs/hyprpanel/config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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 deleted file mode 100644 index 9e26dfe..0000000 --- a/configs/hyprpanel/modules.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/configs/hyprpanel/modules.scss b/configs/hyprpanel/modules.scss deleted file mode 100644 index e69de29..0000000 diff --git a/flake.lock b/flake.lock index 2e71cbe..f568669 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,39 @@ } }, "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1787400831, + "narHash": "sha256-H3MEkFDZf+UH+QrVgW8TdKrssPFltF8fBg/rh0J1zIc=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "7ce889cb78b97979b83a4648509fc3ef405c3286", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, + "aquamarine_2": { "inputs": { "hyprutils": [ "hyprlauncher", @@ -361,6 +394,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -627,7 +676,65 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464181, + "narHash": "sha256-2alOMkLjXANh7unkZnYnCF2K2rApZaOLMoQ3o+VX2CY=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "e4ed7c08123df5af460a0a70961380cbfb872f76", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464367, + "narHash": "sha256-k58p4wbzIXWyRWrW84pP8tD+iaZSSYiiM+fr0Auk4oU=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "7c895c44e3ca6d28ed68ddd80ec02b02b925e7fc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprgraphics_2": { "inputs": { "hyprutils": [ "hyprlauncher", @@ -656,7 +763,137 @@ "type": "github" } }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", + "nixpkgs": "nixpkgs_6", + "pre-commit-hooks": "pre-commit-hooks_2", + "systems": "systems_3", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1787612295, + "narHash": "sha256-K7sUeS1tKTSDu+aQK0ZwCxJCls+JzDj1qeTJRGk+CV8=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0bd11c7a04a63d2785abd53363f09d552175d67d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464504, + "narHash": "sha256-7sHwM86KILQyHDHDuE2SDBlQ2jvZ0EW3hY7sW009/cg=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "4c30cf3097ea963c0e250749ee0c59f8b08816d6", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464129, + "narHash": "sha256-339AkTlpMYSIvFuG0rnR+8Yg4/AZKeJalshJavlnKfg=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "9508458be316a0d70d37ebed1ab725ccd10411ff", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "hyprutils": [ "hyprlauncher", @@ -685,7 +922,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprlang_3": { "inputs": { "hyprutils": [ "hyprlauncher", @@ -719,15 +956,15 @@ }, "hyprlauncher": { "inputs": { - "aquamarine": "aquamarine", - "hyprgraphics": "hyprgraphics", - "hyprlang": "hyprlang", - "hyprtoolkit": "hyprtoolkit", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_6", - "systems": "systems_3" + "aquamarine": "aquamarine_2", + "hyprgraphics": "hyprgraphics_2", + "hyprlang": "hyprlang_2", + "hyprtoolkit": "hyprtoolkit_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwire": "hyprwire_2", + "nixpkgs": "nixpkgs_7", + "systems": "systems_4" }, "locked": { "lastModified": 1786644260, @@ -744,6 +981,58 @@ } }, "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1785930473, + "narHash": "sha256-DitTu625BhEYpZjtjxtGpjrEJwPwW+X/+jJvhSZNSJM=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "af515b69dfbe366dc7873aa1475cb2f4db3ebad7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprtoolkit_2": { "inputs": { "aquamarine": [ "hyprlauncher", @@ -753,7 +1042,7 @@ "hyprlauncher", "hyprgraphics" ], - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang_3", "hyprutils": [ "hyprlauncher", "hyprutils" @@ -786,6 +1075,31 @@ } }, "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786903207, + "narHash": "sha256-QTwMqLLONRhv9iz6CVeuX6BqQNQCIqI8hL/cPYlR/24=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "6cf50415e06dc6bd9f1252f1b745eac6b4a1cc39", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprlauncher", @@ -811,6 +1125,31 @@ } }, "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464033, + "narHash": "sha256-QM8Qe4/L8lpdVN4bgwahmi+jyyc4fisseDMe4afcDxA=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "62e62c1ca23da17612c6890d4ad2064f575643db", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprlauncher", @@ -836,6 +1175,35 @@ } }, "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464294, + "narHash": "sha256-ZQsZ2WvBdkboCIyh8LStDPdAIARmxzn0XMNxxoOhjPE=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "4ce7cd6b6128c1ac41caf23c58a30a26b327f9dd", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, + "hyprwire_2": { "inputs": { "hyprutils": [ "hyprlauncher", @@ -943,7 +1311,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1786867632, @@ -1083,6 +1451,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1786247143, "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", @@ -1098,7 +1482,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -1111,7 +1495,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1786711500, "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", @@ -1214,6 +1598,28 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -1274,16 +1680,17 @@ "git-hooks": "git-hooks", "hermes-agent": "hermes-agent", "home-manager": "home-manager_2", + "hyprland": "hyprland", "hyprlauncher": "hyprlauncher", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "stylix": "stylix", - "systems": "systems_5" + "systems": "systems_6" } }, "rust-analyzer-src": { @@ -1316,7 +1723,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_4", + "systems": "systems_5", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1383,6 +1790,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1397,7 +1819,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1500,6 +1922,47 @@ "repo": "uv2nix", "type": "github" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786988229, + "narHash": "sha256-frEFLVRj8xXvBBDs44IRiqHo6R2PxsRpluygL7abjjI=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "59d429bf45aed4e2209043c0c36565ad8e2859a5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 45685ec..0de97b3 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,8 @@ }; # Hyprland hyprlauncher.url = "github:hyprwm/hyprlauncher"; + # Hyprland compositor via flake (latest git). + hyprland.url = "github:hyprwm/Hyprland"; # Secrets management agenix.url = "github:ryantm/agenix"; # Claude Desktop @@ -70,6 +72,7 @@ , nix-flatpak , stylix , hyprlauncher + , hyprland , dms , noctalia , git-hooks @@ -103,6 +106,7 @@ specialArgs = { inherit hyprlauncher + hyprland nixpkgs-unstable dms noctalia diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index c94f8fb..f147fee 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -4,7 +4,6 @@ , user , unstablePkgs , noctalia -, hermes-agent , claude-desktop , flox , ... @@ -39,13 +38,14 @@ in desktop = { enable = true; crypto.enable = true; + fixes = { + airpod-bluetooth.enabled = true; + }; tiler = { enable = true; + hyprland.enable = true; niri = { enable = true; - # Touchscreen taps/swipes -> niri actions. touchOutput must be given - # explicitly because three outputs are enabled; it matches the - # `touch { map-to-output }` block in configs/niri/shared/general.kdl. touchscreen-gestures = { enable = true; touchOutput = "eDP-1"; @@ -104,23 +104,6 @@ in }; hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; - # Fix robotic/distorted audio with AirPods over Bluetooth. - # WirePlumber 0.5 (nixpkgs 26.05+) auto-switches BT devices from A2DP to - # HFP whenever any app opens a mic stream (Chromium, Slack, etc.), which - # degrades both speaker and mic quality to 8 kHz CVSD/mSBC and causes the - # robotic sound. Disabling auto-switch keeps AirPods in A2DP permanently; - # meeting apps fall back to the laptop's built-in mic for input. - services.pipewire.wireplumber.extraConfig = { - "51-airpods-bluetooth" = { - "monitor.bluez.properties" = { - "bluez5.msbc-support" = false; - "bluez5.hfphsp-backend" = "native"; - }; - "wireplumber.settings" = { - "bluetooth.autoswitch-to-headset-profile" = false; - }; - }; - }; # Packages environment.systemPackages = let diff --git a/modules/core/nix-substituters.nix b/modules/core/nix-substituters.nix index 9c8fb6c..c040384 100644 --- a/modules/core/nix-substituters.nix +++ b/modules/core/nix-substituters.nix @@ -30,6 +30,7 @@ in "https://cosmic.cachix.org/" "https://ai.cachix.org" "https://noctalia.cachix.org" + "https://hyprland.cachix.org" ] ++ cfg.urls; nix.settings.trusted-substituters = [ "https://cache.flox.dev" @@ -44,6 +45,7 @@ in "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ] ++ cfg.keys; nix.settings.trusted-users = [ "root" skygUser.name ]; nix.extraOptions = '' diff --git a/modules/nixos/desktop/ABOUTME.md b/modules/nixos/desktop/ABOUTME.md index e20337d..1e4fa8f 100644 --- a/modules/nixos/desktop/ABOUTME.md +++ b/modules/nixos/desktop/ABOUTME.md @@ -18,7 +18,8 @@ desktop/ ├── printers.nix # CUPS printing + drivers (always on when desktop enabled) ├── gnome.nix # skyg.nixos.desktop.gnome — GNOME + pop-shell ├── kde.nix # skyg.nixos.desktop.kde — Plasma 6 -└── cosmic.nix # skyg.nixos.desktop.cosmic — COSMIC DE +├── cosmic.nix # skyg.nixos.desktop.cosmic — COSMIC DE +└── fixes/ # skyg.nixos.desktop.fixes — workaround and fixes (e.g., AirPods audio) ``` ## How it composes @@ -41,6 +42,7 @@ skyg.nixos.desktop.tiler.* → tiler/ skyg.nixos.desktop.stylix.enable → stylix/ (default true) skyg.nixos.desktop.crypto.enable → crypto.nix skyg.nixos.desktop.x11.* → x11/ +skyg.nixos.desktop.fixes.* → fixes/ ``` ## Conventions diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 7a4f51f..b27f750 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -19,6 +19,7 @@ in ./tiler ./stylix ./printers.nix + ./fixes ]; options = { diff --git a/modules/nixos/desktop/fixes/ABOUTME.md b/modules/nixos/desktop/fixes/ABOUTME.md new file mode 100644 index 0000000..de51200 --- /dev/null +++ b/modules/nixos/desktop/fixes/ABOUTME.md @@ -0,0 +1,18 @@ +# modules/nixos/desktop/fixes/ + +Various workarounds and fixes for desktop/workstation issues. + +## Files + +``` +fixes/ +└── default.nix # skyg.nixos.desktop.fixes.airpod-bluetooth.enabled — AirPods distorted/robotic audio fix +``` + +## Behaviour + +### AirPods Bluetooth Audio Fix +When `skyg.nixos.desktop.fixes.airpod-bluetooth.enabled` is set to `true`: +- WirePlumber's auto-switching behavior is disabled for the AirPods. +- Prevents switching from high-quality A2DP profile to low-quality HFP/HSP mono profile when a mic stream opens. +- Dictates that AirPods stay in A2DP permanently, while meeting/chat apps fall back to the laptop's built-in mic for input. diff --git a/modules/nixos/desktop/fixes/default.nix b/modules/nixos/desktop/fixes/default.nix new file mode 100644 index 0000000..ce2e676 --- /dev/null +++ b/modules/nixos/desktop/fixes/default.nix @@ -0,0 +1,31 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.skyg.nixos.desktop.fixes.airpod-bluetooth; +in +{ + options = { + skyg.nixos.desktop.fixes.airpod-bluetooth = { + enabled = lib.mkEnableOption "Fix robotic/distorted audio with AirPods over Bluetooth"; + }; + }; + + config = lib.mkIf (cfg.enabled && config.skyg.nixos.desktop.enable) { + # Fix robotic/distorted audio with AirPods over Bluetooth. + # WirePlumber 0.5 (nixpkgs 26.05+) auto-switches BT devices from A2DP to + # HFP whenever any app opens a mic stream (Chromium, Slack, etc.), which + # degrades both speaker and mic quality to 8 kHz CVSD/mSBC and causes the + # robotic sound. Disabling auto-switch keeps AirPods in A2DP permanently; + # meeting apps fall back to the laptop's built-in mic for input. + services.pipewire.wireplumber.extraConfig = { + "51-airpods-bluetooth" = { + "monitor.bluez.properties" = { + "bluez5.msbc-support" = false; + "bluez5.hfphsp-backend" = "native"; + }; + "wireplumber.settings" = { + "bluetooth.autoswitch-to-headset-profile" = false; + }; + }; + }; + }; +} diff --git a/modules/nixos/desktop/tiler/ABOUTME.md b/modules/nixos/desktop/tiler/ABOUTME.md index c4caff7..9060a9f 100644 --- a/modules/nixos/desktop/tiler/ABOUTME.md +++ b/modules/nixos/desktop/tiler/ABOUTME.md @@ -11,7 +11,7 @@ tiler/ ├── default.nix # skyg.nixos.desktop.tiler.enable — DMS, keyring, polkit, shared packages ├── niri.nix # skyg.nixos.desktop.tiler.niri — niri compositor (sets tiler.enable) ├── niri-touchscreen-gestures.nix # skyg.nixos.desktop.tiler.niri.touchscreen-gestures — touchscreen swipe support -├── hyprland.nix # skyg.nixos.desktop.tiler.hyprland — Hyprland (sets tiler.enable) +├── hyprland.nix # skyg.nixos.desktop.tiler.hyprland — Hyprland via flake (sets tiler.enable) └── swww.nix # skyg.nixos.desktop.tiler.background — swww/waypaper wallpaper tools ``` @@ -19,6 +19,7 @@ tiler/ - Enabling either `niri` or `hyprland` sets `skyg.nixos.desktop.tiler.enable = true`, which pulls in the shared substrate. You normally enable only the compositor option. +- Both compositors can be enabled at once (pick the session at the greeter). - The shared substrate configures **gnome-keyring as the SSH agent** (so `programs.ssh.startAgent = false`), enables polkit, and installs control tools (pavucontrol, playerctl, brightnessctl, blueman) and screen-capture tools @@ -32,9 +33,32 @@ skyg.nixos.desktop.tiler.enable → default.nix (usually set in skyg.nixos.desktop.tiler.niri.enable skyg.nixos.desktop.tiler.niri.touchscreen-gestures.enable # 3/4-finger swipes → niri actions skyg.nixos.desktop.tiler.hyprland.enable +skyg.nixos.desktop.tiler.hyprland.configName # per-host config dir (default: hostName) skyg.nixos.desktop.tiler.background.enable ``` +## Hyprland + +`hyprland.nix` runs the latest Hyprland from the `hyprland` flake input (package + +`xdg-desktop-portal-hyprland` kept in sync), launched via UWSM. It: + +- Installs the noctalia shell and autostart-friendly tools (grim/slurp/satty, + wofi/rofi, hypridle). There is no waybar/hyprpanel — the shell is noctalia. +- Symlinks `~/.config/hypr` -> `configs//hypr`, where `configName` + defaults to `config.skyg.core.hostName` (so `fwbook` -> `configs/fwbook/hypr`). + +The Hyprland Cachix cache (`hyprland.cachix.org`) is added in +`modules/core/nix-substituters.nix` so the flake build doesn't compile from source. + +### No overview plugin + +We intentionally do not ship an overview plugin. hyprexpo was dropped from the +official `hyprland-plugins` repo in 2026, and the maintained community fork +(`sandwichfarm/hyprexpo`) chases Hyprland `main` and fails to build against +tagged releases — it's a moving target. `Mod+Tab` falls back to `cyclenext` +instead of niri's `toggle-overview`. Revisit if a plugin lands in nixpkgs +kept in sync with the packaged Hyprland. + ## Conventions - Don't set `tiler.enable` directly — enable a compositor and let it flip the shared switch. diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix index c5b2dab..7655ab9 100644 --- a/modules/nixos/desktop/tiler/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -1,46 +1,67 @@ { config , lib , pkgs +, skygUtils +, hyprland +, noctalia , ... }: let cfg = config.skyg.nixos.desktop.tiler.hyprland; - # hypr-plugin-dir = pkgs.symlinkJoin { - # name = "hyrpland-plugins"; - # paths = with pkgs.hyprlandPlugins; [ - # hyprexpo - # hyprbars - # hyprspace - # ]; - # }; + system = pkgs.stdenv.hostPlatform.system; + hyprlandPkg = hyprland.packages.${system}.hyprland; + hyprlandPortal = hyprland.packages.${system}.xdg-desktop-portal-hyprland; + noctaliaPkg = noctalia.packages.${system}.default; in { options = { skyg.nixos.desktop.tiler.hyprland = { enable = lib.mkEnableOption "hyprland"; + configName = lib.mkOption { + type = lib.types.str; + default = config.skyg.core.hostName; + description = '' + Name of the per-host Hyprland config directory under `configs/`. + The module symlinks `~/.config/hypr` -> `configs//hypr`. + Defaults to the machine's hostName (e.g. `fwbook` -> `configs/fwbook/hypr`). + ''; + }; }; }; config = lib.mkIf cfg.enable { skyg.nixos.desktop.tiler.enable = true; + programs.hyprland = { enable = true; withUWSM = true; xwayland.enable = true; + package = hyprlandPkg; + portalPackage = hyprlandPortal; }; programs.uwsm.enable = true; - # environment.systemPackages = with pkgs; [ - # hyprls - # ]; + xdg.portal = { enable = true; - extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; + extraPortals = [ hyprlandPortal ]; + }; + + # Shell + tools that the Hyprland session/config expect. + environment.systemPackages = with pkgs; [ + noctaliaPkg + hypridle + wofi + rofi + wl-clipboard + grim + slurp + satty + ]; + + # Symlink ~/.config/hypr -> configs//hypr (host-specific). + system.userActivationScripts.hyprlandConfig.text = skygUtils.makeHyperlinkScriptToConfigs { + filePath = "${cfg.configName}/hypr"; + targetPath = "hypr"; + configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; }; - # home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = { - # enable = true; - # plugins = with pkgs; [ - # hyprlandPlugins.hyprexpo - # hyprlandPlugins.hyprbars - # ]; - # }; }; } diff --git a/modules/skyg-utils.nix b/modules/skyg-utils.nix index 187504d..d988996 100644 --- a/modules/skyg-utils.nix +++ b/modules/skyg-utils.nix @@ -3,14 +3,19 @@ makeHyperlinkScriptToConfigs = { filePath , configSource + # Where the symlink is created under ~/.config. Defaults to filePath so + # existing callers keep linking ~/.config/ -> /. + # Set this when the source lives under a subdir but should surface at a + # flatter ~/.config path, e.g. filePath = "fwbook/hypr", targetPath = "hypr". + , targetPath ? filePath }: let - homePath = "$HOME/.config/${filePath}"; + homePath = "$HOME/.config/${targetPath}"; sourcePath = "${configSource}/${filePath}"; in '' rm -f "${homePath}" - if [[ ! -h "$HOME/.config/${filePath}" ]]; then + if [[ ! -h "${homePath}" ]]; then ln -s "${sourcePath}" "${homePath}" || { echo "Failed to create symlink for ${filePath} at ${homePath}" exit 1