From b202ec84dfa681b66cb1db17ecf99ea8a155bed3 Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Sun, 24 Mar 2024 12:31:47 -0400
Subject: [PATCH] More Fixes

- Fix default session with dwm
- Enable boot.initrd
- Remove broken font package
---
 profiles/personal/configuration.nix | 1 +
 system/gui/dwm.nix                  | 2 +-
 system/gui/fonts.nix                | 1 -
 system/gui/x11.nix                  | 8 +++++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix
index 47867de..74336ff 100644
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -31,6 +31,7 @@
   nixpkgs.config.allowUnfree = true;
 
   boot = {
+    initrd.enable = true;
     loader = {
       efi = {
         canTouchEfiVariables = true;
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 3574d06..920ca8a 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -11,5 +11,5 @@
 
   environment.systemPackages = [ pkgs.dwm ];
   services.xserver.windowManager.dwm.enable = true;
-  services.xserver.displayManager.defaultSession = "dwm";
+  services.xserver.displayManager.defaultSession = "none+dwm";
 }
diff --git a/system/gui/fonts.nix b/system/gui/fonts.nix
index 9a9b817..3af0f10 100644
--- a/system/gui/fonts.nix
+++ b/system/gui/fonts.nix
@@ -2,7 +2,6 @@
 
 {
   fonts.packages = with pkgs; [
-    nerdfonts
     powerline
     font-awesome
     ubuntu_font_family
diff --git a/system/gui/x11.nix b/system/gui/x11.nix
index 7c9d15d..96b90ce 100644
--- a/system/gui/x11.nix
+++ b/system/gui/x11.nix
@@ -9,8 +9,10 @@
 
   services.xserver = {
     enable = true;
-    layout = "us";
-    xkbVariant = "";
-    xkbOptions = "";
+    xkb = {
+      layout = "us";
+      variant = "";
+      options = "";
+    };
   };
 }