Fixed minimal install for fujin, 'fixed' fujin, need to fix hypr

machines/fujin/disko-config.nix

@@ -4,14 +4,22 @@
   disko.devices = {
     disk = {
       main = {
-        device = "/dev/nvme1n1";
+        device = "/dev/nvme0n1";
         type = "disk";
         content = {
           type = "gpt";
           partitions = {
-            boot = {
-              size = "1M";
-              type = "EF02"; # for grub MBR
+            ESP = {
+              priority = 1;
+              name = "ESP";
+              size = "500M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
             };
             root = {
               size = "100%";

machines/fujin/hardware-configuration.nix

@@ -4,17 +4,14 @@
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
-    loader.grub = {
-      enable = true;
-      useOSProber = true;
-    };
-
+    loader.systemd-boot.enable = true;
     initrd = {
       availableKernelModules =
         [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
       kernelModules = [ ];
     };
     kernelModules = [ "kvm-amd" ];
+    kernelPackages = pkgs.linuxPackages_latest;
 
     # allow perf as user | needed for intellij to run profiler
     kernel.sysctl."kernel.perf_event_paranoid" = 1;
@@ -23,8 +20,4 @@
 
   networking.useDHCP = lib.mkDefault true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  hardware.nvidia.prime = {
-    amdgpuBusId = lib.mkForce "PCI:7:0:0";
-  };
 }

machines/fujin/main/default.nix

@@ -6,7 +6,7 @@
     ../hardware-configuration.nix
     ../disko-config.nix
 
-    ./sops.nix
+    #./sops.nix
   ];
 
   users.users.${username} = {
@@ -46,6 +46,8 @@
     development.emacs.enable = true;
 
     virtualisation.docker.enable = true;
+
+    window-manager.hypr.enable = true;
   };
 
   ###

machines/minimal.nix

@@ -64,9 +64,6 @@ in {
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.useOSProber = true;
-
   time.timeZone = "Europe/Warsaw";
 
   # Select internationalisation properties.