normalize config for niri

This commit is contained in:
ari committed 2026-09-17 15:10:36 -04:00
1 parent e32d61fb03
commit 7c2fccf064
32 files changed
+27 -5

No files matched your search

+2 -1
View File
@@ -14,7 +14,8 @@ these cases where the source subdir and `~/.config` target differ.
| Path | Description | | Path | Description |
|---|---| |---|---|
| `niri/` | Niri Wayland compositor config | | `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `<hostName>/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` | | `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-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` | | `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -9,6 +9,7 @@ binds {
// ========================= // =========================
Mod+Shift+H { show-hotkey-overlay; } Mod+Shift+H { show-hotkey-overlay; }
Mod+T { spawn "ghostty"; } Mod+T { spawn "ghostty"; }
Mod+A { spawn "ghostty" "-e" "pi"; }
Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; } Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; }
Mod+B { spawn "chromium"; } Mod+B { spawn "chromium"; }
Mod+E { spawn "wofi-emoji"; } Mod+E { spawn "wofi-emoji"; }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
View File
@@ -57,6 +57,7 @@ in
quickshell.enable = true; quickshell.enable = true;
niri = { niri = {
enable = true; enable = true;
configLink.enable = true;
touchscreen-gestures = { touchscreen-gestures = {
enable = true; enable = true;
touchOutput = "eDP-1"; touchOutput = "eDP-1";
+3
View File
@@ -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.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.apps.media.enable → default.nix (wf-recorder, mpv, mpvpaper)
skyg.nixos.desktop.tiler.niri.enable skyg.nixos.desktop.tiler.niri.enable
skyg.nixos.desktop.tiler.niri.configLink.enable # symlink ~/.config/niri -> configs/<name>/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.niri.touchscreen-gestures.enable # 3/4-finger swipes → niri actions
skyg.nixos.desktop.tiler.hyprland.enable skyg.nixos.desktop.tiler.hyprland.enable
skyg.nixos.desktop.tiler.hyprland.configName # per-host config dir (default: hostName) skyg.nixos.desktop.tiler.hyprland.configName # per-host config dir (default: hostName)
+20 -4
View File
@@ -7,11 +7,19 @@
}: }:
let let
cfg = config.skyg.nixos.desktop.tiler.niri; cfg = config.skyg.nixos.desktop.tiler.niri;
bakedConfig = skygUtils.bakeConfig {
configName = cfg.configLink.name;
configType = "niri";
};
in in
{ {
options = { options = {
skyg.nixos.desktop.tiler.niri = { skyg.nixos.desktop.tiler.niri = {
enable = lib.mkEnableOption "niri"; enable = lib.mkEnableOption "niri";
configLink = skygUtils.makeConfigLinkOptions {
hostName = config.skyg.core.hostName;
configType = "niri";
};
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@@ -25,10 +33,18 @@ in
xwayland-satellite xwayland-satellite
adwaita-icon-theme adwaita-icon-theme
papirus-icon-theme papirus-icon-theme
]; ] ++ (lib.optionals cfg.configLink.mountAsSource [ bakedConfig ]);
system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs {
filePath = "niri"; system.userActivationScripts.niriConfig = lib.mkIf cfg.configLink.enable {
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; 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 = { # programs.dank-material-shell = {