aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/configurations.nix19
-rw-r--r--nixos/default.nix10
-rw-r--r--nixos/machine/dean.nix2
3 files changed, 15 insertions, 16 deletions
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index c058d16..be8beb7 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -1,24 +1,15 @@
self:
-with self.inputs;
with builtins;
-with nixpkgs.lib; let
+with self.inputs.nixpkgs.lib; let
+ inherit (self.inputs) nixpkgs nixos-hardware nixturris vpsadminos;
+
modules = hostname:
[
self.nixosModules.default
- shellrc.nixosModules.default
- usbkey.nixosModules.default
- nixbigclown.nixosModules.default
- (personal-secret.lib.personalSecrets hostname)
+ (self.inputs.personal-secret.lib.personalSecrets hostname)
{
networking.hostName = hostname;
- nixpkgs.overlays = [
- self.overlays.default
- sterm.overlay
- agenix.overlays.default
- shvspy.overlays.default
- flatline.overlays.default
- shvcli.overlays.default
- ];
+ nixpkgs.overlays = [self.overlays.default];
system.configurationRevision = self.rev or "dirty";
}
]
diff --git a/nixos/default.nix b/nixos/default.nix
index 2d5ff8e..974c73d 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -7,6 +7,14 @@ in
modules
// machines
// {
- default = {imports = attrValues modules;};
+ default = {
+ imports = with self.inputs;
+ [
+ shellrc.nixosModules.default
+ usbkey.nixosModules.default
+ nixbigclown.nixosModules.default
+ ]
+ ++ attrValues modules;
+ };
defaultRouters = {imports = attrValues routers;};
}
diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix
index 030aae9..906881f 100644
--- a/nixos/machine/dean.nix
+++ b/nixos/machine/dean.nix
@@ -37,7 +37,7 @@ with lib; {
environment.systemPackages = with pkgs; [
#openocd
- sterm
+ tio
];
# TODO: ubootTools build is broken!