From b5e7be07476422c312330da99a3a064b5a78e362 Mon Sep 17 00:00:00 2001
From: muon <admin@muon.host>
Date: Fri, 14 Jun 2024 14:36:36 +0000
Subject: [PATCH] Add grub

---
 hosts/muon/configuration.nix    |  4 +++-
 modules/nixos/core/boot.nix     | 17 ++++++++++++++---
 modules/nixos/desktop/xorg.nix  | 28 +++++++++++++++++++++++++---
 modules/nixos/unfree/nvidia.nix | 18 ------------------
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix
index 3362a48..b5e2032 100644
--- a/hosts/muon/configuration.nix
+++ b/hosts/muon/configuration.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, inputs, system, ... }:
 let
   cfg = config.mods;
+  res = "2560x1440";
 in {
   # Hardware
   imports = [
@@ -41,12 +42,13 @@ in {
   services.xserver.libinput.mouse.accelProfile = "flat";
 
   ## Monitors
+  mods.monitor.main.resolution = res;
   services.xserver.xrandrHeads = [
     {
       output = "DP-2";
       primary = true;
       monitorConfig =  ''
-        Option "PreferredMode" "2560x1440"
+        Option "PreferredMode" "${res}"
         Option "Position" "0x480"
       '';
     }
diff --git a/modules/nixos/core/boot.nix b/modules/nixos/core/boot.nix
index 3a439cd..b533690 100644
--- a/modules/nixos/core/boot.nix
+++ b/modules/nixos/core/boot.nix
@@ -1,4 +1,15 @@
-{ pkgs, lib, ... }: {
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+{ pkgs, lib, config, ... }: {
+  # boot.loader.systemd-boot.enable = true;
+  # boot.plymouth.enable = true;
+  # boot.initrd.systemd.enable = true;
+  # boot.kernelParams = [ "quiet" ];
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    grub = {
+      enable = true;
+      efiSupport = true;
+      device = "nodev";
+      gfxmodeEfi = config.mods.monitor.main.resolution;
+    };
+  };
 }
diff --git a/modules/nixos/desktop/xorg.nix b/modules/nixos/desktop/xorg.nix
index 3844d2a..e1de840 100644
--- a/modules/nixos/desktop/xorg.nix
+++ b/modules/nixos/desktop/xorg.nix
@@ -1,10 +1,32 @@
 { pkgs, lib, config, ... }: {
-  options.mods.xorg.enable = lib.mkEnableOption "enables xorg";
+  options.mods = {
+    xorg.enable = lib.mkEnableOption "enables xorg";
+    monitor.main.resolution = lib.mkOption {
+      description = "main monitor resolution";
+      type = lib.types.string;
+      default = "1920x1080";
+      example = "2560x1440";
+    };
+  };
 
-  config = lib.mkIf config.mods.xorg.enable {
+  config = let 
+    startupTargets = [
+      "systemd-user-sessions.service"
+      "multi-user.target"
+      "network-online.target"
+    ];
+  
+  in lib.mkIf config.mods.xorg.enable {
     services.xserver.enable = true;
-    services.xserver.displayManager.gdm.enable = true;
     services.xserver.xkb.layout = "us";
     services.xserver.xkb.options = "caps:escape";
+
+    services.xserver.displayManager.gdm.enable = true;
+    services.xserver.displayManager.autoLogin.enable = true;
+    services.xserver.displayManager.autoLogin.user =
+      config.mods.user.name;
+
+    systemd.services.display-manager.wants = startupTargets;
+    systemd.services.display-manager.after = startupTargets;
   };
 }
diff --git a/modules/nixos/unfree/nvidia.nix b/modules/nixos/unfree/nvidia.nix
index ac7497a..76ba839 100644
--- a/modules/nixos/unfree/nvidia.nix
+++ b/modules/nixos/unfree/nvidia.nix
@@ -8,7 +8,6 @@ in {
       description = "enables proprietary nvidia drivers";
     };
     packages = lib.mkOption {
-      # default = [ "nvidia-x11" "nvidia-settings" "nvidia-persistenced" ];
       default = [ "nvidia-x11" ];
       description = "unfree packages";
     };
@@ -26,8 +25,6 @@ in {
       driSupport32Bit = true;
     };
 
-    # boot.kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
-    # boot.initrd.kernelModules = [ "nvidia" ];
     services.xserver.videoDrivers = [ "nvidia" "nvidia-dkms" ];
 
     hardware.nvidia = {
@@ -40,21 +37,6 @@ in {
       nvidiaSettings = false;
       
       package = config.boot.kernelPackages.nvidiaPackages."${cfg.driver}";
-      # package = let 
-      #   rcu_patch = pkgs.fetchpatch {
-      #     url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
-      #     hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
-      #   };
-      # in config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      #     version = "535.154.05";
-      #     sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
-      #     sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
-      #     openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
-      #     settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
-      #     persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
-
-      #     patches = [ rcu_patch ];
-      #  };
     };
   };
 }