From 4f83fd43896b51d078aaf02624e719f6cffc8be5 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Fri, 17 Feb 2023 22:56:18 -0500
Subject: [PATCH] updated mom's laptop

---
 flake.nix          |  4 +++-
 imports/shells.nix |  2 +-
 imports/xfce.nix   |  2 +-
 systems/mom.nix    | 26 ++++++++++----------------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index d5e487a..2688cf4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,7 @@
     unstable,
     stable,
     flake-utils,
+    nvim-flake,
     ...
   } @ inputs:
     {
@@ -57,6 +58,7 @@
             {
               nixpkgs.overlays = [
                 (import ./pkgs)
+                nvim-flake.overlays.default
               ];
             }
           ];
@@ -77,7 +79,7 @@
             (import ./systems/laptop.nix inputs)
           ];
         };
-        moms-laptop = stable.lib.nixosSystem {
+        moms-laptop = unstable.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
             inherit inputs self;
diff --git a/imports/shells.nix b/imports/shells.nix
index 11ffc10..f4697eb 100644
--- a/imports/shells.nix
+++ b/imports/shells.nix
@@ -14,7 +14,7 @@
       pkgs.exa
       pkgs.direnv
       pkgs.nix-direnv
-      nvim-flake.packages.${pkgs.system}.default
+      pkgs.neovim
       fetch-rs.packages.${pkgs.system}.default
       suckless.packages.${pkgs.system}.st
     ];
diff --git a/imports/xfce.nix b/imports/xfce.nix
index cb28a42..41c44dd 100644
--- a/imports/xfce.nix
+++ b/imports/xfce.nix
@@ -5,7 +5,6 @@ _: {
 }: {
   services.xserver = {
     enable = true;
-    tty = 1;
     exportConfiguration = true; #make config debuggable
     layout = "us";
     libinput.enable = true;
@@ -21,6 +20,7 @@ _: {
       defaultSession = "xfce";
       lightdm = {
         enable = true;
+        extraConfig =  "minimum-vt=1";
         background = ../images/recursion.png;
         greeters.mini = {
           enable = true;
diff --git a/systems/mom.nix b/systems/mom.nix
index b44ae79..0652499 100644
--- a/systems/mom.nix
+++ b/systems/mom.nix
@@ -1,25 +1,19 @@
-{
+inputs:{
   pkgs,
   settings,
   lib,
   ...
 }: {
-  imports = let
-    files = [
-      "boot"
-      "fonts"
-      "git"
-      "packages"
-      "xfce"
-      "shells"
-      "theme"
+  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)
     ];
-  in
-    lib.lists.forEach files (
-      f:
-        ../imports + ("/" + f + ".nix")
-    );
-
+  nixpkgs.allowedUnfree = ["hplip"];
   system.stateVersion = "22.11";
   environment.systemPackages = [
     pkgs.gimp