pin to nixos 26.05, drop hyprland/anyrun flakes
Stable restore point before 26.05 — last known good unstable config. Unify all hosts on nixos-26.05 + home-manager release-26.05. Drop hyprland, anyrun, nixpkgs-stable, home-manager-stable, stylix-stable inputs. Hyprland 0.55.2 and anyrun 25.12.0 from nixpkgs. Anyrun config via xdg.configFile (no HM module in 26.05). Stylix on master until release-26.05 branch exists. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
f5d7fd440e
commit
72246fc440
5 changed files with 104 additions and 1048 deletions
52
flake.nix
52
flake.nix
|
|
@ -2,25 +2,17 @@
|
|||
description = "FredOS NixOS configuration";
|
||||
|
||||
inputs = {
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager-stable = {
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
|
||||
# Unstable HM for Hyprland Lua config support (configType = "lua",
|
||||
# available since HM master / future 26.05).
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
url = "github:nix-community/home-manager/release-26.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
zen-browser = {
|
||||
url = "github:0xc000022070/zen-browser-flake";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs-stable";
|
||||
home-manager.follows = "home-manager-stable";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
home-manager.follows = "home-manager";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -28,57 +20,39 @@
|
|||
|
||||
proton-cachyos-nix.url = "github:powerofthe69/proton-cachyos-nix";
|
||||
|
||||
# Pin Hyprland to upstream so we get the 0.52.2+ fixes ahead of
|
||||
# nixos-25.11's slower bump cadence. Doesn't follow our nixpkgs —
|
||||
# upstream needs newer stdenv than 25.11 ships.
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
|
||||
anyrun = {
|
||||
url = "github:anyrun-org/anyrun";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# No release-26.05 branch yet — use master until stylix cuts one.
|
||||
stylix.url = "github:nix-community/stylix";
|
||||
stylix-stable = {
|
||||
url = "github:nix-community/stylix/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
};
|
||||
outputs =
|
||||
{ self
|
||||
, nixpkgs-stable
|
||||
, nixpkgs
|
||||
, home-manager-stable
|
||||
, home-manager
|
||||
, zen-browser
|
||||
, nix-cachyos-kernel
|
||||
, hyprland
|
||||
, anyrun
|
||||
, stylix
|
||||
, stylix-stable
|
||||
, proton-cachyos-nix
|
||||
, ...
|
||||
} @ inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
mkHost = hostname: pkgsInput: hmInput: extraModules: pkgsInput.lib.nixosSystem {
|
||||
mkHost = hostname: extraModules: nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = { inherit inputs; pkgs-unstable = nixpkgs.legacyPackages.${system}; };
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hosts/${hostname}.nix
|
||||
./hosts/hardware/${hostname}.nix
|
||||
./common.nix
|
||||
hmInput.nixosModules.home-manager
|
||||
home-manager.nixosModules.home-manager
|
||||
stylix.nixosModules.stylix
|
||||
./settings/stylix.nix
|
||||
] ++ 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 [ stylix.nixosModules.stylix ./settings/stylix.nix ];
|
||||
FredOS-Mediaserver = mkHost "FredOS-Mediaserver" nixpkgs-stable home-manager-stable [ stylix-stable.nixosModules.stylix ./settings/stylix.nix ];
|
||||
FredOS-Macbook = mkHost "FredOS-Macbook" nixpkgs home-manager [ stylix.nixosModules.stylix ./settings/stylix.nix ];
|
||||
FredOS-Gaming = mkHost "FredOS-Gaming" [];
|
||||
FredOS-Mediaserver = mkHost "FredOS-Mediaserver" [];
|
||||
FredOS-Macbook = mkHost "FredOS-Macbook" [];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue