From effaa7e87069bee2fa7bfecc4356beb04483951a Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Tue, 21 May 2024 15:00:01 +0200
Subject: [PATCH] chore: remove physical-computer.nix

---
 configs/desktop.nix           | 13 +++++++++++++
 configs/physical-computer.nix | 19 -------------------
 systems/default.nix           | 10 ++--------
 systems/etna/default.nix      |  5 ++++-
 4 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 configs/physical-computer.nix

diff --git a/configs/desktop.nix b/configs/desktop.nix
index f237c64..350dfa0 100644
--- a/configs/desktop.nix
+++ b/configs/desktop.nix
@@ -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
diff --git a/configs/physical-computer.nix b/configs/physical-computer.nix
deleted file mode 100644
index 535046c..0000000
--- a/configs/physical-computer.nix
+++ /dev/null
@@ -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];
-}
diff --git a/systems/default.nix b/systems/default.nix
index 18c20f2..436fd0f 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -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
diff --git a/systems/etna/default.nix b/systems/etna/default.nix
index e41b06e..365bfd1 100644
--- a/systems/etna/default.nix
+++ b/systems/etna/default.nix
@@ -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;