From 66441c5774b7ba265d80b9edf6b2846e261fe499 Mon Sep 17 00:00:00 2001
From: nx2 <nx2@local>
Date: Wed, 27 Mar 2024 11:31:36 +0100
Subject: [PATCH] grub ext

---
 configuration.nix       | 77 ++---------------------------------------
 home.nix                |  2 +-
 system-modules/grub.nix | 74 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 76 deletions(-)
 create mode 100644 system-modules/grub.nix

diff --git a/configuration.nix b/configuration.nix
index 06b317e..956a2b5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,86 +11,13 @@
       ./system-modules/users.nix
       ./system-modules/sound.nix
       ./system-modules/ollama.nix
+      ./system-modules/grub.nix
 
       ./system-modules/hsmw.nix
       ./system-modules/health_reminder.nix
       ./system-modules/davmail.nix
       ./system-modules/docker.nix
-
-    ];
-
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub = {
-    enable = true;
-    configurationLimit = 30;
-#    device = "/dev/nvme0n1p1";
-    device = "nodev";
-    # useOSProber = true;
-    efiSupport = true;
-    # theme = "${(pkgs.fetchFromGitea {
-    #     domain = "git.nx2.site";
-    #     owner = "nx2";
-    #     repo = "grub-theme-ascii-diana";
-    #     rev = "0.1.0";
-    #     hash = "sha256-uqhj77CX6EaqF9SBDRKS8dfwSVyR9wb9xG9St4gJmFA=";
-    #   })
-    #   }/out/
-    # ";
-
-    extraEntries = ''
-      menuentry 'Windows Boot Manager (on /dev/nvme0n1p1)' --class windows --class os $menuentry_id_option 'osprober-efi-0A97-7A2D' {
-        insmod part_gpt
-        insmod fat
-        search --no-floppy --fs-uuid --set=root 0A97-7A2D
-        chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-      }
-      menuentry 'Arch Linux (on /dev/nvme0n1p5)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-simple-0c11547f-0294-419b-93d0-45c6d1f1c546' {
-        insmod part_gpt
-        insmod ext2
-        search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-        linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-        initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
-      }
-      submenu 'Advanced options for Arch Linux (on /dev/nvme0n1p5)' $menuentry_id_option 'osprober-gnulinux-advanced-0c11547f-0294-419b-93d0-45c6d1f1c546' {
-        menuentry 'Arch Linux (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
-        }
-        menuentry 'Arch Linux, with Linux linux-lts (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
-        }
-        menuentry 'Arch Linux, with Linux linux-lts (fallback initramfs) (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts-fallback.img
-        }
-        menuentry 'Arch Linux, with Linux linux (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux.img
-        }
-        menuentry 'Arch Linux, with Linux linux (fallback initramfs) (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-fallback.img
-        }
-      }
-    '';
-  };
-  
+  ];
 
   networking.hostName = "NxXPS"; 
 
diff --git a/home.nix b/home.nix
index acf1e62..90c8fa4 100644
--- a/home.nix
+++ b/home.nix
@@ -52,7 +52,7 @@
     
     imv mpv mediainfo exiftool ffmpeg
     pavucontrol fontpreview gtk2fontsel
-    lynx bat du-dust eza neofetch tldr fzf figlet delta ripgrep lolcat jq
+    lynx bat du-dust eza neofetch tldr fzf figlet delta ripgrep lolcat jq glow
     brightnessctl wev 
     element sssnake pipes
 
diff --git a/system-modules/grub.nix b/system-modules/grub.nix
new file mode 100644
index 0000000..ae7c313
--- /dev/null
+++ b/system-modules/grub.nix
@@ -0,0 +1,74 @@
+{ config, pkgs, lib, system, user, allowed, secrets, ... }: 
+{
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub = {
+    enable = true;
+    configurationLimit = 30;
+#    device = "/dev/nvme0n1p1";
+    device = "nodev";
+    # useOSProber = true;
+    efiSupport = true;
+    # theme = "${(pkgs.fetchFromGitea {
+    #     domain = "git.nx2.site";
+    #     owner = "nx2";
+    #     repo = "grub-theme-ascii-diana";
+    #     rev = "0.1.0";
+    #     hash = "sha256-uqhj77CX6EaqF9SBDRKS8dfwSVyR9wb9xG9St4gJmFA=";
+    #   })
+    #   }/out/
+    # ";
+
+    extraEntries = ''
+      menuentry 'Windows Boot Manager (on /dev/nvme0n1p1)' --class windows --class os $menuentry_id_option 'osprober-efi-0A97-7A2D' {
+        insmod part_gpt
+        insmod fat
+        search --no-floppy --fs-uuid --set=root 0A97-7A2D
+        chainloader /EFI/Microsoft/Boot/bootmgfw.efi
+      }
+      menuentry 'Arch Linux (on /dev/nvme0n1p5)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-simple-0c11547f-0294-419b-93d0-45c6d1f1c546' {
+        insmod part_gpt
+        insmod ext2
+        search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
+        linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
+        initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
+      }
+      submenu 'Advanced options for Arch Linux (on /dev/nvme0n1p5)' $menuentry_id_option 'osprober-gnulinux-advanced-0c11547f-0294-419b-93d0-45c6d1f1c546' {
+        menuentry 'Arch Linux (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
+          insmod part_gpt
+          insmod ext2
+          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
+          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
+          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
+        }
+        menuentry 'Arch Linux, with Linux linux-lts (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
+          insmod part_gpt
+          insmod ext2
+          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
+          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
+          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
+        }
+        menuentry 'Arch Linux, with Linux linux-lts (fallback initramfs) (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
+          insmod part_gpt
+          insmod ext2
+          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
+          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
+          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts-fallback.img
+        }
+        menuentry 'Arch Linux, with Linux linux (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux--0c11547f-0294-419b-93d0-45c6d1f1c546' {
+          insmod part_gpt
+          insmod ext2
+          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
+          linux /boot/vmlinuz-linux root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
+          initrd /boot/intel-ucode.img /boot/initramfs-linux.img
+        }
+        menuentry 'Arch Linux, with Linux linux (fallback initramfs) (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux--0c11547f-0294-419b-93d0-45c6d1f1c546' {
+          insmod part_gpt
+          insmod ext2
+          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
+          linux /boot/vmlinuz-linux root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
+          initrd /boot/intel-ucode.img /boot/initramfs-linux-fallback.img
+        }
+      }
+    '';
+  };
+}
\ No newline at end of file