From ccbe21a5c42464c6ace7d00158bcc4b788dbbf00 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 25 Jul 2025 22:00:57 +0100
Subject: [PATCH] Move notes configuration

---
 home-manager/opdavies/PW05CH3L.nix   |  1 -
 home-manager/opdavies/t480.nix       |  3 ---
 modules/home-manager/default.nix     |  1 -
 modules/home-manager/notes.nix       | 37 ----------------------------
 modules2/hosts/t480/notes.nix        |  7 ++++++
 modules2/notes/base.nix              |  7 ++++++
 modules2/notes/session-variables.nix | 13 ++++++++++
 modules2/notes/xdg.nix               |  6 +++++
 8 files changed, 33 insertions(+), 42 deletions(-)
 delete mode 100644 modules/home-manager/notes.nix
 create mode 100644 modules2/hosts/t480/notes.nix
 create mode 100644 modules2/notes/base.nix
 create mode 100644 modules2/notes/session-variables.nix
 create mode 100644 modules2/notes/xdg.nix

diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index f25a0dd6..dcd94faf 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -10,7 +10,6 @@
       fzf.enable = true;
 
       node.enable = true;
-      notes.enable = true;
       ranger.enable = true;
       starship.enable = true;
       zsh.enable = true;
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index a9a533ec..8c706cd7 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -15,9 +15,6 @@
 
       node.enable = true;
 
-      notes.enable = true;
-      notes.directory = "${config.xdg.userDirs.documents}/wiki/notes";
-
       ranger.enable = true;
       sxhkd.enable = true;
       starship.enable = true;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 02168d8d..f9ca2742 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -15,7 +15,6 @@
     ./media/mpv.nix
     ./neovim
     ./node.nix
-    ./notes.nix
     ./phpactor
     ./ranger.nix
     ./redshift.nix
diff --git a/modules/home-manager/notes.nix b/modules/home-manager/notes.nix
deleted file mode 100644
index 5b843c72..00000000
--- a/modules/home-manager/notes.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.cli.notes;
-in
-{
-  options.features.cli.notes = {
-    enable = mkEnableOption "Enable notes";
-
-    directory = mkOption {
-      default = "${config.xdg.userDirs.documents}/notes";
-      type = types.str;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    xdg = {
-      enable = true;
-      userDirs.enable = true;
-    };
-
-    home = {
-      packages = with pkgs; [ notes ];
-
-      sessionVariables = {
-        NOTES_DIRECTORY = cfg.directory;
-      };
-    };
-  };
-}
diff --git a/modules2/hosts/t480/notes.nix b/modules2/hosts/t480/notes.nix
new file mode 100644
index 00000000..8fbeaf3d
--- /dev/null
+++ b/modules2/hosts/t480/notes.nix
@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.base =
+    { config, ... }:
+    {
+      programs.notes.directory = "${config.xdg.userDirs.documents}/wiki/notes";
+    };
+}
diff --git a/modules2/notes/base.nix b/modules2/notes/base.nix
new file mode 100644
index 00000000..77120315
--- /dev/null
+++ b/modules2/notes/base.nix
@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      home.packages = [ pkgs.notes ];
+    };
+}
diff --git a/modules2/notes/session-variables.nix b/modules2/notes/session-variables.nix
new file mode 100644
index 00000000..dd88be9f
--- /dev/null
+++ b/modules2/notes/session-variables.nix
@@ -0,0 +1,13 @@
+{lib,...}:
+{
+  flake.modules.homeManager.base =
+    { config, ... }:
+    {
+      options.programs.notes.directory = lib.mkOption {
+        default = "${config.xdg.userDirs.documents}/notes";
+        type = lib.types.str;
+      };
+
+      config.home.sessionVariables.NOTES_DIRECTORY = config.programs.notes.directory;
+    };
+}
diff --git a/modules2/notes/xdg.nix b/modules2/notes/xdg.nix
new file mode 100644
index 00000000..f0daba22
--- /dev/null
+++ b/modules2/notes/xdg.nix
@@ -0,0 +1,6 @@
+{
+  flake.modules.homeManager.base.xdg = {
+    enable = true;
+    userDirs.enable = true;
+  };
+}