Switch to stable branch
This commit is contained in:
parent
34997e9134
commit
fc1484a6b6
7 changed files with 72 additions and 51 deletions
66
flake.lock
generated
66
flake.lock
generated
|
|
@ -3,7 +3,7 @@
|
||||||
"agenix": {
|
"agenix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": "darwin",
|
"darwin": "darwin",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"ragenix",
|
"ragenix",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
|
@ -250,20 +250,42 @@
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-s"
|
"ragenix",
|
||||||
|
"agenix",
|
||||||
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747688870,
|
"lastModified": 1745494811,
|
||||||
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
|
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d5f1f641b289553927b3801580598d200a501863",
|
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager-s": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-s"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767514898,
|
||||||
|
"narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -288,28 +310,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"ragenix",
|
|
||||||
"agenix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1745494811,
|
|
||||||
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"kitty-themes-src": {
|
"kitty-themes-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -486,16 +486,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-s": {
|
"nixpkgs-s": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767313136,
|
"lastModified": 1767599900,
|
||||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
"narHash": "sha256-fv4CyGpTnDpVxUy8JwLXVKz9w7y1vUxIBKB1m1UM1Z0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
"rev": "83fecd9a282517276e99463a59a067c9fc86d713",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -545,7 +545,7 @@
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"home-manager": "home-manager",
|
"home-manager-s": "home-manager-s",
|
||||||
"home-manager-u": "home-manager-u",
|
"home-manager-u": "home-manager-u",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nix-rice": "nix-rice",
|
"nix-rice": "nix-rice",
|
||||||
|
|
|
||||||
44
flake.nix
44
flake.nix
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
# Nixpkgs channels
|
# Nixpkgs channels
|
||||||
# Stable channel (release 25.05) for production systems
|
# 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
|
# Unstable channel for development and latest packages
|
||||||
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
# Default to unstable for most packages
|
# Default to unstable for most packages
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
# Home Manager for user-level configuration
|
# Home Manager for user-level configuration
|
||||||
# Stable version aligned with stable nixpkgs
|
# 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
|
# Unstable version aligned with unstable nixpkgs
|
||||||
home-manager-u = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-u"; };
|
home-manager-u = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-u"; };
|
||||||
|
|
||||||
|
|
@ -333,15 +333,19 @@
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
# THOR - AMD Desktop System
|
# THOR - AMD Desktop System
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
thor = inputs.nixpkgs-u.lib.nixosSystem {
|
thor = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||||
|
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
# Hardware-specific configurations
|
# Hardware-specific configurations
|
||||||
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
inputs.home-manager-u.nixosModules.default
|
inputs.home-manager-s.nixosModules.default
|
||||||
self.nixosModules.homeManagerModules
|
self.nixosModules.homeManagerModules
|
||||||
|
|
||||||
# Base and main modules
|
# Base and main modules
|
||||||
|
|
@ -371,8 +375,12 @@
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
# SIF - Intel Desktop System
|
# SIF - Intel Desktop System
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
sif = inputs.nixpkgs-u.lib.nixosSystem {
|
sif = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||||
|
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
# Intel-specific hardware configurations
|
# Intel-specific hardware configurations
|
||||||
inputs.nixos-hardware.nixosModules.common-cpu-intel-cpu-only
|
inputs.nixos-hardware.nixosModules.common-cpu-intel-cpu-only
|
||||||
|
|
@ -380,7 +388,7 @@
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
inputs.home-manager-u.nixosModules.default
|
inputs.home-manager-s.nixosModules.default
|
||||||
self.nixosModules.homeManagerModules
|
self.nixosModules.homeManagerModules
|
||||||
|
|
||||||
# Base and main modules
|
# Base and main modules
|
||||||
|
|
@ -410,8 +418,12 @@
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
# ODIN - Intel Laptop/Server Hybrid
|
# ODIN - Intel Laptop/Server Hybrid
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
odin = inputs.nixpkgs-u.lib.nixosSystem {
|
odin = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||||
|
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
# Intel laptop hardware configurations
|
# Intel laptop hardware configurations
|
||||||
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
||||||
|
|
@ -419,7 +431,7 @@
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
inputs.home-manager-u.nixosModules.default
|
inputs.home-manager-s.nixosModules.default
|
||||||
self.nixosModules.homeManagerModules
|
self.nixosModules.homeManagerModules
|
||||||
|
|
||||||
# Base modules (server-focused)
|
# Base modules (server-focused)
|
||||||
|
|
@ -448,8 +460,12 @@
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
# HEIMDALL - AMD Server
|
# HEIMDALL - AMD Server
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
heimdall = inputs.nixpkgs-u.lib.nixosSystem {
|
heimdall = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||||
|
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
# AMD server hardware configurations
|
# AMD server hardware configurations
|
||||||
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
||||||
|
|
@ -457,7 +473,7 @@
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
inputs.home-manager-u.nixosModules.default
|
inputs.home-manager-s.nixosModules.default
|
||||||
self.nixosModules.homeManagerModules
|
self.nixosModules.homeManagerModules
|
||||||
|
|
||||||
# Base modules (server-focused)
|
# Base modules (server-focused)
|
||||||
|
|
@ -517,15 +533,19 @@
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
# BALDUR - Intel Server
|
# BALDUR - Intel Server
|
||||||
# ==================================================================
|
# ==================================================================
|
||||||
baldur = inputs.nixpkgs-u.lib.nixosSystem {
|
baldur = inputs.nixpkgs-s.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
stable = inputs.nixpkgs-s.legacyPackages.${system}; # Pass stable channel
|
||||||
|
unstable = inputs.nixpkgs-u.legacyPackages.${system}; # Pass unstable channel
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
# Intel server hardware configurations
|
# Intel server hardware configurations
|
||||||
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
inputs.home-manager-u.nixosModules.default
|
inputs.home-manager-s.nixosModules.default
|
||||||
self.nixosModules.homeManagerModules
|
self.nixosModules.homeManagerModules
|
||||||
|
|
||||||
# Base modules (server-focused)
|
# Base modules (server-focused)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
packages = [
|
packages = [
|
||||||
# pkgs.retroarch-free
|
pkgs.retroarch-free
|
||||||
pkgs.heroic
|
pkgs.heroic
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
# minecraft
|
# minecraft
|
||||||
# mycrypto
|
# mycrypto
|
||||||
# pcmanfm
|
# pcmanfm
|
||||||
# retroarch-free
|
retroarch-free
|
||||||
# shotwell
|
# shotwell
|
||||||
# signal-desktop
|
# signal-desktop
|
||||||
# slack
|
# slack
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
# minecraft
|
# minecraft
|
||||||
# mycrypto
|
# mycrypto
|
||||||
# pcmanfm
|
# pcmanfm
|
||||||
# retroarch-free
|
retroarch-free
|
||||||
# seahorse
|
# seahorse
|
||||||
# shotwell
|
# shotwell
|
||||||
# signal-desktop
|
# signal-desktop
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, ... }:
|
{ unstable, config, ... }:
|
||||||
let hosts = import ../hosts.nix; in {
|
let hosts = import ../hosts.nix; in {
|
||||||
users.groups.garage = { };
|
users.groups.garage = { };
|
||||||
users.users.garage = { isSystemUser = true; group = "garage"; };
|
users.users.garage = { isSystemUser = true; group = "garage"; };
|
||||||
|
|
@ -20,7 +20,7 @@ let hosts = import ../hosts.nix; in {
|
||||||
|
|
||||||
services.garage = {
|
services.garage = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.garage_2;
|
package = unstable.garage_2;
|
||||||
settings = {
|
settings = {
|
||||||
# data_dir = "/mnt/raid/garage/";
|
# data_dir = "/mnt/raid/garage/";
|
||||||
replication_factor = 1;
|
replication_factor = 1;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
{
|
{ unstable, ... }: {
|
||||||
services = {
|
services = {
|
||||||
immich = {
|
immich = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = unstable.immich;
|
||||||
accelerationDevices = null;
|
accelerationDevices = null;
|
||||||
redis.enable = true;
|
redis.enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue