From 7c2fccf0647322ce2aa5e18ba7145873fde00e64 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 17 Sep 2026 15:10:36 -0400 Subject: [PATCH] normalize config for niri --- configs/ABOUTME.md | 3 ++- configs/{ => fwbook}/niri/.gitignore | 0 configs/{ => fwbook}/niri/config.kdl | 0 configs/{ => fwbook}/niri/dms/alttab.kdl | 0 configs/{ => fwbook}/niri/dms/binds.kdl | 0 configs/{ => fwbook}/niri/dms/colors.kdl | 0 configs/{ => fwbook}/niri/dms/cursor.kdl | 0 configs/{ => fwbook}/niri/dms/index.kdl | 0 configs/{ => fwbook}/niri/dms/layout.kdl | 0 configs/{ => fwbook}/niri/dms/outputs.kdl | 0 .../profiles/profile_1771441609324_rrw950.kdl | 0 .../profiles/profile_1777305011695_voqu6k.kdl | 0 configs/{ => fwbook}/niri/dms/windowrules.kdl | 0 configs/{ => fwbook}/niri/dms/wpblur.kdl | 0 configs/{ => fwbook}/niri/noctalia/binds.kdl | 0 configs/{ => fwbook}/niri/noctalia/index.kdl | 0 .../{ => fwbook}/niri/noctalia/startup.kdl | 0 configs/{ => fwbook}/niri/screen-record.sh | 0 configs/{ => fwbook}/niri/shared/alttab.kdl | 0 configs/{ => fwbook}/niri/shared/binds.kdl | 1 + configs/{ => fwbook}/niri/shared/colors.kdl | 0 configs/{ => fwbook}/niri/shared/cursor.kdl | 0 configs/{ => fwbook}/niri/shared/general.kdl | 0 configs/{ => fwbook}/niri/shared/index.kdl | 0 configs/{ => fwbook}/niri/shared/layout.kdl | 0 configs/{ => fwbook}/niri/shared/outputs.kdl | 0 configs/{ => fwbook}/niri/shared/startup.kdl | 0 .../{ => fwbook}/niri/shared/windowrules.kdl | 0 configs/{ => fwbook}/niri/shared/wpblur.kdl | 0 hosts/fwbook.nix | 1 + modules/nixos/desktop/tiler/ABOUTME.md | 3 +++ modules/nixos/desktop/tiler/niri.nix | 24 +++++++++++++++---- 32 files changed, 27 insertions(+), 5 deletions(-) rename configs/{ => fwbook}/niri/.gitignore (100%) rename configs/{ => fwbook}/niri/config.kdl (100%) rename configs/{ => fwbook}/niri/dms/alttab.kdl (100%) rename configs/{ => fwbook}/niri/dms/binds.kdl (100%) rename configs/{ => fwbook}/niri/dms/colors.kdl (100%) rename configs/{ => fwbook}/niri/dms/cursor.kdl (100%) rename configs/{ => fwbook}/niri/dms/index.kdl (100%) rename configs/{ => fwbook}/niri/dms/layout.kdl (100%) rename configs/{ => fwbook}/niri/dms/outputs.kdl (100%) rename configs/{ => fwbook}/niri/dms/profiles/profile_1771441609324_rrw950.kdl (100%) rename configs/{ => fwbook}/niri/dms/profiles/profile_1777305011695_voqu6k.kdl (100%) rename configs/{ => fwbook}/niri/dms/windowrules.kdl (100%) rename configs/{ => fwbook}/niri/dms/wpblur.kdl (100%) rename configs/{ => fwbook}/niri/noctalia/binds.kdl (100%) rename configs/{ => fwbook}/niri/noctalia/index.kdl (100%) rename configs/{ => fwbook}/niri/noctalia/startup.kdl (100%) rename configs/{ => fwbook}/niri/screen-record.sh (100%) rename configs/{ => fwbook}/niri/shared/alttab.kdl (100%) rename configs/{ => fwbook}/niri/shared/binds.kdl (98%) rename configs/{ => fwbook}/niri/shared/colors.kdl (100%) rename configs/{ => fwbook}/niri/shared/cursor.kdl (100%) rename configs/{ => fwbook}/niri/shared/general.kdl (100%) rename configs/{ => fwbook}/niri/shared/index.kdl (100%) rename configs/{ => fwbook}/niri/shared/layout.kdl (100%) rename configs/{ => fwbook}/niri/shared/outputs.kdl (100%) rename configs/{ => fwbook}/niri/shared/startup.kdl (100%) rename configs/{ => fwbook}/niri/shared/windowrules.kdl (100%) rename configs/{ => fwbook}/niri/shared/wpblur.kdl (100%) diff --git a/configs/ABOUTME.md b/configs/ABOUTME.md index 778539c..0e17b9c 100644 --- a/configs/ABOUTME.md +++ b/configs/ABOUTME.md @@ -14,7 +14,8 @@ these cases where the source subdir and `~/.config` target differ. | Path | Description | |---|---| -| `niri/` | Niri Wayland compositor config | +| `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `/niri/`) | +| `fwbook/niri/` | Niri config for `fwbook`; linked to `~/.config/niri` by the `skyg.nixos.desktop.tiler.niri` module (mirrors the hyprland pattern) | | `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout + noctalia); linked to `~/.config/hypr` | | `hl-fwdesk/hypr/` | Hyprland config for `hl-fwdesk` (Steam console); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` | | `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` | diff --git a/configs/niri/.gitignore b/configs/fwbook/niri/.gitignore similarity index 100% rename from configs/niri/.gitignore rename to configs/fwbook/niri/.gitignore diff --git a/configs/niri/config.kdl b/configs/fwbook/niri/config.kdl similarity index 100% rename from configs/niri/config.kdl rename to configs/fwbook/niri/config.kdl diff --git a/configs/niri/dms/alttab.kdl b/configs/fwbook/niri/dms/alttab.kdl similarity index 100% rename from configs/niri/dms/alttab.kdl rename to configs/fwbook/niri/dms/alttab.kdl diff --git a/configs/niri/dms/binds.kdl b/configs/fwbook/niri/dms/binds.kdl similarity index 100% rename from configs/niri/dms/binds.kdl rename to configs/fwbook/niri/dms/binds.kdl diff --git a/configs/niri/dms/colors.kdl b/configs/fwbook/niri/dms/colors.kdl similarity index 100% rename from configs/niri/dms/colors.kdl rename to configs/fwbook/niri/dms/colors.kdl diff --git a/configs/niri/dms/cursor.kdl b/configs/fwbook/niri/dms/cursor.kdl similarity index 100% rename from configs/niri/dms/cursor.kdl rename to configs/fwbook/niri/dms/cursor.kdl diff --git a/configs/niri/dms/index.kdl b/configs/fwbook/niri/dms/index.kdl similarity index 100% rename from configs/niri/dms/index.kdl rename to configs/fwbook/niri/dms/index.kdl diff --git a/configs/niri/dms/layout.kdl b/configs/fwbook/niri/dms/layout.kdl similarity index 100% rename from configs/niri/dms/layout.kdl rename to configs/fwbook/niri/dms/layout.kdl diff --git a/configs/niri/dms/outputs.kdl b/configs/fwbook/niri/dms/outputs.kdl similarity index 100% rename from configs/niri/dms/outputs.kdl rename to configs/fwbook/niri/dms/outputs.kdl diff --git a/configs/niri/dms/profiles/profile_1771441609324_rrw950.kdl b/configs/fwbook/niri/dms/profiles/profile_1771441609324_rrw950.kdl similarity index 100% rename from configs/niri/dms/profiles/profile_1771441609324_rrw950.kdl rename to configs/fwbook/niri/dms/profiles/profile_1771441609324_rrw950.kdl diff --git a/configs/niri/dms/profiles/profile_1777305011695_voqu6k.kdl b/configs/fwbook/niri/dms/profiles/profile_1777305011695_voqu6k.kdl similarity index 100% rename from configs/niri/dms/profiles/profile_1777305011695_voqu6k.kdl rename to configs/fwbook/niri/dms/profiles/profile_1777305011695_voqu6k.kdl diff --git a/configs/niri/dms/windowrules.kdl b/configs/fwbook/niri/dms/windowrules.kdl similarity index 100% rename from configs/niri/dms/windowrules.kdl rename to configs/fwbook/niri/dms/windowrules.kdl diff --git a/configs/niri/dms/wpblur.kdl b/configs/fwbook/niri/dms/wpblur.kdl similarity index 100% rename from configs/niri/dms/wpblur.kdl rename to configs/fwbook/niri/dms/wpblur.kdl diff --git a/configs/niri/noctalia/binds.kdl b/configs/fwbook/niri/noctalia/binds.kdl similarity index 100% rename from configs/niri/noctalia/binds.kdl rename to configs/fwbook/niri/noctalia/binds.kdl diff --git a/configs/niri/noctalia/index.kdl b/configs/fwbook/niri/noctalia/index.kdl similarity index 100% rename from configs/niri/noctalia/index.kdl rename to configs/fwbook/niri/noctalia/index.kdl diff --git a/configs/niri/noctalia/startup.kdl b/configs/fwbook/niri/noctalia/startup.kdl similarity index 100% rename from configs/niri/noctalia/startup.kdl rename to configs/fwbook/niri/noctalia/startup.kdl diff --git a/configs/niri/screen-record.sh b/configs/fwbook/niri/screen-record.sh similarity index 100% rename from configs/niri/screen-record.sh rename to configs/fwbook/niri/screen-record.sh diff --git a/configs/niri/shared/alttab.kdl b/configs/fwbook/niri/shared/alttab.kdl similarity index 100% rename from configs/niri/shared/alttab.kdl rename to configs/fwbook/niri/shared/alttab.kdl diff --git a/configs/niri/shared/binds.kdl b/configs/fwbook/niri/shared/binds.kdl similarity index 98% rename from configs/niri/shared/binds.kdl rename to configs/fwbook/niri/shared/binds.kdl index b5dbe17..3584a37 100644 --- a/configs/niri/shared/binds.kdl +++ b/configs/fwbook/niri/shared/binds.kdl @@ -9,6 +9,7 @@ binds { // ========================= Mod+Shift+H { show-hotkey-overlay; } Mod+T { spawn "ghostty"; } + Mod+A { spawn "ghostty" "-e" "pi"; } Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; } Mod+B { spawn "chromium"; } Mod+E { spawn "wofi-emoji"; } diff --git a/configs/niri/shared/colors.kdl b/configs/fwbook/niri/shared/colors.kdl similarity index 100% rename from configs/niri/shared/colors.kdl rename to configs/fwbook/niri/shared/colors.kdl diff --git a/configs/niri/shared/cursor.kdl b/configs/fwbook/niri/shared/cursor.kdl similarity index 100% rename from configs/niri/shared/cursor.kdl rename to configs/fwbook/niri/shared/cursor.kdl diff --git a/configs/niri/shared/general.kdl b/configs/fwbook/niri/shared/general.kdl similarity index 100% rename from configs/niri/shared/general.kdl rename to configs/fwbook/niri/shared/general.kdl diff --git a/configs/niri/shared/index.kdl b/configs/fwbook/niri/shared/index.kdl similarity index 100% rename from configs/niri/shared/index.kdl rename to configs/fwbook/niri/shared/index.kdl diff --git a/configs/niri/shared/layout.kdl b/configs/fwbook/niri/shared/layout.kdl similarity index 100% rename from configs/niri/shared/layout.kdl rename to configs/fwbook/niri/shared/layout.kdl diff --git a/configs/niri/shared/outputs.kdl b/configs/fwbook/niri/shared/outputs.kdl similarity index 100% rename from configs/niri/shared/outputs.kdl rename to configs/fwbook/niri/shared/outputs.kdl diff --git a/configs/niri/shared/startup.kdl b/configs/fwbook/niri/shared/startup.kdl similarity index 100% rename from configs/niri/shared/startup.kdl rename to configs/fwbook/niri/shared/startup.kdl diff --git a/configs/niri/shared/windowrules.kdl b/configs/fwbook/niri/shared/windowrules.kdl similarity index 100% rename from configs/niri/shared/windowrules.kdl rename to configs/fwbook/niri/shared/windowrules.kdl diff --git a/configs/niri/shared/wpblur.kdl b/configs/fwbook/niri/shared/wpblur.kdl similarity index 100% rename from configs/niri/shared/wpblur.kdl rename to configs/fwbook/niri/shared/wpblur.kdl diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 1a4cb9a..46f2370 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -57,6 +57,7 @@ in quickshell.enable = true; niri = { enable = true; + configLink.enable = true; touchscreen-gestures = { enable = true; touchOutput = "eDP-1"; diff --git a/modules/nixos/desktop/tiler/ABOUTME.md b/modules/nixos/desktop/tiler/ABOUTME.md index 3214bf2..82d9108 100644 --- a/modules/nixos/desktop/tiler/ABOUTME.md +++ b/modules/nixos/desktop/tiler/ABOUTME.md @@ -38,6 +38,9 @@ skyg.nixos.desktop.tiler.apps.control.enable → default.nix (pavucontrol, p skyg.nixos.desktop.tiler.apps.gnome.enable → default.nix (nautilus, gnome-calendar, seahorse, gcr) skyg.nixos.desktop.tiler.apps.media.enable → default.nix (wf-recorder, mpv, mpvpaper) skyg.nixos.desktop.tiler.niri.enable +skyg.nixos.desktop.tiler.niri.configLink.enable # symlink ~/.config/niri -> configs//niri +skyg.nixos.desktop.tiler.niri.configLink.name # per-host config dir (default: hostName) +skyg.nixos.desktop.tiler.niri.configLink.mountAsSource # bake config into the build closure 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) diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 5d1797a..631665d 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -7,11 +7,19 @@ }: let cfg = config.skyg.nixos.desktop.tiler.niri; + bakedConfig = skygUtils.bakeConfig { + configName = cfg.configLink.name; + configType = "niri"; + }; in { options = { skyg.nixos.desktop.tiler.niri = { enable = lib.mkEnableOption "niri"; + configLink = skygUtils.makeConfigLinkOptions { + hostName = config.skyg.core.hostName; + configType = "niri"; + }; }; }; config = lib.mkIf cfg.enable { @@ -25,10 +33,18 @@ in xwayland-satellite adwaita-icon-theme papirus-icon-theme - ]; - system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { - filePath = "niri"; - configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; + ] ++ (lib.optionals cfg.configLink.mountAsSource [ bakedConfig ]); + + system.userActivationScripts.niriConfig = lib.mkIf cfg.configLink.enable { + text = skygUtils.makeHyperlinkScriptToConfigs { + filePath = "${cfg.configLink.name}/niri"; + targetPath = "niri"; + configSource = + if cfg.configLink.mountAsSource then + "${bakedConfig}" + else + "/home/${config.skyg.user.name}/nixos-setup/configs"; + }; }; # programs.dank-material-shell = {