rope/nixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: update Stylix to master and scope import to desktop hosts

Browse source 
Switch Stylix from release-25.11 to master, which fixes hyprpaper's
wallpaper config generation for 0.8.4 (structured attributes instead
of raw string concatenation).

Move the Stylix module import from common.nix to flake.nix extraModules
so the Mediaserver (on nixpkgs-stable) doesn't pull in options that
only exist in unstable nixpkgs (services.displayManager.generic).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
rope 2026-05-18 10:44:16 +01:00
parent d89706736c
commit cea4d37bfb
4 changed files with 41 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.nix
View file

@ -33,10 +33,7 @@
# upstream needs newer stdenv than 25.11 ships.
hyprland.url = "github:hyprwm/Hyprland";
# Stylix release branch matching nixos-25.11. Master references
# options (services.displayManager.generic) that only exist in
# newer nixpkgs schemas.
stylix.url = "github:nix-community/stylix/release-25.11";
stylix.url = "github:nix-community/stylix";
};
outputs =
{ self
@ -53,7 +50,7 @@
} @ inputs:
let
system = "x86_64-linux";
mkHost = hostname: pkgsInput: hmInput: pkgsInput.lib.nixosSystem {
mkHost = hostname: pkgsInput: hmInput: extraModules: pkgsInput.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; pkgs-unstable = nixpkgs.legacyPackages.${system}; };
modules = [
@ -61,16 +58,16 @@
./hosts/hardware/${hostname}.nix
./common.nix
hmInput.nixosModules.home-manager
];
] ++ extraModules;
};
in
{
nixosConfigurations = {
# Gaming and Macbook use nixpkgs unstable — required by home-manager
# unstable which needs lib/services/lib.nix added in nixpkgs after 25.11.
FredOS-Gaming = mkHost "FredOS-Gaming" nixpkgs home-manager;
FredOS-Mediaserver = mkHost "FredOS-Mediaserver" nixpkgs-stable home-manager-stable;
FredOS-Macbook = mkHost "FredOS-Macbook" nixpkgs home-manager;
FredOS-Gaming = mkHost "FredOS-Gaming" nixpkgs home-manager [ stylix.nixosModules.stylix ./settings/stylix.nix ];
FredOS-Mediaserver = mkHost "FredOS-Mediaserver" nixpkgs-stable home-manager-stable [];
FredOS-Macbook = mkHost "FredOS-Macbook" nixpkgs home-manager [ stylix.nixosModules.stylix ./settings/stylix.nix ];
};
};
}