diff --git a/hosts/ext-julia/default.nix b/hosts/ext-julia/default.nix index 92c90f8..779bf2d 100644 --- a/hosts/ext-julia/default.nix +++ b/hosts/ext-julia/default.nix @@ -1,14 +1,13 @@ -{pkgs, ...}:{ +{pkgs, rootPath, ...}:{ imports = [ ./boot.nix ./hardware-configuration.nix - #../../modules/hosting/wordpress-simple/kiezpalme.nix - #../../modules/hosting/wordpress-simple/pertineo.nix - ../../modules/hosting/wordpress.nix - ../../modules/sec_auth/ssh-server.nix + (rootPath + /system_profiles/server.nix) - ../../system_profiles/server.nix + #(rootPath + /modules/hosting/wordpress-simple/kiezpalme.nix) + #(rootPath + /modules/hosting/wordpress-simple/pertineo.nix) + (rootPath + /modules/hosting/wordpress.nix) ]; #services.mysql = { @@ -31,7 +30,7 @@ username = "root"; in { users."${username}".openssh.authorizedKeys.keyFiles = [ - ../../certificates/id_ed25519_ext-julia.pub + (rootPath + /certificates/id_ed25519_ext-julia.pub) ]; }; } diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix index c69c055..cbac390 100644 --- a/hosts/game-luanti/default.nix +++ b/hosts/game-luanti/default.nix @@ -1,20 +1,18 @@ -{ +{rootPath, ...}: { imports = [ ./boot.nix ./hardware-configuration.nix + (rootPath + /system_profiles/server.nix) - ../../modules/game/server/luanti - ../../modules/sec_auth/ssh-server.nix - ../../modules/pkg_mgrmnt/unattended-updates.nix - - ../../system_profiles/server.nix + (rootPath + /modules/game/server/luanti) + (rootPath + /modules/pkg_mgrmnt/unattended-updates.nix) ]; users = let username = "root"; in { users."${username}".openssh.authorizedKeys.keyFiles = [ - ../../certificates/id_ed25519_game-luanti.pub + (rootPath + /certificates/id_ed25519_game-luanti.pub) ]; }; diff --git a/hosts/jitsi/default.nix b/hosts/jitsi/default.nix index a13ea41..a1a0222 100644 --- a/hosts/jitsi/default.nix +++ b/hosts/jitsi/default.nix @@ -1,13 +1,7 @@ -{...}: { - nixpkgs.config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - +{rootPath, ...}: { imports = [ ./hardware-configuration.nix - ../../system_profiles/defaults.nix - ../../system_profiles/mini-container.nix + (rootPath + /system_profiles/server.nix) ]; } diff --git a/system_profiles/importers/server.nix b/system_profiles/importers/server.nix index 66f1e60..4e0c313 100644 --- a/system_profiles/importers/server.nix +++ b/system_profiles/importers/server.nix @@ -1,6 +1,7 @@ {rootPath, ...}: { imports = [ (rootPath + /modules/customisation.nix) + (rootPath + /modules/sec_auth/ssh-server.nix) (rootPath + /modules/software/neovim.nix) (rootPath + /modules/software/packages/core.nix) ];