r
/
nixos-configuration
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

framework: Upgrade to 23.11.

main
Joshua Potter 2023-12-23 14:17:37 -07:00
parent fd40d04d2f
commit f0faf5d5d1
2 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
flake.lock
View File

@ -1,42 +1,26 @@
{ {
"nodes": { "nodes": {
"home-manager-23_05": { "home-manager-23_11": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-23_05" "nixpkgs-23_11"
] ]
}, },
"locked": { "locked": {
"lastModified": 1702195668, "lastModified": 1703113038,
"narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=", "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f", "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-23_05": {
"locked": {
"lastModified": 1702221085,
"narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-23_11": { "nixpkgs-23_11": {
"locked": { "locked": {
"lastModified": 1702233072, "lastModified": 1702233072,
@ -71,8 +55,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"home-manager-23_05": "home-manager-23_05", "home-manager-23_11": "home-manager-23_11",
"nixpkgs-23_05": "nixpkgs-23_05",
"nixpkgs-23_11": "nixpkgs-23_11", "nixpkgs-23_11": "nixpkgs-23_11",
"sops-nix-23_11": "sops-nix-23_11" "sops-nix-23_11": "sops-nix-23_11"
} }

46
flake.nix
View File

@ -2,56 +2,45 @@
description = "Colmena hive configuration."; description = "Colmena hive configuration.";
inputs = { inputs = {
# Stoat nixpkgs-23_11 = {
nixpkgs-23_05.url = "github:NixOS/nixpkgs/nixos-23.05"; url = "github:NixOS/nixpkgs/nixos-23.11";
home-manager-23_05 = { };
url = "github:nix-community/home-manager/release-23.05"; home-manager-23_11 = {
inputs.nixpkgs.follows = "nixpkgs-23_05"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs-23_11";
}; };
# Tapir
nixpkgs-23_11.url = "github:NixOS/nixpkgs/nixos-23.11";
sops-nix-23_11 = { sops-nix-23_11 = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs-23_11"; inputs.nixpkgs.follows = "nixpkgs-23_11";
}; };
}; };
outputs = { outputs = { nixpkgs-23_11, home-manager-23_11, sops-nix-23_11, ... }:
nixpkgs-23_05,
home-manager-23_05,
nixpkgs-23_11,
sops-nix-23_11,
...
}:
let let
system = "x86_64-linux"; system = "x86_64-linux";
stoat = {
stateVersion = "23.05";
pkgs = import nixpkgs-23_05 { inherit system; };
home-manager = home-manager-23_05;
sops-nix = null;
};
tapir = { tapir = {
stateVersion = "23.11"; stateVersion = "23.11";
pkgs = import nixpkgs-23_11 { inherit system; }; pkgs = import nixpkgs-23_11 { inherit system; };
home-manager = null; home-manager = home-manager-23_11;
sops-nix = sops-nix-23_11; sops-nix = sops-nix-23_11;
}; };
in in
{ {
colmena = { colmena = {
meta = { meta = {
nixpkgs = stoat.pkgs; nixpkgs = tapir.pkgs;
specialArgs = { inherit system; }; specialArgs = { inherit system; };
nodeNixpkgs = { nodeNixpkgs = {
framework = stoat.pkgs; framework = tapir.pkgs;
deimos = tapir.pkgs; deimos = tapir.pkgs;
phobos = tapir.pkgs; phobos = tapir.pkgs;
}; };
nodeSpecialArgs = { nodeSpecialArgs = {
framework = { framework = {
inherit (stoat) home-manager; inherit (tapir) home-manager;
};
deimos = {
inherit (tapir) sops-nix;
}; };
phobos = { phobos = {
inherit (tapir) sops-nix; inherit (tapir) sops-nix;
@ -76,17 +65,14 @@
}; };
packages.${system}.digital-ocean = { packages.${system}.digital-ocean = {
stoat = import ./digital-ocean {
inherit (stoat) pkgs;
};
tapir = import ./digital-ocean { tapir = import ./digital-ocean {
inherit (tapir) pkgs; inherit (tapir) pkgs stateVersion;
}; };
}; };
devShells.${system}.default = devShells.${system}.default =
let let
pkgs = stoat.pkgs; pkgs = tapir.pkgs;
in in
pkgs.mkShell { pkgs.mkShell {
packages = with pkgs; [ ssh-to-age sops ]; packages = with pkgs; [ ssh-to-age sops ];