From 4d860b5d7ab0fadab10cf437f7c06e374d3e7671 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Fri, 17 Feb 2023 23:45:11 -0500
Subject: [PATCH] updated game-laptop

---
 imports/dwm.nix       |  2 +-
 imports/git.nix       |  2 +-
 imports/gnome.nix     | 36 ++++++++++++++++++++++++++++++++++--
 imports/spicetify.nix |  6 +-----
 imports/sxhkd.nix     |  5 +----
 imports/xfce.nix      |  2 +-
 modules/sxhkd.nix     |  2 +-
 systems/laptop.nix    | 38 +++++++++++++++++++-------------------
 systems/mom.nix       | 18 +++++++++---------
 9 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/imports/dwm.nix b/imports/dwm.nix
index 6c2baa0..b141e21 100644
--- a/imports/dwm.nix
+++ b/imports/dwm.nix
@@ -24,7 +24,7 @@
       lightdm = {
         enable = true;
         background = ../images/recursion.png;
-        extraConfig =  "minimum-vt=1";
+        extraConfig = "minimum-vt=1";
         greeters.mini = {
           enable = true;
           user = settings.username;
diff --git a/imports/git.nix b/imports/git.nix
index df95da6..5916b56 100644
--- a/imports/git.nix
+++ b/imports/git.nix
@@ -1,4 +1,4 @@
-_:{pkgs, ...}: {
+_: {pkgs, ...}: {
   programs.git = {
     enable = true;
     package = pkgs.gitMinimal;
diff --git a/imports/gnome.nix b/imports/gnome.nix
index 92eda4e..1c3717f 100644
--- a/imports/gnome.nix
+++ b/imports/gnome.nix
@@ -37,7 +37,6 @@ _: {
     ]);
   services.xserver = {
     enable = true;
-    tty = 1;
     exportConfiguration = true; #make config debuggable
     layout = "us";
     libinput.enable = true;
@@ -50,8 +49,41 @@ _: {
         enable = true;
         user = settings.username;
       };
-      gdm.enable = true;
       defaultSession = "gnome";
+      lightdm = {
+        enable = true;
+        extraConfig = "minimum-vt=1";
+        background = ../images/recursion.png;
+        greeters.mini = {
+          enable = true;
+          user = settings.username;
+          extraConfig = ''
+            [greeter]
+            show-password-label = false
+            password-label-text =
+            invalid-password-text =
+            show-input-cursor = false
+            password-alignment = center
+            password-input-width = 19
+            show-image-on-all-monitors = true
+
+
+            [greeter-theme]
+            font = "OverpassMono Nerd Font"
+            font-size = 1.1em
+            text-color = "#7AA2F7"
+            error-color = "#DB4B4B"
+            background-color = "#000000"
+            window-color = "#000000"
+            border-color = "#000000"
+            password-character = -1
+            password-color = "#7AA2F7"
+            password-background-color = "#24283B"
+            password-border-color = "#000000"
+            password-border-radius = 0.341125em
+          '';
+        };
+      };
     };
   };
 }
diff --git a/imports/spicetify.nix b/imports/spicetify.nix
index ae7e25c..a70a153 100644
--- a/imports/spicetify.nix
+++ b/imports/spicetify.nix
@@ -1,10 +1,6 @@
-{
-  spicetify-nix,
-  ...
-}: {pkgs, ...}: let
+{spicetify-nix, ...}: {pkgs, ...}: let
   sp-nix = spicetify-nix;
   spicePkgs = sp-nix.packages.${pkgs.system}.default;
-
 in {
   nixpkgs.allowedUnfree = ["spotify"];
   imports = [sp-nix.nixosModule];
diff --git a/imports/sxhkd.nix b/imports/sxhkd.nix
index 7eb5575..d3a544b 100644
--- a/imports/sxhkd.nix
+++ b/imports/sxhkd.nix
@@ -1,7 +1,4 @@
-_: {
-  pkgs,
-  ...
-}: {
+_: {pkgs, ...}: {
   environment.systemPackages = [
     pkgs.maim #screenshooter
     pkgs.brightnessctl #brightness control for laptop
diff --git a/imports/xfce.nix b/imports/xfce.nix
index 41c44dd..cd2a7a1 100644
--- a/imports/xfce.nix
+++ b/imports/xfce.nix
@@ -20,7 +20,7 @@ _: {
       defaultSession = "xfce";
       lightdm = {
         enable = true;
-        extraConfig =  "minimum-vt=1";
+        extraConfig = "minimum-vt=1";
         background = ../images/recursion.png;
         greeters.mini = {
           enable = true;
diff --git a/modules/sxhkd.nix b/modules/sxhkd.nix
index 9fdfc01..cafd9de 100644
--- a/modules/sxhkd.nix
+++ b/modules/sxhkd.nix
@@ -1,4 +1,4 @@
-_:{
+_: {
   config,
   lib,
   options,
diff --git a/systems/laptop.nix b/systems/laptop.nix
index d14938b..ff93578 100644
--- a/systems/laptop.nix
+++ b/systems/laptop.nix
@@ -1,27 +1,27 @@
-{
+inputs: {
   pkgs,
   settings,
   lib,
   ...
 }: {
-  imports = let
-    files = [
-      "boot"
-      "fonts"
-      "git"
-      "packages"
-      "prime"
-      "gnome"
-      "shells"
-      "gaming"
-      "theme"
-    ];
-  in
-    lib.lists.forEach files (
-      f:
-        ../imports + ("/" + f + ".nix")
-    );
-
+  imports = [
+    (import ../imports/boot.nix inputs)
+    (import ../imports/fonts.nix inputs)
+    (import ../imports/git.nix inputs)
+    (import ../imports/packages.nix inputs)
+    (import ../imports/prime.nix inputs)
+    (import ../imports/gnome.nix inputs)
+    (import ../imports/shells.nix inputs)
+    (import ../imports/gaming.nix inputs)
+    (import ../imports/theme.nix inputs)
+  ];
+  nixpkgs.allowedUnfree = [
+    "nvidia-x11"
+    "nvidia-persistenced"
+    "steam"
+    "steam-original"
+    "steam-run"
+  ];
   system.stateVersion = "23.05";
   environment.systemPackages = [
     pkgs.webcord
diff --git a/systems/mom.nix b/systems/mom.nix
index 0652499..397ce00 100644
--- a/systems/mom.nix
+++ b/systems/mom.nix
@@ -1,18 +1,18 @@
-inputs:{
+inputs: {
   pkgs,
   settings,
   lib,
   ...
 }: {
   imports = [
-      (import ../imports/boot.nix inputs)
-      (import ../imports/fonts.nix inputs)
-      (import ../imports/git.nix inputs)
-      (import ../imports/packages.nix inputs)
-      (import ../imports/xfce.nix inputs)
-      (import ../imports/shells.nix inputs)
-      (import ../imports/theme.nix inputs)
-    ];
+    (import ../imports/boot.nix inputs)
+    (import ../imports/fonts.nix inputs)
+    (import ../imports/git.nix inputs)
+    (import ../imports/packages.nix inputs)
+    (import ../imports/xfce.nix inputs)
+    (import ../imports/shells.nix inputs)
+    (import ../imports/theme.nix inputs)
+  ];
   nixpkgs.allowedUnfree = ["hplip"];
   system.stateVersion = "22.11";
   environment.systemPackages = [