chore: remove physical-computer.nix

This commit is contained in:
uku 2024-05-21 15:00:01 +02:00
parent 55799d6b18
commit effaa7e870
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
4 changed files with 19 additions and 28 deletions

View file

@ -1,4 +1,5 @@
{ {
lib,
pkgs, pkgs,
config, config,
catppuccin, catppuccin,
@ -9,8 +10,20 @@
boot = { boot = {
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
kernelModules = ["v4l2loopback"]; kernelModules = ["v4l2loopback"];
loader = {
systemd-boot.enable = lib.mkForce false;
efi.canTouchEfiVariables = true;
};
lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
}; };
environment.systemPackages = with pkgs; [sbctl];
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
iosevka iosevka

View file

@ -1,19 +0,0 @@
{
lib,
pkgs,
...
}: {
boot = {
loader = {
systemd-boot.enable = lib.mkForce false;
efi.canTouchEfiVariables = true;
};
lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
};
environment.systemPackages = with pkgs; [sbctl];
}

View file

@ -30,11 +30,6 @@
vscode-server.nixosModules.default vscode-server.nixosModules.default
]; ];
physical-computer = with inputs; [
../configs/physical-computer.nix
lanzaboote.nixosModules.lanzaboote
];
client = [../configs/client.nix] ++ _common; client = [../configs/client.nix] ++ _common;
server = [../configs/server.nix] ++ _common; server = [../configs/server.nix] ++ _common;
@ -43,8 +38,8 @@
[ [
../configs/desktop.nix ../configs/desktop.nix
catppuccin.nixosModules.catppuccin catppuccin.nixosModules.catppuccin
lanzaboote.nixosModules.lanzaboote
] ]
++ physical-computer
++ client; ++ client;
in { in {
flake.nixosConfigurations = mapNixOS { flake.nixosConfigurations = mapNixOS {
@ -71,7 +66,6 @@ in {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
server server
++ physical-computer
++ (with inputs; [ ++ (with inputs; [
api-rs.nixosModules.default api-rs.nixosModules.default
ukubot-rs.nixosModules.default ukubot-rs.nixosModules.default

View file

@ -35,7 +35,10 @@ in {
frpToken = {}; frpToken = {};
}; };
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_1; boot = {
kernelPackages = lib.mkForce pkgs.linuxPackages_6_1;
loader.systemd-boot.enable = true;
};
services = { services = {
openssh.openFirewall = true; openssh.openFirewall = true;