From 7c9ffc116ebdc742972e79d9a17f9c8ef3dad7de Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 29 Mar 2025 23:25:29 +0000
Subject: [PATCH] Move shared Home Manager packages

---
 home/opdavies/default.nix            | 14 -----------
 home/opdavies/home.nix               | 32 +++++++++++++++++++++++--
 lib/shared/home-manager-packages.nix | 35 ----------------------------
 3 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 lib/shared/home-manager-packages.nix

diff --git a/home/opdavies/default.nix b/home/opdavies/default.nix
index 9e6844ca..6b64526f 100644
--- a/home/opdavies/default.nix
+++ b/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";
diff --git a/home/opdavies/home.nix b/home/opdavies/home.nix
index 4e56aeda..c22c2e2e 100644
--- a/home/opdavies/home.nix
+++ b/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;
 
diff --git a/lib/shared/home-manager-packages.nix b/lib/shared/home-manager-packages.nix
deleted file mode 100644
index 4b22f704..00000000
--- a/lib/shared/home-manager-packages.nix
+++ /dev/null
@@ -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
-]