Switch to stable branch
This commit is contained in:
parent
34997e9134
commit
fc1484a6b6
7 changed files with 72 additions and 51 deletions
44
flake.nix
44
flake.nix
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
# Nixpkgs channels
|
||||
# Stable channel (release 25.05) for production systems
|
||||
nixpkgs-s.url = "github:NixOS/nixpkgs/release-25.05";
|
||||
nixpkgs-s.url = "github:NixOS/nixpkgs/release-25.11";
|
||||
# Unstable channel for development and latest packages
|
||||
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
# Default to unstable for most packages
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
# Home Manager for user-level configuration
|
||||
# Stable version aligned with stable nixpkgs
|
||||
home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs-s"; };
|
||||
home-manager-s = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs-s"; };
|
||||
# Unstable version aligned with unstable nixpkgs
|
||||
home-manager-u = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-u"; };
|
||||
|
||||
|
|
@ -333,15 +333,19 @@
|
|||
# ==================================================================
|
||||
# THOR - AMD Desktop System
|
||||
# ==================================================================
|
||||
thor = inputs.nixpkgs-u.lib.nixosSystem {
|
||||
thor = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||
};
|
||||
modules = [
|
||||
# Hardware-specific configurations
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||
|
||||
# Home manager
|
||||
inputs.home-manager-u.nixosModules.default
|
||||
inputs.home-manager-s.nixosModules.default
|
||||
self.nixosModules.homeManagerModules
|
||||
|
||||
# Base and main modules
|
||||
|
|
@ -371,8 +375,12 @@
|
|||
# ==================================================================
|
||||
# SIF - Intel Desktop System
|
||||
# ==================================================================
|
||||
sif = inputs.nixpkgs-u.lib.nixosSystem {
|
||||
sif = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||
};
|
||||
modules = [
|
||||
# Intel-specific hardware configurations
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-intel-cpu-only
|
||||
|
|
@ -380,7 +388,7 @@
|
|||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||
|
||||
# Home manager
|
||||
inputs.home-manager-u.nixosModules.default
|
||||
inputs.home-manager-s.nixosModules.default
|
||||
self.nixosModules.homeManagerModules
|
||||
|
||||
# Base and main modules
|
||||
|
|
@ -410,8 +418,12 @@
|
|||
# ==================================================================
|
||||
# ODIN - Intel Laptop/Server Hybrid
|
||||
# ==================================================================
|
||||
odin = inputs.nixpkgs-u.lib.nixosSystem {
|
||||
odin = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||
};
|
||||
modules = [
|
||||
# Intel laptop hardware configurations
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
||||
|
|
@ -419,7 +431,7 @@
|
|||
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||
|
||||
# Home manager
|
||||
inputs.home-manager-u.nixosModules.default
|
||||
inputs.home-manager-s.nixosModules.default
|
||||
self.nixosModules.homeManagerModules
|
||||
|
||||
# Base modules (server-focused)
|
||||
|
|
@ -448,8 +460,12 @@
|
|||
# ==================================================================
|
||||
# HEIMDALL - AMD Server
|
||||
# ==================================================================
|
||||
heimdall = inputs.nixpkgs-u.lib.nixosSystem {
|
||||
heimdall = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||
};
|
||||
modules = [
|
||||
# AMD server hardware configurations
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
||||
|
|
@ -457,7 +473,7 @@
|
|||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||
|
||||
# Home manager
|
||||
inputs.home-manager-u.nixosModules.default
|
||||
inputs.home-manager-s.nixosModules.default
|
||||
self.nixosModules.homeManagerModules
|
||||
|
||||
# Base modules (server-focused)
|
||||
|
|
@ -517,15 +533,19 @@
|
|||
# ==================================================================
|
||||
# BALDUR - Intel Server
|
||||
# ==================================================================
|
||||
baldur = inputs.nixpkgs-u.lib.nixosSystem {
|
||||
baldur = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||
};
|
||||
modules = [
|
||||
# Intel server hardware configurations
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||
|
||||
# Home manager
|
||||
inputs.home-manager-u.nixosModules.default
|
||||
inputs.home-manager-s.nixosModules.default
|
||||
self.nixosModules.homeManagerModules
|
||||
|
||||
# Base modules (server-focused)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue