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

Remove titan and pin machine stateVersions.

main
Joshua Potter 2023-12-23 16:07:35 -05:00
parent 7974d40c9d
commit fd40d04d2f
5 changed files with 15 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.nix
View File

@ -46,21 +46,15 @@
specialArgs = { inherit system; }; specialArgs = { inherit system; };
nodeNixpkgs = { nodeNixpkgs = {
framework = stoat.pkgs; framework = stoat.pkgs;
deimos = tapir.pkgs;
phobos = tapir.pkgs; phobos = tapir.pkgs;
titan = stoat.pkgs;
}; };
nodeSpecialArgs = { nodeSpecialArgs = {
framework = { framework = {
inherit (stoat) stateVersion home-manager; inherit (stoat) home-manager;
};
deimos = {
inherit (tapir) stateVersion;
}; };
phobos = { phobos = {
inherit (tapir) stateVersion sops-nix; inherit (tapir) sops-nix;
};
titan = {
inherit (stoat) stateVersion home-manager;
}; };
}; };
}; };
@ -79,15 +73,14 @@
deimos.imports = [ ./hive/deimos ]; deimos.imports = [ ./hive/deimos ];
phobos.imports = [ ./hive/phobos ]; phobos.imports = [ ./hive/phobos ];
titan.imports = [ ./hive/titan ];
}; };
packages.${system}.digital-ocean = { packages.${system}.digital-ocean = {
stoat = import ./digital-ocean { stoat = import ./digital-ocean {
inherit (stoat) pkgs stateVersion; inherit (stoat) pkgs;
}; };
tapir = import ./digital-ocean { tapir = import ./digital-ocean {
inherit (tapir) pkgs stateVersion; inherit (tapir) pkgs;
}; };
}; };

4
hive/deimos/default.nix
View File

@ -1,4 +1,4 @@
{ system, stateVersion, lib, ... }: { system, lib, ... }:
let let
blog = builtins.getFlake blog = builtins.getFlake
"github:jrpotter/blog/29a44a257989ab85a38690b18debfe1b27a70674"; "github:jrpotter/blog/29a44a257989ab85a38690b18debfe1b27a70674";
@ -59,5 +59,5 @@ in
}; };
}; };
system.stateVersion = stateVersion; system.stateVersion = "23.11";
} }

9
hive/framework/default.nix
View File

@ -1,4 +1,4 @@
{ system, stateVersion, home-manager, ... }: { system, home-manager, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -38,7 +38,10 @@
] base; ] base;
# Used to pass non-default parameters to submodules. # 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. # virt-manager requires dconf to remember settings.
@ -54,5 +57,5 @@
]; ];
}; };
system.stateVersion = stateVersion; system.stateVersion = "23.05";
} }

4
hive/phobos/default.nix
View File

@ -1,4 +1,4 @@
{ system, stateVersion, sops-nix, pkgs, lib, ... }: { system, sops-nix, pkgs, lib, ... }:
let let
boardwise = builtins.getFlake boardwise = builtins.getFlake
"github:boardwise-gg/website/db73e3b4f06659fd477be8e76594c01a185f1496"; "github:boardwise-gg/website/db73e3b4f06659fd477be8e76594c01a185f1496";
@ -81,5 +81,5 @@ in
}; };
}; };
system.stateVersion = stateVersion; system.stateVersion = "23.11";
} }

36
hive/titan/default.nix
View File

@ -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;
}