Reorganize configuration and prep for flakes
This commit is contained in:
parent
78439054dd
commit
dea7fcbf96
19 changed files with 250 additions and 95 deletions
|
@ -1,10 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
networking.hostName = "cert-store";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../servers/acme-cert-store.nix
|
||||
../../shared/base.nix
|
||||
../../servers/acme-cert-store.nix
|
||||
];
|
||||
|
||||
services.qemuGuest.enable = true;
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ../shared/base.nix ];
|
||||
imports = [ ../../shared/base.nix ];
|
||||
|
||||
# Networking conf including WireGuard
|
||||
networking = {
|
|
@ -3,12 +3,12 @@
|
|||
networking.hostName = "gaming";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../shared/hardware/nvidia.nix
|
||||
../../shared/base.nix
|
||||
../../shared/hardware/nvidia.nix
|
||||
|
||||
../personal/desktop.nix
|
||||
../../personal/desktop.nix
|
||||
|
||||
../servers/gaming-server.nix
|
||||
../../servers/gaming-server.nix
|
||||
];
|
||||
|
||||
users.users.vili.hashedPasswordFile = lib.mkForce null;
|
|
@ -46,27 +46,27 @@
|
|||
};
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../../shared/base.nix
|
||||
|
||||
../personal/desktop.nix
|
||||
../personal/development.nix
|
||||
../../personal/desktop.nix
|
||||
../../personal/development.nix
|
||||
|
||||
../personal/hardware/amd-laptop.nix
|
||||
../personal/hardware/hibernate.nix
|
||||
../personal/hardware/keychron-q11.nix
|
||||
../personal/hardware/onlykey.nix
|
||||
../personal/hardware/trackball.nix
|
||||
../../personal/hardware/amd-laptop.nix
|
||||
../../personal/hardware/hibernate.nix
|
||||
../../personal/hardware/keychron-q11.nix
|
||||
../../personal/hardware/onlykey.nix
|
||||
../../personal/hardware/trackball.nix
|
||||
|
||||
../personal/networking/home-wg.nix
|
||||
../personal/networking/printing.nix
|
||||
../../personal/networking/home-wg.nix
|
||||
../../personal/networking/printing.nix
|
||||
|
||||
../personal/programs/bitwarden.nix
|
||||
../personal/programs/communication.nix
|
||||
../personal/programs/firefox.nix
|
||||
../personal/programs/i3.nix
|
||||
../personal/programs/moonlight.nix
|
||||
../personal/programs/redshift.nix
|
||||
../personal/programs/study.nix
|
||||
../personal/programs/usb-automount.nix
|
||||
../../personal/programs/bitwarden.nix
|
||||
../../personal/programs/communication.nix
|
||||
../../personal/programs/firefox.nix
|
||||
../../personal/programs/i3.nix
|
||||
../../personal/programs/moonlight.nix
|
||||
../../personal/programs/redshift.nix
|
||||
../../personal/programs/study.nix
|
||||
../../personal/programs/usb-automount.nix
|
||||
];
|
||||
}
|
|
@ -5,8 +5,8 @@
|
|||
custom.collabora_domain = "idacollab.sinerva.eu";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../servers/nextcloud.nix
|
||||
../../shared/base.nix
|
||||
../../servers/nextcloud.nix
|
||||
];
|
||||
|
||||
# Networking conf including WireGuard
|
|
@ -1,32 +0,0 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
system.stateVersion = 24.05;
|
||||
networking.hostName = "lithium";
|
||||
|
||||
custom.home_wg_suffix = "3";
|
||||
system.autoUpgrade.allowReboot = lib.mkForce false;
|
||||
# boot.kernelParams = [ "resume_offset=39292928" ];
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
|
||||
../personal/desktop.nix
|
||||
../personal/development.nix
|
||||
|
||||
../personal/hardware/hibernate.nix
|
||||
../personal/hardware/intel-laptop.nix
|
||||
../personal/hardware/onlykey.nix
|
||||
|
||||
../personal/networking/home-wg.nix
|
||||
../personal/networking/printing.nix
|
||||
|
||||
../personal/programs/bitwarden.nix
|
||||
../personal/programs/communication.nix
|
||||
../personal/programs/firefox.nix
|
||||
../personal/programs/i3.nix
|
||||
../personal/programs/moonlight.nix
|
||||
../personal/programs/redshift.nix
|
||||
../personal/programs/study.nix
|
||||
../personal/programs/usb-automount.nix
|
||||
];
|
||||
}
|
32
hosts/lithium/configuration.nix
Normal file
32
hosts/lithium/configuration.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
system.stateVersion = 24.05;
|
||||
networking.hostName = "lithium";
|
||||
|
||||
custom.home_wg_suffix = "3";
|
||||
system.autoUpgrade.allowReboot = lib.mkForce false;
|
||||
# boot.kernelParams = [ "resume_offset=39292928" ];
|
||||
|
||||
imports = [
|
||||
../../shared/base.nix
|
||||
|
||||
../../personal/desktop.nix
|
||||
../../personal/development.nix
|
||||
|
||||
../../personal/hardware/hibernate.nix
|
||||
../../personal/hardware/intel-laptop.nix
|
||||
../../personal/hardware/onlykey.nix
|
||||
|
||||
../../personal/networking/home-wg.nix
|
||||
../../personal/networking/printing.nix
|
||||
|
||||
../../personal/programs/bitwarden.nix
|
||||
../../personal/programs/communication.nix
|
||||
../../personal/programs/firefox.nix
|
||||
../../personal/programs/i3.nix
|
||||
../../personal/programs/moonlight.nix
|
||||
../../personal/programs/redshift.nix
|
||||
../../personal/programs/study.nix
|
||||
../../personal/programs/usb-automount.nix
|
||||
];
|
||||
}
|
|
@ -4,8 +4,8 @@
|
|||
custom.nextcloud_domain = "nextcloud.vsinerva.fi";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../servers/nextcloud.nix
|
||||
../../shared/base.nix
|
||||
../../servers/nextcloud.nix
|
||||
];
|
||||
|
||||
# HARDWARE SPECIFIC
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
networking.hostName = "nixos";
|
||||
|
||||
imports = [ ../shared/base.nix ];
|
||||
imports = [ ../../shared/base.nix ];
|
||||
|
||||
#Many installs will need this, and it won't hurt either way
|
||||
services.qemuGuest.enable = true;
|
|
@ -3,8 +3,8 @@
|
|||
networking.hostName = "siit-dc";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../servers/siit-dc.nix
|
||||
../../shared/base.nix
|
||||
../../servers/siit-dc.nix
|
||||
];
|
||||
|
||||
# HARDWARE SPECIFIC
|
|
@ -3,10 +3,10 @@
|
|||
networking.hostName = "syncthing";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../shared/users/vili.nix
|
||||
../../shared/base.nix
|
||||
../../shared/users/vili.nix
|
||||
|
||||
../servers/syncthing.nix
|
||||
../../servers/syncthing.nix
|
||||
];
|
||||
|
||||
users.users.vili.hashedPasswordFile = lib.mkForce null;
|
|
@ -3,8 +3,8 @@
|
|||
networking.hostName = "vaultwarden";
|
||||
|
||||
imports = [
|
||||
../shared/base.nix
|
||||
../servers/vaultwarden.nix
|
||||
../../shared/base.nix
|
||||
../../servers/vaultwarden.nix
|
||||
];
|
||||
|
||||
# HARDWARE SPECIFIC
|
|
@ -8,7 +8,7 @@ let
|
|||
ddPassFile = "/root/wg-conf/ddPassFile";
|
||||
in
|
||||
{
|
||||
imports = [ ../shared/base.nix ];
|
||||
imports = [ ../../shared/base.nix ];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
wireguard-tools
|
Loading…
Add table
Add a link
Reference in a new issue