From 926f0aef895748af125597f3131fe69470162b8c Mon Sep 17 00:00:00 2001
From: ISnortPennies <ISnortPennies@protonmail.com>
Date: Wed, 1 Feb 2023 16:09:29 -0500
Subject: [PATCH] light dm changes

---
 flake.lock          | 12 ++++++------
 modules/xserver.nix | 17 ++---------------
 systems/desktop.nix |  1 +
 systems/laptop.nix  |  1 +
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 844f123..f2a4002 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1675230840,
-        "narHash": "sha256-DZuuUw5hIh+MwUOkDJOoZog656rcsD38dvb+bW37UzQ=",
+        "lastModified": 1675282109,
+        "narHash": "sha256-0XuyVuT3OowRiQyzuvFl6PvxLMqmIjtInBzu7Oxmrk8=",
         "owner": "ISnortPennies",
         "repo": "fetch-rs",
-        "rev": "099d2339c5b248df333bf5394dc1265e8e3d16ec",
+        "rev": "764f96781597de3130c54624340b9ee26d19aca3",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1675273418,
-        "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=",
+        "lastModified": 1675284429,
+        "narHash": "sha256-OVUyaSB9BKERTEn+LYqxx9Wudy7pwy1p2/nlURUIt60=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db",
+        "rev": "31968e86eddf260716458ee9ede65691f6e1987f",
         "type": "github"
       },
       "original": {
diff --git a/modules/xserver.nix b/modules/xserver.nix
index 8cf74be..e53a4b6 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -19,11 +19,12 @@
       defaultSession = "none+dwm";
       lightdm = {
         enable = true;
+        background = ../images/recursion.png;
         greeters.mini = {
           enable = true;
+          user = settings.username;
           extraConfig = ''
             [greeter]
-            user = ${settings.username}
             show-password-label = false
             password-label-text =
             invalid-password-text =
@@ -33,32 +34,18 @@
             show-image-on-all-monitors = true
 
 
-            [greeter-hotkeys]
-            mod-key = meta
-            shutdown-key = s
-            restart-key = r
-            hibernate-key = h
-            suspend-key = u
-
-
             [greeter-theme]
             font = "OverpassMono Nerd Font"
             font-size = 1.1em
-            font-weight = bold
-            font-style = normal
             text-color = "#7AA2F7"
             error-color = "#DB4B4B"
-            background-image = "${../images/recursion.png}"
             background-color = "#000000"
             window-color = "#000000"
             border-color = "#000000"
-            border-width = 2px
-            layout-space = 15
             password-character = -1
             password-color = "#7AA2F7"
             password-background-color = "#24283B"
             password-border-color = "#000000"
-            password-border-width = 2px
             password-border-radius = 0.341125em
           '';
         };
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 0c923a2..16a293f 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -36,6 +36,7 @@
   users = {
     defaultUserShell = pkgs.zsh;
     users."${settings.username}" = {
+      uid = 1000;
       isNormalUser = true;
       extraGroups = ["wheel" "audio" "networkmanager" "kvm" "libvirtd"];
     };
diff --git a/systems/laptop.nix b/systems/laptop.nix
index be4df42..b266113 100644
--- a/systems/laptop.nix
+++ b/systems/laptop.nix
@@ -29,6 +29,7 @@
   users = {
     defaultUserShell = pkgs.zsh;
     users."${settings.username}" = {
+      uid = 1000;
       isNormalUser = true;
       extraGroups = ["wheel" "audio" "networkmanager"];
     };