modules: move boot from desktop to pc

5 files changed, 4 insertions, 62 deletions

diff --git a/modules/desktop/software/boot.nix b/modules/desktop/software/boot.nix
new file mode 100644
index 0000000..44f9c4e
--- /dev/null
+++ b/modules/desktop/software/boot.nix
@@ -0,0 +1,3 @@
+{
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+}
diff --git a/modules/desktop/software/boot/default.nix b/modules/desktop/software/boot/default.nix
deleted file mode 100644
index 9fe77a0..0000000
--- a/modules/desktop/software/boot/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./grub.nix
-    ./systemd-boot.nix
-  ];
-
-  boot = {
-    tmp.cleanOnBoot = true;
-    crashDump.enable = false;
-    consoleLogLevel = 3;
-    kernelPackages = pkgs.linuxPackages_zen;
-    binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-    kernelParams = [
-      "iommu=pt"
-      "threadirqs"
-    ];
-
-    loader = {
-      timeout = 1;
-      generationsDir.copyKernels = true;
-
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-    };
-  };
-}
diff --git a/modules/desktop/software/boot/grub.nix b/modules/desktop/software/boot/grub.nix
deleted file mode 100644
index 3932713..0000000
--- a/modules/desktop/software/boot/grub.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-{
-  boot.loader.grub = {
-    enable = true;
-    device = "nodev";
-    efiSupport = true;
-    useOSProber = true;
-    memtest86.enable = true;
-    gfxmodeEfi = "1920x1080x32";
-    gfxmodeBios = "1920x1080x32";
-    gfxpayloadBios = "keep";
-    gfxpayloadEfi = "keep";
-    splashMode = "normal";
-
-    theme = pkgs.fetchFromGitHub {
-      owner = "Lxtharia";
-      repo = "minegrub-theme";
-      rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3";
-      sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap";
-    };
-  };
-}
diff --git a/modules/desktop/software/boot/systemd-boot.nix b/modules/desktop/software/boot/systemd-boot.nix
deleted file mode 100644
index b51a896..0000000
--- a/modules/desktop/software/boot/systemd-boot.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  boot.loader.systemd-boot = {
-    enable = false;
-    editor = true;
-    consoleMode = "max";
-    memtest86.enable = true;
-    netbootxyz.enable = true;
-  };
-}
diff --git a/modules/desktop/software/default.nix b/modules/desktop/software/default.nix
index 01e196c..8098426 100644
--- a/modules/desktop/software/default.nix
+++ b/modules/desktop/software/default.nix
@@ -1,9 +1,9 @@
 {
   imports = [
-    ./boot
     ./services
     ./video
     ./aagl.nix
+    ./boot.nix
     ./gaming.nix
     ./programs.nix
     ./systemd.nix