From 0b5a00afb6b08e0d51af87cc908e10150c770ec2 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:23:54 -0500
Subject: [PATCH] moved home-manager

---
 configuration.nix                             |  2 +-
 home-manager/git.nix                          | 12 ----------
 home-manager/zsh.nix                          | 23 -------------------
 nixos/default.nix                             |  1 +
 .../default.nix => nixos/home-manager.nix     |  1 +
 5 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 home-manager/git.nix
 delete mode 100644 home-manager/zsh.nix
 rename home-manager/default.nix => nixos/home-manager.nix (90%)

diff --git a/configuration.nix b/configuration.nix
index 4c6f570..8e5b020 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, userSettings, systemSettings, ... }:
 {
   imports = [
-    (import ./home-manager {inherit systemSettings userSettings lib pkgs;})
+    # (import ./home-manager {inherit systemSettings userSettings lib pkgs;})
      ./nixos
      ./scripts
   ];
diff --git a/home-manager/git.nix b/home-manager/git.nix
deleted file mode 100644
index 42f4ec8..0000000
--- a/home-manager/git.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ userSettings, ... }:
-{
-  programs.git = {
-    enable = true;
-    extraConfig.credential.helper = "store --file ~/.git-credentials";
-    userName = "${userSettings.gitUserName}";
-    userEmail = "${userSettings.gitUserEmail}";
-    extraConfig = {
-      safe.directory = "/home/appdaemon/ad-nix";
-    };
-  };
-}
\ No newline at end of file
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
deleted file mode 100644
index dd7d4ae..0000000
--- a/home-manager/zsh.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-{
-  programs.zsh = {
-    enable = true;
-    oh-my-zsh = {
-      enable = true;
-      # https://github.com/ohmyzsh/ohmyzsh/wiki/themes
-      # theme = "robbyrussell";
-      # theme = "simple";
-      theme = "risto";
-      plugins = [
-        "sudo"
-        "dotenv"
-        "git"
-        "ssh"
-        "ssh-agent"
-      ];
-    };
-    shellAliases = {
-      ls = "eza -lgs type -o --no-time";
-    };
-  };
-}
\ No newline at end of file
diff --git a/nixos/default.nix b/nixos/default.nix
index c1a2796..9eec318 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./home-manager.nix
     ./docker
     ./services
   ];
diff --git a/home-manager/default.nix b/nixos/home-manager.nix
similarity index 90%
rename from home-manager/default.nix
rename to nixos/home-manager.nix
index 1c0df94..9c011b8 100644
--- a/home-manager/default.nix
+++ b/nixos/home-manager.nix
@@ -18,6 +18,7 @@
       home.homeDirectory = lib.mkForce "${userSettings.adHome}";
       systemd.user.startServices = "sd-switch"; # helps with handling systemd services when switching
       programs.gh.enable = true;
+      programs.git.extraConfig.safe.directory = "/home/appdaemon/ad-nix";
       home.packages = with pkgs; [
         lazydocker
       ];