Compare commits

...

2 commits

3 changed files with 28 additions and 6 deletions

View file

@ -53,14 +53,33 @@
description = "All my NixoS machines"; description = "All my NixoS machines";
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
nodes = colmenaHive.nodes;
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; }; pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
}; };
nixpkgs = import nixpkgs { system = "x86_64-linux"; }; nixpkgs = import nixpkgs { system = "x86_64-linux"; };
}; };
defaults = { lib, config, name, ... }: { defaults = { lib, config, name, nodes, ... }: {
imports = [ ./hosts/${name} ./profiles/base ]; imports = [ ./hosts/${name} ./profiles/base ];
options.cherrykitten = {
primaryIPv4 = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default =
if (config.networking.interfaces ? eth0) then
(builtins.elemAt config.networking.interfaces.eth0.ipv4.addresses 0).address
else null;
};
primaryIPv6 = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default =
if (config.networking.interfaces ? eth0) then
(builtins.elemAt config.networking.interfaces.eth0.ipv6.addresses 0).address
else null;
};
};
config = {
networking.hostName = name; networking.hostName = name;
networking.domain = "cherrykitten.xyz"; networking.domain = "cherrykitten.xyz";
@ -69,6 +88,7 @@
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; }; pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
}; };
}; };
};
} // hosts; } // hosts;
colmenaHive = inputs.colmena.lib.makeHive colmena; colmenaHive = inputs.colmena.lib.makeHive colmena;

View file

@ -19,6 +19,7 @@
# misc # misc
nodePackages.prettier nodePackages.prettier
marksman marksman
haskell-language-server
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [

View file

@ -69,6 +69,7 @@ return {
}, },
}, },
}, },
hls = {},
}, },
}, },
}, },