chore: remove physical-computer.nix
This commit is contained in:
parent
55799d6b18
commit
effaa7e870
4 changed files with 19 additions and 28 deletions
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
catppuccin,
|
||||
|
@ -9,8 +10,20 @@
|
|||
boot = {
|
||||
extraModulePackages = with config.boot.kernelPackages; [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 = {
|
||||
packages = with pkgs; [
|
||||
iosevka
|
||||
|
|
|
@ -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];
|
||||
}
|
|
@ -29,12 +29,7 @@
|
|||
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;
|
||||
|
@ -43,8 +38,8 @@
|
|||
[
|
||||
../configs/desktop.nix
|
||||
catppuccin.nixosModules.catppuccin
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
]
|
||||
++ physical-computer
|
||||
++ client;
|
||||
in {
|
||||
flake.nixosConfigurations = mapNixOS {
|
||||
|
@ -71,7 +66,6 @@ in {
|
|||
system = "x86_64-linux";
|
||||
modules =
|
||||
server
|
||||
++ physical-computer
|
||||
++ (with inputs; [
|
||||
api-rs.nixosModules.default
|
||||
ukubot-rs.nixosModules.default
|
||||
|
|
|
@ -35,7 +35,10 @@ in {
|
|||
frpToken = {};
|
||||
};
|
||||
|
||||
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_1;
|
||||
boot = {
|
||||
kernelPackages = lib.mkForce pkgs.linuxPackages_6_1;
|
||||
loader.systemd-boot.enable = true;
|
||||
};
|
||||
|
||||
services = {
|
||||
openssh.openFirewall = true;
|
||||
|
|
Loading…
Reference in a new issue