From 79cab8d37356ea269e590355314ea04d02065146 Mon Sep 17 00:00:00 2001
From: DOOME1M8Cover <doom@e1m8.qlz>
Date: Mon, 24 Jul 2023 01:01:56 +0100
Subject: [PATCH] Attempting to fix boot and mounts

---
 flake.lock                                    |  6 +++---
 hosts/nixos/bunta_desktop/core/bootloader.nix |  5 +++--
 .../bunta_desktop/hardware-configuration.nix  | 21 +++++++++++++------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 19c55de..cf34cc0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -95,11 +95,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1690055134,
-        "narHash": "sha256-pca36VkwUxcygKtrY8OPWp9MpxHgWauwBWxO8lgHQTU=",
+        "lastModified": 1690073260,
+        "narHash": "sha256-3Yu5ah4iLe0npG/k9obg97pwm13W/5LBnktvmqEPsqM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "15a8d4645c280e35c00a36303bb76eb697d38206",
+        "rev": "6be732b18451ea43ead4ea4f5b499ae909102351",
         "type": "github"
       },
       "original": {
diff --git a/hosts/nixos/bunta_desktop/core/bootloader.nix b/hosts/nixos/bunta_desktop/core/bootloader.nix
index 3670a79..0ce6ad4 100644
--- a/hosts/nixos/bunta_desktop/core/bootloader.nix
+++ b/hosts/nixos/bunta_desktop/core/bootloader.nix
@@ -10,7 +10,7 @@ in {
     loader = {
       grub = {
         enable = true;
-        device = "/dev/sdc"; # "nodev";
+        devices = ["nodev"];
         useOSProber = true;
         # efiSupport = true;
         # theme = inputs.grub-theme + "/src/catppuccin-mocha-grub-theme";
@@ -18,7 +18,8 @@ in {
       /*
       efi = {
         canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
+        #efiInstallAsRemovable = true;
+        efiSysMountPoint = "/boot/";
       };
       */
     };
diff --git a/hosts/nixos/bunta_desktop/hardware-configuration.nix b/hosts/nixos/bunta_desktop/hardware-configuration.nix
index af2889a..b9e4c29 100644
--- a/hosts/nixos/bunta_desktop/hardware-configuration.nix
+++ b/hosts/nixos/bunta_desktop/hardware-configuration.nix
@@ -12,14 +12,23 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = ["ntfs"];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/fdea0ef2-fa72-11ed-8a6f-e39e300c6f30";
-      # device = "/dev/disk/by-label/NIXROOT"
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/fdea0ef2-fa72-11ed-8a6f-e39e300c6f30";
+    # device = "/dev/disk/by-label/NIXROOT"
+    fsType = "ext4";
+  };
+  
+  fileSystems."/run/media/nibunta/OMTRON" = {
+    device = "/dev/disk/by-label/OMTRON";
+    fsType = "ntfs";
+  };
 
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/76B5-DF1B";
+    fsType = "vfat";
+  };
+  
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking