felixalb/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: update to 25.11. Breaks worf/darwin.

Browse Source
This commit is contained in:
Felix Albrigtsen
2025-11-30 23:54:27 +01:00
parent 520a96878b
commit 9c0ea93934
9 changed files with 72 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@@ -2,20 +2,23 @@
description = "Felixalb System flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Remember to update ./common/auto-upgrade.nix
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; # Remember to update ./common/auto-upgrade.nix
nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin";
nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05";
# nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.11"; # TODO - Uncomment when available
# nix-darwin.inputs.nixpkgs.follows = "nixpkgs-darwin";
nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.url = "github:nix-community/home-manager/release-25.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.7.1";
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
extra-config.url = "git+file:///home/felixalb/nix-extra-config";
# extra-config.url = "git+file:///home/felixalb/nix-extra-config"; # TODO - Re-add on challenger
sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
@@ -29,9 +32,10 @@
, nix-darwin
, nixpkgs
, nixpkgs-2211
, nixpkgs-darwin
, nixpkgs-unstable
, sops-nix
, extra-config
# , extra-config
, ... }@inputs:
let
pkgs-overlay = final: prev: {
@@ -52,7 +56,7 @@
{
nixosConfigurations = let
normalSys = name: hostConfig: nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
system = "x86_64-linux"; # TODO - Handle
specialArgs = {
inherit inputs;
};
@@ -85,7 +89,7 @@
# Media / storage server
challenger = normalSys "challenger" {
modules = [
extra-config.nixosModules.default
# extra-config.nixosModules.default
];
};