Move notes configuration

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;

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;

modules/home-manager/default.nix

@@ -15,7 +15,6 @@
     ./media/mpv.nix
     ./neovim
     ./node.nix
-    ./notes.nix
     ./phpactor
     ./ranger.nix
     ./redshift.nix

modules/home-manager/notes.nix

@@ -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;
-      };
-    };
-  };
-}

modules2/hosts/t480/notes.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.base =
+    { config, ... }:
+    {
+      programs.notes.directory = "${config.xdg.userDirs.documents}/wiki/notes";
+    };
+}

modules2/notes/base.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      home.packages = [ pkgs.notes ];
+    };
+}

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;
+    };
+}

modules2/notes/xdg.nix

@@ -0,0 +1,6 @@
+{
+  flake.modules.homeManager.base.xdg = {
+    enable = true;
+    userDirs.enable = true;
+  };
+}