From 6bf90e6b246c7453763d6df0bfc3c2b66d273140 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sun, 8 Dec 2024 13:04:18 -0600
Subject: [PATCH] reorg

---
 flake.nix                                    | 37 +++++++-------------
 home-manager/default.nix                     |  9 -----
 home-manager/home.nix                        |  9 -----
 {home-manager => homeManagerModules}/git.nix |  3 +-
 homeManagerModules/home.nix                  | 24 +++++++++++++
 5 files changed, 37 insertions(+), 45 deletions(-)
 delete mode 100644 home-manager/default.nix
 delete mode 100644 home-manager/home.nix
 rename {home-manager => homeManagerModules}/git.nix (75%)
 create mode 100644 homeManagerModules/home.nix

diff --git a/flake.nix b/flake.nix
index f1c1f2b..696915e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,10 +24,8 @@
     pkgs = nixpkgs.legacyPackages.${system};
     stateVersion = "24.05";
     timeZone = "America/Chicago";
-    hostname = "loki";
-    lokiPort = 3100;
-    lokiUser = "loki";
-    lokiPath = "/srv/loki";
+    hostname = "panoptes-nix";
+    user = "panoptes";
   in
   {
     nixosConfigurations = {
@@ -42,42 +40,31 @@
             time.timeZone = "${timeZone}";
             environment.systemPackages = [
               (pkgs.writeShellScriptBin "nfs" ''
-                sudo nixos-rebuild switch --flake git+file://${lokiPath}#${hostname}
+                sudo nixos-rebuild switch --flake git+file:///etc/nixos#${hostname}
               '')
             ];
           })
-          (import ./nixosModules/services/loki.nix {
-            inherit pkgs;
-            inherit lokiPort;
-            inherit lokiUser;
-            inherit lokiPath;
-          })
         ];
       };
     };
 
-    homeManagerModules.default = ./homeManagerModules;
-    nixosModules.default = ./nixosModules;
+    # homeManagerModules.default = ./homeManagerModules;
+    # nixosModules.default = ./nixosModules;
 
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
       useGlobalPkgs = true;
       "root@${hostname}" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
-        extraSpecialArgs = {inherit inputs outputs;};
-        modules = [(import ./home-manager/git.nix { repoPath = "${lokiPath}"; })];
+        # pkgs = nixpkgs.legacyPackages.${system};
+        extraSpecialArgs = {inherit inputs outputs pkgs;};
+        modules = [ ./home-manager/git.nix ];
       };
 
-      # FIXME replace with your username@hostname
-      "${lokiUser}@${hostname}" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
-        extraSpecialArgs = {inherit inputs outputs;};
-        # > Our main home-manager configuration file <
-        modules = [
-          (import ./home-manager/home.nix { user = "${lokiUser}"; repoPath = "${lokiPath}"; })
-          (import ./home-manager/git.nix { repoPath = "${lokiPath}"; })
-        ];
+      "${user}@${hostname}" = home-manager.lib.homeManagerConfiguration {
+        # pkgs = nixpkgs.legacyPackages.${system};
+        extraSpecialArgs = {inherit inputs outputs pkgs;};
+        modules = [ ./home-manager/home.nix ];
       };
     };
   };
diff --git a/home-manager/default.nix b/home-manager/default.nix
deleted file mode 100644
index 9cc4bfd..0000000
--- a/home-manager/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ user, repoPath, ... }:
-{
-  programs.home-manager.enable = true;
-  home = {
-    stateVersion = "24.05";
-    username = "${user}";
-    homeDirectory = "${repoPath}";
-  };
-}
\ No newline at end of file
diff --git a/home-manager/home.nix b/home-manager/home.nix
deleted file mode 100644
index 8e013c6..0000000
--- a/home-manager/home.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ user, repoPath, ... }:
-{
-  programs.home-manager.enable = true;
-  home = {
-    stateVersion = "24.05";
-    username = "${user}";
-    homeDirectory = "${repoPath}";
-  };
-}
diff --git a/home-manager/git.nix b/homeManagerModules/git.nix
similarity index 75%
rename from home-manager/git.nix
rename to homeManagerModules/git.nix
index b166c30..d30ba88 100644
--- a/home-manager/git.nix
+++ b/homeManagerModules/git.nix
@@ -1,8 +1,7 @@
-{ repoPath, ... }:
+{ ... }:
 {
   programs.git = {
     enable = true;
-    extraConfig.safe.directory = "${repoPath}";
     extraConfig.credential.helper = "store --file ~/.git-credentials";
     userName = "John Lancaster";
     userEmail = "32917998+jsl12@users.noreply.github.com";
diff --git a/homeManagerModules/home.nix b/homeManagerModules/home.nix
new file mode 100644
index 0000000..e73cc83
--- /dev/null
+++ b/homeManagerModules/home.nix
@@ -0,0 +1,24 @@
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  homePath = "/srv/panoptes";
+in
+{
+  imports = [ ./git.nix ];
+
+  programs.git.extraConfig.safe.directory = "${homePath}";
+
+  programs.home-manager.enable = true;
+  home = {
+    stateVersion = "24.05";
+    username = "${user}";
+    homeDirectory = "${homePath}";
+  };
+
+  systemd.user.startServices = "sd-switch";
+}
\ No newline at end of file