Remove titan and pin machine stateVersions.
parent
7974d40c9d
commit
fd40d04d2f
17
flake.nix
17
flake.nix
|
@ -46,21 +46,15 @@
|
|||
specialArgs = { inherit system; };
|
||||
nodeNixpkgs = {
|
||||
framework = stoat.pkgs;
|
||||
deimos = tapir.pkgs;
|
||||
phobos = tapir.pkgs;
|
||||
titan = stoat.pkgs;
|
||||
};
|
||||
nodeSpecialArgs = {
|
||||
framework = {
|
||||
inherit (stoat) stateVersion home-manager;
|
||||
};
|
||||
deimos = {
|
||||
inherit (tapir) stateVersion;
|
||||
inherit (stoat) home-manager;
|
||||
};
|
||||
phobos = {
|
||||
inherit (tapir) stateVersion sops-nix;
|
||||
};
|
||||
titan = {
|
||||
inherit (stoat) stateVersion home-manager;
|
||||
inherit (tapir) sops-nix;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -79,15 +73,14 @@
|
|||
|
||||
deimos.imports = [ ./hive/deimos ];
|
||||
phobos.imports = [ ./hive/phobos ];
|
||||
titan.imports = [ ./hive/titan ];
|
||||
};
|
||||
|
||||
packages.${system}.digital-ocean = {
|
||||
stoat = import ./digital-ocean {
|
||||
inherit (stoat) pkgs stateVersion;
|
||||
inherit (stoat) pkgs;
|
||||
};
|
||||
tapir = import ./digital-ocean {
|
||||
inherit (tapir) pkgs stateVersion;
|
||||
inherit (tapir) pkgs;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ system, stateVersion, lib, ... }:
|
||||
{ system, lib, ... }:
|
||||
let
|
||||
blog = builtins.getFlake
|
||||
"github:jrpotter/blog/29a44a257989ab85a38690b18debfe1b27a70674";
|
||||
|
@ -59,5 +59,5 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
system.stateVersion = stateVersion;
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ system, stateVersion, home-manager, ... }:
|
||||
{ system, home-manager, ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
@ -38,7 +38,10 @@
|
|||
] base;
|
||||
|
||||
# Used to pass non-default parameters to submodules.
|
||||
extraSpecialArgs = { inherit system stateVersion; };
|
||||
extraSpecialArgs = {
|
||||
inherit system;
|
||||
stateVersion = "23.05";
|
||||
};
|
||||
};
|
||||
|
||||
# virt-manager requires dconf to remember settings.
|
||||
|
@ -54,5 +57,5 @@
|
|||
];
|
||||
};
|
||||
|
||||
system.stateVersion = stateVersion;
|
||||
system.stateVersion = "23.05";
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ system, stateVersion, sops-nix, pkgs, lib, ... }:
|
||||
{ system, sops-nix, pkgs, lib, ... }:
|
||||
let
|
||||
boardwise = builtins.getFlake
|
||||
"github:boardwise-gg/website/db73e3b4f06659fd477be8e76594c01a185f1496";
|
||||
|
@ -81,5 +81,5 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
system.stateVersion = stateVersion;
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
{ system, stateVersion, home-manager, lib, ... }:
|
||||
{
|
||||
imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
|
||||
../../digital-ocean/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
deployment.targetHost = null;
|
||||
|
||||
networking.hostName = "titan";
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
||||
programs.mosh.enable = true;
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.jrpotter = import ../../users/jrpotter;
|
||||
# Used to pass non-default parameters to submodules.
|
||||
extraSpecialArgs = { inherit system stateVersion; };
|
||||
};
|
||||
|
||||
users.users.jrpotter = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [
|
||||
"docker"
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
];
|
||||
};
|
||||
|
||||
system.stateVersion = stateVersion;
|
||||
}
|
Loading…
Reference in New Issue