dotfiles

commit 2f3a042e367138adf84131390f378973d1d3fbd2
parent 5330036cf32a37d336b50cc4e4e0dac7282aca0d
Author: maydayv7 <maydayv7@gmail.com>
Date:   Wed, 25 Oct 2023 12:39:28 +0530

fix!: Build Successfully

Diffstat:

6 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/.templates/minimal/flake.nix b/.templates/minimal/flake.nix
@@ -29,6 +29,7 @@
       kernel = "zen";
       kernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"];
 
+      gui = {};
       hardware = {
         boot = "efi";
         cores = 4;
@@ -39,6 +40,7 @@
       user = {
         name = "nixos";
         description = "Default User";
+        minimal = true;
         password = "HASHED_PASSWORD"; # Generate using 'mkpasswd -m sha-512'
       };
     };
diff --git a/lib/map.nix b/lib/map.nix
@@ -67,7 +67,7 @@ in rec {
       path = "${toString dir}/${name}";
     in
       if (type == "directory" || type == "symlink")
-      then nameValuePair name (files' path func)
+      then nameValuePair name (file' path func)
       else if
         type
         == "regular"
diff --git a/modules/default.nix b/modules/default.nix
@@ -60,7 +60,8 @@ in {
         inherit name description uid autologin minimal;
         homeConfig = home;
         extraGroups = groups;
-        initialHashedPassword = password;
+        hashedPassword = mkIf (password != "") password;
+        initialHashedPassword = mkIf (password == "") "";
         shell = pkgs."${shell}";
         shells =
           if (shells == null)
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
@@ -8,18 +8,17 @@
   inherit (util.map) module module';
   inherit (lib) mkOption optional types util;
 in {
-  imports = module ./.;
+  imports = module ./. ++ module ./desktop;
 
   options.gui.desktop = mkOption {
     description = "GUI Desktop Choice";
-    type = with types;
-      nullOr (enum ((module' ./desktop) ++ map (x: x + "-minimal") (module' ./desktop)));
-    default = null;
+    type = types.enum ((module' ./desktop) ++ map (x: x + "-minimal") (module' ./desktop) ++ [""]);
+    default = "";
   };
 
   config.assertions = [
     {
-      assertion = config.gui.desktop != null;
+      assertion = config.gui.desktop != "";
       message = options.gui.desktop.description + " must be set";
     }
   ];
diff --git a/modules/gui/desktop/gnome.nix b/modules/gui/desktop/gnome.nix
@@ -9,7 +9,7 @@ with files; let
   inherit (builtins) elem;
   inherit (config.gui) desktop;
   apps = config.environment.systemPackages;
-  inherit (lib) mkIf mkForce mkMerge recursiveUpdate util;
+  inherit (lib) mkIf mkForce mkMerge util;
 in {
   ## GNOME Desktop Configuration ##
   config = mkIf (desktop == "gnome" || desktop == "gnome-minimal") (mkMerge [
@@ -17,7 +17,10 @@ in {
       # Session
       services.xserver = {
         desktopManager.gnome.enable = true;
-        displayManager.gdm.enable = true;
+        displayManager = {
+          gdm.enable = true;
+          defaultSession = "gnome";
+        };
       };
 
       # Excluded Packages
diff --git a/modules/gui/desktop/xfce.nix b/modules/gui/desktop/xfce.nix
@@ -34,19 +34,22 @@ in {
           enableXfwm = true;
         };
 
-        displayManager.lightdm.greeters.gtk = {
-          clock-format = "%H:%M";
-          indicators = [
-            "~a11y"
-            "~language"
-            "~spacer"
-            "~clock"
-            "~spacer"
-            "~host"
-            "~spacer"
-            "~session"
-            "~power"
-          ];
+        displayManager = {
+          defaultSession = "xfce";
+          lightdm.greeters.gtk = {
+            clock-format = "%H:%M";
+            indicators = [
+              "~a11y"
+              "~language"
+              "~spacer"
+              "~clock"
+              "~spacer"
+              "~host"
+              "~spacer"
+              "~session"
+              "~power"
+            ];
+          };
         };
       };
     }