From 76e396cd439d37cc83bd18b8ea06b86c9455feef Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 9 Sep 2026 12:56:26 -0400 Subject: [PATCH] centralized hypr & noctalia config control + added fws1 correct hardware --- configs/hl-fwdesk/hypr/conf/autostart.lua | 2 +- configs/niri/config.kdl | 1 - hosts/fwbook.nix | 5 +- hosts/hl-fwdesk.nix | 3 + hosts/hl-fws1.hardware-configuration.nix | 17 +++-- modules/home/programs.nix | 86 +--------------------- modules/lib.nix | 1 + modules/nixos/desktop/tiler/hyprland.nix | 55 +++----------- modules/nixos/desktop/tiler/noctalia.nix | 31 ++++---- modules/skyg-utils.nix | 52 +++++++++++-- secrets/glmain.json.age | Bin 6112 -> 6229 bytes 11 files changed, 94 insertions(+), 159 deletions(-) diff --git a/configs/hl-fwdesk/hypr/conf/autostart.lua b/configs/hl-fwdesk/hypr/conf/autostart.lua index 4e0c719..aa83a98 100644 --- a/configs/hl-fwdesk/hypr/conf/autostart.lua +++ b/configs/hl-fwdesk/hypr/conf/autostart.lua @@ -2,6 +2,6 @@ -- Autostart -- ========================= hl.on("hyprland.start", function() - -- Lounge console: drop straight into Steam Big Picture. + hl.exec_cmd("setpriv --ambient-caps -all -- noctalia") hl.exec_cmd("steam -tenfoot") end) diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 3b8b3af..72e0823 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -17,7 +17,6 @@ include "shared/index.kdl" // For DankMaterialShell (DMS) include "dms/index.kdl" -// For Noctalia //include "noctalia/index.kdl" diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 027ada6..faad6f6 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -50,7 +50,10 @@ in enable = true; tools.enable = true; }; - noctalia.enable = true; + noctalia = { + enable = true; + configLink.enable = true; + }; quickshell.enable = true; niri = { enable = true; diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index d098a70..e93d137 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -51,6 +51,9 @@ in enable = true; tiler = { enable = true; + noctalia = { + enable = true; + }; hyprland = { enable = true; tools.enable = true; diff --git a/hosts/hl-fws1.hardware-configuration.nix b/hosts/hl-fws1.hardware-configuration.nix index 3654214..e239446 100644 --- a/hosts/hl-fws1.hardware-configuration.nix +++ b/hosts/hl-fws1.hardware-configuration.nix @@ -1,3 +1,6 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { @@ -6,27 +9,27 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/2d96049a-938b-4f08-b73a-5baae8eaef2a"; + device = "/dev/disk/by-uuid/3fbf3ccf-655a-4040-b898-b97a1d555912"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/0B62-BBC0"; + device = "/dev/disk/by-uuid/3342-B2BE"; fsType = "vfat"; }; - swapDevices = - [{ device = "/dev/disk/by-uuid/cf34dac4-3757-44a8-9458-14943c60d418"; }]; - - networking.useDHCP = lib.mkDefault true; + swapDevices = [{ + device = "/var/lib/swapfile"; + size = 64 * 1024; + }]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/home/programs.nix b/modules/home/programs.nix index 257edbf..8da9fa6 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -1,4 +1,4 @@ -{ pkgs, user, ... }: +{ pkgs, ... }: { bat.enable = true; neovim = { @@ -87,8 +87,6 @@ ''; plugins = with pkgs.nushellPlugins; [ polars - # net - # highlight # broken: compiled for nushell 0.110.0, nixpkgs 26.05 ships 0.112.2 ]; }; carapace = { @@ -97,7 +95,6 @@ enableBashIntegration = true; enableZshIntegration = true; }; - # environment.pathsToLink = [ "/share/zsh" ]; zsh = { enable = true; enableCompletion = true; @@ -153,85 +150,4 @@ set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M ' ''; }; - # ghostty = { - # enable = true; - # settings = { - # # Font Configuration - # font-size = 12; - - # # Window Configuration - # window-decoration = false; - # window-padding-x = 12; - # window-padding-y = 12; - # background-opacity = 1.0; - # background-blur-radius = 32; - - # # Cursor Configuration - # cursor-style = "block"; - # cursor-style-blink = true; - - # # Scrollback - # scrollback-limit = 3023; - - # # Terminal features - # mouse-hide-while-typing = true; - # copy-on-select = false; - # confirm-close-surface = false; - - # # Disable annoying copied to clipboard - # app-notifications = "no-clipboard-copy,no-config-reload"; - - # # Material 3 UI elements - # unfocused-split-opacity = 0.7; - # unfocused-split-fill = "#44464f"; - - # # Tab configuration - # gtk-titlebar = false; - - # # Shell integration - # shell-integration = "detect"; - # shell-integration-features = "cursor,sudo,title,no-cursor"; - - # # Rando stuff - # gtk-single-instance = true; - - # # Theme - # theme = "dankcolors"; - # }; - # keybindings = { - # "ctrl+shift+n" = "new_window"; - # "ctrl+t" = "new_tab"; - # "ctrl+plus" = "increase_font_size:1"; - # "ctrl+minus" = "decrease_font_size:1"; - # "ctrl+zero" = "reset_font_size"; - # "shift+enter" = "text:\\n"; - # }; - # themes = { - # dankcolors = { - # background = "#101418"; - # foreground = "#e0e2e8"; - # cursor-color = "#42a5f5"; - # selection-background = "#0d47a1"; - # selection-foreground = "#e0e2e8"; - # palette = [ - # "0=#101418" - # "1=#ff3270" - # "2=#42f558" - # "3=#fff332" - # "4=#1c8de8" - # "5=#003e71" - # "6=#42a5f5" - # "7=#e8f4ff" - # "8=#8d979f" - # "9=#ff739e" - # "10=#7cff8d" - # "11=#fff77c" - # "12=#60b8ff" - # "13=#7cc4ff" - # "14=#abd9ff" - # "15=#f5faff" - # ]; - # }; - # }; - # }; } diff --git a/modules/lib.nix b/modules/lib.nix index feb4d7b..b6c8a51 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -15,6 +15,7 @@ let skygUtils = import ./skyg-utils.nix { pkgs = allPkgs.x86_64-linux; lib = nixpkgs.lib; + rootDir = rootDir; }; eachSystem = nixpkgs.lib.genAttrs (import systems); allPkgs = eachSystem ( diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix index f135cef..acfefe1 100644 --- a/modules/nixos/desktop/tiler/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -10,55 +10,18 @@ let system = pkgs.stdenv.hostPlatform.system; hyprlandPkg = hyprland.packages.${system}.hyprland; hyprlandPortal = hyprland.packages.${system}.xdg-desktop-portal-hyprland; - - # When mountAsSource is set, build a real, GC-protected copy of the hypr config - # dir. The flake self-source path (skyg.rootDir) is not referenced by the system - # closure, so it gets garbage-collected and the ~/.config/hypr symlink dangles. - # This derivation is added to the system profile, pinning it against GC. - bakedHyprConfig = pkgs.stdenv.mkDerivation { - pname = "${cfg.configName}-hypr-config"; - version = "1"; - src = "${config.skyg.rootDir}/configs/${cfg.configName}/hypr"; - buildPhase = "true"; - installPhase = '' - mkdir -p "$out/${cfg.configName}" - cp -r "$src" "$out/${cfg.configName}/hypr" - ''; + bakedConfig = skygUtils.bakeConfig { + configName = cfg.configLink.name; + configType = "hypr"; }; 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`). - ''; - }; - configLink = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to symlink `~/.config/hypr` -> `configs//hypr`. - Disable on hosts that manage their own Hyprland config elsewhere. - ''; - }; - mountAsSource = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - If `configLink.enable` is true, embed the config dir in the build. - A GC-protected copy of the config is baked into the system closure - (via a derivation added to the system profile) instead of symlinking - to the live `~/nixos-setup/configs` checkout, making the config part - of the built system and reproducible. - ''; - }; + configLink = skygUtils.makeConfigLinkOptions { + hostName = config.skyg.core.hostName; + configType = "hypr"; }; tools = { enable = lib.mkEnableOption "Hyprland shell tools (hypridle, wofi, rofi, grim, slurp, satty)"; @@ -93,16 +56,16 @@ in grim slurp satty - ]) ++ (lib.optionals cfg.configLink.mountAsSource [ bakedHyprConfig ]); + ]) ++ (lib.optionals cfg.configLink.mountAsSource [ bakedConfig ]); # Symlink ~/.config/hypr -> configs//hypr (host-specific). system.userActivationScripts.hyprlandConfig = lib.mkIf cfg.configLink.enable { text = skygUtils.makeHyperlinkScriptToConfigs { - filePath = "${cfg.configName}/hypr"; + filePath = "${cfg.configLink.name}/hypr"; targetPath = "hypr"; configSource = if cfg.configLink.mountAsSource then - "${bakedHyprConfig}" + "${bakedConfig}" else "/home/${config.skyg.user.name}/nixos-setup/configs"; }; diff --git a/modules/nixos/desktop/tiler/noctalia.nix b/modules/nixos/desktop/tiler/noctalia.nix index 24e8123..3d46591 100644 --- a/modules/nixos/desktop/tiler/noctalia.nix +++ b/modules/nixos/desktop/tiler/noctalia.nix @@ -9,30 +9,35 @@ let cfg = config.skyg.nixos.desktop.tiler.noctalia; system = pkgs.stdenv.hostPlatform.system; noctaliaPkg = noctalia.packages.${system}.default; + bakedConfig = skygUtils.bakeConfig { + configName = cfg.configLink.name; + configType = "noctalia"; + }; in { options = { skyg.nixos.desktop.tiler.noctalia = { enable = lib.mkEnableOption "noctalia"; - configName = lib.mkOption { - type = lib.types.str; - default = config.skyg.core.hostName; - description = '' - Name of the per-host noctalia config directory under `configs/`. - The module symlinks `~/.config/noctalia` -> `configs//noctalia`. - Defaults to the machine's hostName (e.g. `fwbook` -> `configs/fwbook/noctalia`). - ''; + configLink = skygUtils.makeConfigLinkOptions { + hostName = config.skyg.core.hostName; + configType = "noctalia"; }; }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ noctaliaPkg ]; + environment.systemPackages = [ noctaliaPkg ] ++ (lib.optionals cfg.configLink.mountAsSource [ bakedConfig ]); # Symlink ~/.config/noctalia -> configs//noctalia (host-specific). - system.userActivationScripts.noctaliaCfg.text = skygUtils.makeHyperlinkScriptToConfigs { - filePath = "${cfg.configName}/noctalia"; - targetPath = "noctalia"; - configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; + system.userActivationScripts.noctaliaCfg = lib.mkIf cfg.configLink.enable { + text = skygUtils.makeHyperlinkScriptToConfigs { + filePath = "${cfg.configLink.name}/noctalia"; + targetPath = "noctalia"; + configSource = + if cfg.configLink.mountAsSource then + "${bakedConfig}" + else + "/home/${config.skyg.user.name}/nixos-setup/configs"; + }; }; }; } diff --git a/modules/skyg-utils.nix b/modules/skyg-utils.nix index d988996..20cb96f 100644 --- a/modules/skyg-utils.nix +++ b/modules/skyg-utils.nix @@ -1,12 +1,21 @@ -{ pkgs, lib }: +{ pkgs, lib, rootDir }: { + bakeConfig = + { configName + , configType + }: pkgs.stdenv.mkDerivation { + pname = "skyg-${configName}-${configType}-config"; + version = "1"; + src = "${rootDir}/configs/${configName}/${configType}"; + buildPhase = "true"; + installPhase = '' + mkdir -p "$out/${configName}" + cp -r "$src" "$out/${configName}/${configType}" + ''; + }; 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 @@ -22,4 +31,37 @@ } fi ''; + makeConfigLinkOptions = + { configType + , hostName + }: { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to symlink `~/.config/${configType}` -> `configs//${configType}`. + Disable on hosts that manage their own ${configType} config elsewhere. + ''; + }; + name = lib.mkOption { + type = lib.types.str; + default = hostName; + description = '' + Name of the per-host ${configType} config directory under `configs/`. + The module symlinks `~/.config/${configType}` -> `configs//${configType}`. + Defaults to the machine's hostName (e.g. `fwbook` -> `configs/fwbook/${configType}`). + ''; + }; + mountAsSource = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + If `configLink.enable` is true, embed the config dir in the build. + A GC-protected copy of the config is baked into the system closure + (via a derivation added to the system profile) instead of symlinking + to the live `~/nixos-setup/configs` checkout, making the config part + of the built system and reproducible. + ''; + }; + }; } diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index d772541976efea4b58b097d9f3bf3dedf3b8ff80..dcf44c8bb06551ac17af5109c9af6773bfc94926 100644 GIT binary patch literal 6229 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 literal 6112 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