split up modules differently

This commit is contained in:
Vinzenz Schroeter 2024-10-26 17:30:11 +02:00
parent 074ea3bd3b
commit f673c6ae29
10 changed files with 286 additions and 287 deletions

View file

@ -1,11 +1,79 @@
{...}: {
imports = [
./hardware.nix
./environment.nix
];
config = {
networking.hostName = "vinzenz-lpt2";
{
nixpkgs,
common-modules,
desktop-modules,
...
}:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules =
common-modules
++ desktop-modules
++ [
./hardware.nix
nix.settings.extra-platforms = ["aarch64-linux"];
};
../../home/gnome.nix
../../users/vinzenz.nix
../../modules/gnome.nix
../../modules/gaming.nix
../../modules/printing.nix
../../modules/latex.nix
{
networking.hostName = "vinzenz-lpt2";
nix.settings.extra-platforms = ["aarch64-linux"];
}
{
home-manager.users.vinzenz = import ../../home/vinzenz;
users.users.vinzenz.openssh.authorizedKeys.keys = [
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
];
#users.users.ronja.openssh.authorizedKeys.keys = [
# ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key''
#];
}
{
virtualisation = {
containers.enable = true;
podman = {
enable = true;
dockerCompat = true;
dockerSocket.enable = true;
autoPrune.enable = true;
};
};
}
{
services.nginx = {
enable = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
virtualHosts = {
"vinzenz-lpt2" = {
locations."/" = {
proxyPass = "http://127.0.0.1:3000/";
proxyWebsockets = true;
};
serverAliases = ["172.23.42.96"];
};
};
};
networking.firewall = {
allowedTCPPorts = [80 8001 3000];
allowedUDPPorts = [2342];
};
}
];
}

View file

@ -1,60 +0,0 @@
{pkgs, ...}: {
imports = [
../../home
../../home/gnome.nix
../../users/vinzenz.nix
../../modules/desktop-environment.nix
../../modules/gnome.nix
../../modules/gaming.nix
../../modules/printing.nix
../../modules/latex.nix
];
config = {
home-manager.users.vinzenz = import ../../home/vinzenz;
virtualisation = {
containers.enable = true;
podman = {
enable = true;
dockerCompat = true;
dockerSocket.enable = true;
autoPrune.enable = true;
};
};
users.users.vinzenz.openssh.authorizedKeys.keys = [
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
];
#users.users.ronja.openssh.authorizedKeys.keys = [
# ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key''
#];
services.nginx = {
enable = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
virtualHosts = {
"vinzenz-lpt2" = {
locations."/" = {
proxyPass = "http://127.0.0.1:3000/";
proxyWebsockets = true;
};
serverAliases = ["172.23.42.96"];
};
};
};
networking.firewall = {
allowedTCPPorts = [80 8001 3000];
allowedUDPPorts = [2342];
};
};
}

View file

@ -4,7 +4,6 @@
...
}: {
imports = [
../../modules/desktop-hardware.nix
../../modules/intel-graphics.nix
];
config = {