From 4836066be442f1f0fafc5d4528b26e29728281cb Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 6 Apr 2025 01:00:57 +0100
Subject: [PATCH] Combine default.nix and home.nix

---
 home/opdavies/default.nix | 42 +++++++++++++++++++++++++++++++++++----
 home/opdavies/home.nix    | 41 --------------------------------------
 2 files changed, 38 insertions(+), 45 deletions(-)
 delete mode 100644 home/opdavies/home.nix

diff --git a/home/opdavies/default.nix b/home/opdavies/default.nix
index 339c0234..23426d12 100644
--- a/home/opdavies/default.nix
+++ b/home/opdavies/default.nix
@@ -17,20 +17,49 @@ let
     ];
   };
 
+  inherit (pkgs) lib;
+
   inherit (config.xdg)
     cacheHome
     configHome
     dataHome
     stateHome
     ;
-
-  inherit (pkgs) lib;
 in
 {
-  imports = [
-    ./home.nix
+  home.username = "opdavies";
+  home.homeDirectory = "/home/${config.home.username}";
+
+  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;
+
   home.sessionVariables = {
     EDITOR = "nvim";
     IMAPFILTER_HOME = "${configHome}/imapfilter";
@@ -67,4 +96,9 @@ in
       };
     };
   };
+
+  # Nicely reload system units when changing configs.
+  systemd.user.startServices = "sd-switch";
+
+  home.stateVersion = "22.05"; # Please read the comment before changing.
 }
diff --git a/home/opdavies/home.nix b/home/opdavies/home.nix
deleted file mode 100644
index c22c2e2e..00000000
--- a/home/opdavies/home.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "opdavies";
-  home.homeDirectory = "/home/${config.home.username}";
-
-  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;
-
-  # Nicely reload system units when changing configs.
-  systemd.user.startServices = "sd-switch";
-}