Move shared Home Manager packages

home/opdavies/default.nix

@@ -1,12 +1,9 @@
 {
   config,
   headless ? false,
-  hostname,
   inputs,
   outputs,
-  self,
   system,
-  username,
   ...
 }:
 let
@@ -29,15 +26,6 @@ let
     ;
 
   inherit (pkgs) lib;
-
-  shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
-    inherit
-      headless
-      inputs
-      pkgs
-      username
-      ;
-  };
 in
 {
   imports =
@@ -50,8 +38,6 @@ in
       ./desktop
     ];
 
-  home.packages = shared-packages;
-
   home.sessionVariables = {
     EDITOR = "nvim";
     IMAPFILTER_HOME = "${configHome}/imapfilter";

home/opdavies/home.nix

@@ -1,10 +1,38 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   home.username = "opdavies";
   home.homeDirectory = "/home/${config.home.username}";
 
-  home.stateVersion = "22.05";
+  home.stateVersion = "22.05"; # Please read the comment before changing.
+
+  home.packages = with pkgs; [
+    cachix
+    delta
+    entr
+    gcc
+    git
+    git-crypt
+    gnupg
+    inotify-tools
+    jq
+    killall
+    lua
+    mob
+    pv
+    simple-http-server
+    sshs
+    tldr
+    tree
+    tree-sitter
+    unzip
+    w3m
+    watchexec
+    wget
+    xclip
+    xdg-utils
+    zbar
+  ];
 
   programs.home-manager.enable = true;
 

lib/shared/home-manager-packages.nix

@@ -1,35 +0,0 @@
-{
-  headless,
-  pkgs,
-  username,
-  ...
-}:
-
-with pkgs;
-[
-  cachix
-  delta
-  entr
-  gcc
-  git
-  git-crypt
-  gnupg
-  inotify-tools
-  jq
-  killall
-  lua
-  mob
-  pv
-  simple-http-server
-  sshs
-  tldr
-  tree
-  tree-sitter
-  unzip
-  w3m
-  watchexec
-  wget
-  xclip
-  xdg-utils
-  zbar
-]