From fa849e1bd5f4643398829d5a7d58363f373909b4 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Tue, 23 May 2023 17:10:45 +0200
Subject: [PATCH] Use home-manager.useGlobalPkgs

---
 flake.nix            |  7 ++++++-
 users/erwin/work.nix | 19 +------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index d8d16c2..9afd7f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,7 +160,12 @@
 
                     baseConfig
                     home-manager.nixosModules.home-manager
-                    { home-manager.useUserPackages = true; }
+                    {
+                      home-manager = {
+                        useUserPackages = true;
+                        useGlobalPkgs = true;
+                      };
+                    }
                   ];
 
                 system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index 6a39bc3..f18ccbb 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, inputs, self-overlay, ... }:
+{ pkgs, config, lib, inputs, ... }:
 with lib;
 let
   cfg = config.eboskma.users.erwin;
@@ -33,8 +33,6 @@ in
         EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
       };
 
-      nixpkgs.config.allowUnfree = true;
-
       eboskma = {
         var.workSystem = true;
         programs = {
@@ -125,13 +123,6 @@ in
         };
       };
 
-      # home.keyboard = {
-      #   layout = "us,us";
-      #   variant = "colemak,";
-      #   model = "pc105";
-      #   options = [ "ctrl:nocaps" "eurosign:5" "lv5:ralt_switch" "lv3:rwin_switch" "grp:sclk_toggle" "grp_led:scroll" ];
-      # };
-
       home.packages = with pkgs; [
         atool
         bitwarden
@@ -239,14 +230,6 @@ in
       };
 
       imports = [
-        {
-          nixpkgs.overlays = [
-            self-overlay
-            inputs.ha-now-playing.overlays.${pkgs.system}
-            inputs.pamedia.overlays.${pkgs.system}
-            inputs.emacs-overlay.overlay
-          ];
-        }
         ../../modules/options
       ] ++ (map (mod: (../../home-manager/modules + "/${mod}")) (builtins.attrNames (builtins.readDir ../../home-manager/modules)));