From e761ac4b2c69f8ac267e53fa437c6978b207d743 Mon Sep 17 00:00:00 2001
From: Quentin Aristote <quentin@aristote.fr>
Date: Tue, 21 Feb 2023 21:43:37 +0100
Subject: factorize passing of modules

---
 nixos/users.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nixos/users.nix')

diff --git a/nixos/users.nix b/nixos/users.nix
index b7512e8..0b28011 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -1,4 +1,4 @@
-{ home, home-manager, ... }:
+{ home-manager, homeModules, ... }:
 
 {
   imports = [ home-manager.nixosModules.home-manager ];
@@ -9,8 +9,8 @@
   };
 
   home-manager = {
-    users.qaristote = home.qaristote;
-    useGlobalPkgs = false;
+    users.qaristote = { ... }: { imports = homeModules; };
+    useGlobalPkgs = true;
     useUserPackages = true;
   };
 }
-- 
cgit v1.2.3


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/users.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'nixos/users.nix')

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