Compare commits

...

4 Commits

Author SHA1 Message Date
748894f99f test 2025-02-06 21:02:25 -05:00
33c2718d40 removed duplicate zerotierone entry 2025-02-06 19:02:02 -05:00
78500e6122 removed vlans 2025-02-06 19:02:02 -05:00
9459d4797e testing cosmic 2025-02-06 19:02:02 -05:00
6 changed files with 47 additions and 39 deletions

View File

@@ -128,6 +128,7 @@
"maxtime", "maxtime",
"mechatroner", "mechatroner",
"mediainfo", "mediainfo",
"microvm",
"mklabel", "mklabel",
"mkpart", "mkpart",
"modesetting", "modesetting",

View File

@@ -33,8 +33,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
system_tools = { microvm = {
url = "github:RichieCahill/system_tools"; url = "github:astro/microvm.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -47,6 +47,10 @@
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
system_tools = {
url = "github:RichieCahill/system_tools";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
@@ -56,6 +60,7 @@
systems, systems,
nixos-cosmic, nixos-cosmic,
sops-nix, sops-nix,
microvm,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs; inherit (self) outputs;
@@ -71,10 +76,35 @@
in { in {
inherit lib; inherit lib;
overlays = import ./overlays {inherit inputs outputs;}; overlays = import ./overlays {inherit inputs outputs;};
devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;}); devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
formatter = forEachSystem (pkgs: pkgs.alejandra); formatter = forEachSystem (pkgs: pkgs.alejandra);
emulated-dev = nixpkgs.lib.nixosSystem {
# host system
system = "x86_64-linux";
modules = let
guestSystem = "aarch64-unknown-linux-gnu";
# you can use packages in the guest machine with cross system configuration
pkgs = import nixpkgs {
system = "x86_64-linux";
crossSystem.config = guestSystem;
};
in [
{nixpkgs.crossSystem.config = guestSystem;}
microvm.nixosModules.microvm
{
microvm = {
# you can choose what CPU will be emulated by qemu
cpu = "cortex-a53";
hypervisor = "qemu";
};
environment.systemPackages = with pkgs; [ cowsay htop ];
services.getty.autologinUser = "root";
system.stateVersion = "23.11";
}
];
};
nixosConfigurations = { nixosConfigurations = {
bob = lib.nixosSystem { bob = lib.nixosSystem {
modules = [ modules = [

View File

@@ -7,32 +7,12 @@
}; };
systemd.network = { systemd.network = {
enable = true; enable = true;
netdevs = {
"20-ioit-vlan" = {
netdevConfig = {
Kind = "vlan";
Name = "ioit-vlan";
};
vlanConfig.Id = 20;
};
"21-internal-ioit-vlan" = {
netdevConfig = {
Kind = "vlan";
Name = "internal-ioit-vlan";
};
vlanConfig.Id = 21;
};
};
networks = { networks = {
"10-1GB_Primary" = { "10-1GB_Primary" = {
matchConfig.Name = "enp98s0f0"; matchConfig.Name = "enp98s0f0";
address = [ "192.168.95.14/24" ]; address = [ "192.168.95.14/24" ];
routes = [{ Gateway = "192.168.95.1"; }]; routes = [{ Gateway = "192.168.95.1"; }];
vlan = [ "ioit-vlan" "internal-ioit-vlan" ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
"10-1GB_Secondary" = { "10-1GB_Secondary" = {
@@ -48,19 +28,6 @@
matchConfig.Name = "enp97s0f1np1"; matchConfig.Name = "enp97s0f1np1";
DHCP = "yes"; DHCP = "yes";
}; };
"40-ioit-vlan" = {
matchConfig.Name = "ioit-vlan";
DHCP = "yes";
}; };
"41-internal-ioit-vlan" = {
matchConfig.Name = "internal-ioit-vlan";
DHCP = "yes";
};
};
};
services.zerotierone = {
enable = true;
joinNetworks = [ "e4da7455b2ae64ca" ];
}; };
} }

View File

@@ -1,6 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./nix_builder.nix ]; imports = [
./nix_builder.nix
];
users = { users = {
users.github-runners = { users.github-runners = {

View File

@@ -1,4 +1,4 @@
{ config, lib, ... }: { config, inputs, lib, ... }:
with lib; with lib;
@@ -6,6 +6,8 @@ let
vars = import ../vars.nix; vars = import ../vars.nix;
in in
{ {
imports = [ inputs.microvm.nixosModules.microvm ];
options.services.nix_builder.containers = mkOption { options.services.nix_builder.containers = mkOption {
type = types.attrsOf (types.submodule ({ name, ... }: { type = types.attrsOf (types.submodule ({ name, ... }: {
options.enable = mkEnableOption "GitHub runner container"; options.enable = mkEnableOption "GitHub runner container";
@@ -81,3 +83,4 @@ in
} }
) config.services.nix_builder.containers; ) config.services.nix_builder.containers;
} }

View File

@@ -13,6 +13,7 @@
./hardware.nix ./hardware.nix
./syncthing.nix ./syncthing.nix
inputs.nixos-hardware.nixosModules.framework-13-7040-amd inputs.nixos-hardware.nixosModules.framework-13-7040-amd
inputs.nixos-cosmic.nixosModules.default
]; ];
networking = { networking = {
@@ -22,7 +23,11 @@
networkmanager.enable = true; networkmanager.enable = true;
}; };
services.openssh.ports = [ 922 ]; services = {
openssh.ports = [ 922 ];
desktopManager.cosmic.enable = true;
};
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }