From b0214d50e9a728d77d98d791e92dfe3747f27e23 Mon Sep 17 00:00:00 2001
From: Quentin Aristote <quentin@aristote.fr>
Date: Tue, 21 Feb 2023 22:34:46 +0100
Subject: factor out common home-manager configuration

---
 nixos/gui.nix   |  2 +-
 nixos/nix.nix   |  3 +--
 nixos/users.nix | 11 +++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'nixos')

diff --git a/nixos/gui.nix b/nixos/gui.nix
index 82a1328..7c76a43 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -10,7 +10,7 @@ in {
 
   services.xserver = {
     displayManager.lightdm = {
-      background = background-image;
+      # background = background-image;
       greeters.gtk = {
         extraConfig = ''
           user-background = false
diff --git a/nixos/nix.nix b/nixos/nix.nix
index 01f86e7..15337bb 100644
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@@ -10,8 +10,7 @@
 
   system.autoUpgrade.flags =
     let update-input = input: [ "--update-input" input ];
-    in update-input "home-manager" ++ update-input "nixos-hardware"
-    ++ [ "--impure" ];
+    in update-input "home-manager" ++ update-input "nixos-hardware";
 
   # make auto-upgrade service lightweight
   systemd.services.nixos-upgrade.unitConfig = { CPUWeight = 1; };
diff --git a/nixos/users.nix b/nixos/users.nix
index 0b28011..c3185cf 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -1,16 +1,11 @@
-{ home-manager, homeModules, ... }:
+{ config, ... }:
 
 {
-  imports = [ home-manager.nixosModules.home-manager ];
-
   personal.user = {
     enable = true;
     name = "qaristote";
+    homeManager.enable = true;
   };
 
-  home-manager = {
-    users.qaristote = { ... }: { imports = homeModules; };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-  };
+  home-manager.extraSpecialArgs.osConfig = config;
 }
-- 
cgit v1.2.3