moved home-manager

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
   ];

home-manager/git.nix

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

home-manager/zsh.nix

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

nixos/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./home-manager.nix
     ./docker
     ./services
   ];

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
       ];