From 44e26348dbb60f0a32abea35768fc8f2c40dc7e0 Mon Sep 17 00:00:00 2001
From: sstent <stuart.stent@gmail.com>
Date: Wed, 29 Nov 2023 20:50:25 +0000
Subject: [PATCH] new flake

---
 flake.nix                        |  6 ------
 home-manager/default.nix         | 19 +++++++++++++------
 modules/home-manager/default.nix |  8 ++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 modules/home-manager/default.nix

diff --git a/flake.nix b/flake.nix
index 4b8b1b3..62f63e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,19 +36,13 @@ outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
               # settings to nixpkgs-unstable goes to here
             };
             
-            #hostName = "StuPC";
 
             # make all inputs availabe in other nix files
             inherit inputs;
           };
 
           modules = [
-            # Root on ZFS related configuration
             ./modules
-
-            # Configuration shared by all hosts
-
-            # Configuration per host
             ./hosts/${hostName}
 
 
diff --git a/home-manager/default.nix b/home-manager/default.nix
index e2ab6ea..f3092e4 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  outputs,
   pkgs,
   config,
   hostName,
@@ -8,8 +9,10 @@
 #  imports = [
     #./global.nix
     #"../modules/vscode-server/home.nix"
-
- # ];
+#    ../modules/home-manager/beets
+#    ../modules/home-manager/keybase
+#    ../modules/home-manager/ssh-proxy
+# ];
   home.username = "sstent";
   home.homeDirectory = "/home/sstent";
   home.stateVersion = "23.05";
@@ -29,12 +32,11 @@
   # home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
 
 
-  imports =
-    [
+#  imports =
+#    [
       # ./beets.nix
       # ./keybase.nix
-    ];
-    # ++ (builtins.attrValues outputs.homeManagerModules);
+#    ] ++ (builtins.attrValues homeManagerModules);
 
   ###dotfiles path variable
 
@@ -45,6 +47,11 @@
 
   #programs.git.enable = true;
 
+#  custom = {
+#    ssh-proxy.enable = false;
+#    beets.enable = true;
+#    keybase.enable = true;
+#  };
 
 
   # Let Home Manager install and manage itself.
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
new file mode 100644
index 0000000..134a1a4
--- /dev/null
+++ b/modules/home-manager/default.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }: { imports = [ 
+
+
+./home-manager/beets
+./home-manager/keybase
+./home-manager/ssh-proxy
+
+]; }