pederbs/config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

dsalkjdsalkj

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-06-15 08:32:00 +02:00
parent 8107e28102
commit 373a1d7966
2 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flake.nix
View File

@@ -180,17 +180,19 @@
"riscv64-linux"
];
hosts = import ./hosts { inherit input-views; };
in {
inputs = inputs';
lib = import ./lib.nix { inputs = inputs'; };
inherit (hosts)
inherit (import ./hosts { inherit input-views; })
# nixos
nixosModules
nixosConfigurations
nixosReports
images
# system-manager
systemConfigs
;
overlays = {
@@ -262,23 +264,6 @@
))
];
# system-manager
systemConfigs = let
mkSystem = name: inputs: system: inputs.system-manager-edge.lib.makeSystemConfig {
extraSpecialArgs.inputs = inputs;
extraSpecialArgs.system = system; # TODO: find an alternative
modules = [
{ nixpkgs.hostPlatform = system; }
{ system-manager.allowAnyDistro = true; }
inputs.nix-system-graphics-edge.systemModules.default
./hosts/system-manager/${name}/configuration.nix
];
};
in {
FuriPhoneFLX1 = mkSystem "furiphoneflx1" input-views.inputs-edge "aarch64-linux";
test = mkSystem "furiphoneflx1" input-views.inputs-edge "x86_64-linux";
};
devShells = forAllSystems ({ pkgs, system, ... }: let
mkShell = {...}@args: packages: pkgs.mkShellNoCC (args // { packages = (args.packages or []) ++ packages; });
#mkShell'= {...}@args: packages: pkgs.mkShellNoCC (args // {

73
hosts/default.nix
View File

@@ -53,10 +53,11 @@ let
});
mkConfig = extra-modules: domain: system: inputs: stateVersion: modules: hostname: inputs.nixpkgs.lib.nixosSystem {
#inherit system;
specialArgs = {
inherit inputs;
};
specialArgs = { inherit inputs; };
modules = [
{
# _module.args = { inherit inputs; };
}
(mkModule extra-modules domain system inputs stateVersion modules hostname)
];
};
@@ -87,7 +88,7 @@ let
nord = mk "pbsds.net" "x86_64-linux" input-views.inputs-2411 "24.11" [ ts1 au ];
sopp = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 au nixld p1005 ];
bjarte = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 nixld ];
bolle = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts2 au ];
bolle = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts2 au ];
eple = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts1 au tse dns64 ];
garp = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts2 au ];
# hasselknippe= mk "pbsds.net" "aarch64-linux" input-views.inputs-2405 "24.05" [ ts1 hw.pine64-pinebook-pro ];
@@ -101,28 +102,52 @@ rec {
nixosConfigurations = mkHosts (mkConfig []);
nixosReports = builtins.mapAttrs (key: self.lib.mkNixosConfigSummary) nixosConfigurations;
images = {};
/*
images = let
mk-nspawn-setup = hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk
(pkgs.callPackage ./../pkgs/mk-nspawn-setup {})
(mkHosts (mkConfig [ "${nixos-nspawn}/nspawn-tarball.nix" ])).${hostname};
# system-manager
systemConfigs = let
mkSystem = name: inputs: system: inputs.system-manager-edge.lib.makeSystemConfig {
extraSpecialArgs = {
inherit inputs;
inherit system; # TODO: find an alternative
};
modules = [
{ nixpkgs.hostPlatform = system; }
{ system-manager.allowAnyDistro = true; }
inputs.nix-system-graphics-edge.systemModules.default
./system-manager/${name}/system-configuration.nix
];
};
in {
asgaut-sd = (mkHosts (mkConfig [
"${nixos-hardware}/starfive/visionfive/v2/sd-image.nix"
{
nixpkgs.buildPlatform.system = system; # cross
sdImage.compressImage = false;
}
])).asgaut.config.system.build.sdImage;
#brumlebasse-nspawn-setup = mk-nspawn-setup "brumlebasse";
#brumlebasse-openstack = nixos-generators-2405.nixosGenerate {
# system = "x86_64-linux";
# specialArgs = { inherit inputs; };
# modules = [ (mkHosts (mkModule [])).brumlebasse ];
# format = "openstack";
#};
FuriPhoneFLX1 = mkSystem "furiphoneflx1" input-views.inputs-edge "aarch64-linux";
test = mkSystem "furiphoneflx1" input-views.inputs-edge "x86_64-linux";
};
images = {};
/** /
images =
let
mk-nspawn-setup =
hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk
(pkgs.callPackage ./../pkgs/mk-nspawn-setup { })
(mkHosts (mkConfig [ "${nixos-nspawn}/nspawn-tarball.nix" ])).${hostname};
in
{
asgaut-sd =
(mkHosts (mkConfig [
"${nixos-hardware}/starfive/visionfive/v2/sd-image.nix"
{
nixpkgs.buildPlatform.system = system; # cross
sdImage.compressImage = false;
}
])).asgaut.config.system.build.sdImage;
#brumlebasse-nspawn-setup = mk-nspawn-setup "brumlebasse";
#brumlebasse-openstack = nixos-generators-2405.nixosGenerate {
# system = "x86_64-linux";
# specialArgs = { inherit inputs; };
# modules = [ (mkHosts (mkModule [])).brumlebasse ];
# format = "openstack";
#};
};
/*
*/
}