feat: rearrange configs

This commit is contained in:
uku 2024-05-12 13:33:15 +02:00
parent c60e8df3e3
commit 21ce06c82d
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
7 changed files with 54 additions and 40 deletions

View file

@ -23,20 +23,29 @@
mapNixOS = lib.mapAttrs (toSystem inputs.nixpkgs.lib.nixosSystem);
nixos = with inputs; [
_common = with inputs; [
../configs/common.nix
agenix.nixosModules.default
home-manager.nixosModules.home-manager
vscode-server.nixosModules.default
];
physical-computer = with inputs; [
../configs/physical-computer.nix
lanzaboote.nixosModules.lanzaboote
];
client = [../configs/client.nix] ++ _common;
server = [../configs/server.nix] ++ _common;
desktop = with inputs;
[
../configs/desktop.nix
lanzaboote.nixosModules.lanzaboote
catppuccin.nixosModules.catppuccin
]
++ nixos;
++ physical-computer
++ client;
in {
flake.nixosConfigurations = mapNixOS {
fuji = {
@ -47,7 +56,7 @@ in {
fuji-wsl = {
system = "x86_64-linux";
modules =
nixos
client
++ (with inputs; [
nixos-wsl.nixosModules.default
]);
@ -61,7 +70,8 @@ in {
etna = {
system = "x86_64-linux";
modules =
nixos
server
++ physical-computer
++ (with inputs; [
api-rs.nixosModules.default
ukubot-rs.nixosModules.default

View file

@ -32,16 +32,11 @@ in {
};
};
boot = {
loader.systemd-boot.enable = true;
kernelPackages = lib.mkForce pkgs.linuxPackages_6_1;
};
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_1;
services = {
openssh.openFirewall = true;
tailscale.extraUpFlags = ["--advertise-exit-node"];
cloudflared = {
enable = true;
tunnels.${tunnelId} = {