From 1eed0aa28703df25aea7ffa123840d8647cbda94 Mon Sep 17 00:00:00 2001
From: Random936 <randomdude936@gmail.com>
Date: Thu, 4 Jul 2024 18:00:22 -0700
Subject: [PATCH] Changed directory structure for nix flake

---
 .gitignore                                    |  2 +
 flake.nix                                     |  4 +-
 home-manager/.home.nix.~undo-tree~            |  7 ----
 home-manager/home.nix~                        | 41 -------------------
 .../darwin-home.nix => home/darwin.nix        |  2 +-
 {home-manager => home}/emacs.nix              |  0
 home-manager/nixos-home.nix => home/nixos.nix |  2 +-
 home-manager/common.nix => home/shared.nix    |  0
 {home-manager => home}/zsh.nix                |  0
 9 files changed, 6 insertions(+), 52 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 home-manager/.home.nix.~undo-tree~
 delete mode 100644 home-manager/home.nix~
 rename home-manager/darwin-home.nix => home/darwin.nix (95%)
 rename {home-manager => home}/emacs.nix (100%)
 rename home-manager/nixos-home.nix => home/nixos.nix (98%)
 rename home-manager/common.nix => home/shared.nix (100%)
 rename {home-manager => home}/zsh.nix (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2b5ed45
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+**/*~
+**/.*~undo-tree~
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index b006085..9d7e6e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
     homeConfigurations.random = home-manager.lib.homeManagerConfiguration {
       pkgs = nixpkgs.legacyPackages."x86_64-linux";
       modules = [
-        ./home-manager/nixos-home.nix
+        ./home/nixos.nix
       ];
     };
 
@@ -50,7 +50,7 @@
     homeConfigurations.jadenmaxwell = home-manager.lib.homeManagerConfiguration {
       pkgs = nixpkgs.legacyPackages."aarch64-darwin";
       modules = [
-        ./home-manager/darwin-home.nix
+        ./home/darwin.nix
       ];
     };
   };
diff --git a/home-manager/.home.nix.~undo-tree~ b/home-manager/.home.nix.~undo-tree~
deleted file mode 100644
index 7588cbf..0000000
--- a/home-manager/.home.nix.~undo-tree~
+++ /dev/null
@@ -1,7 +0,0 @@
-(undo-tree-save-format-version . 1)
-"7e49e649cf5d5cd0fe98d98d1acb574bc38cf9c4"
-[nil nil nil nil (26183 55194 403169 247000) 0 nil]
-([nil nil ((179 . 182) (t 26183 55051 535209 541000)) nil (26183 55194 403165 643000) 0 nil])
-([nil nil ((142 . 145) (t 26183 55194 404717 701000)) nil (26183 55225 797886 902000) 0 nil])
-([nil current ((147 . 159) (142 . 147) 112) nil (26183 55225 797884 200000) 0 nil])
-nil
diff --git a/home-manager/home.nix~ b/home-manager/home.nix~
deleted file mode 100644
index 51ccb61..0000000
--- a/home-manager/home.nix~
+++ /dev/null
@@ -1,41 +0,0 @@
-{ inputs, config, pkgs, ... }: {
-  home = {
-    username = "random";
-    homeDirectory = "/home/random";
-  };
-
-  home.packages = with pkgs; [];
-
-  home.file.".p10k.zsh".source = dotfiles/.p10k.zsh;
-
-  programs = {
-    home-manager.enable = true;
-    zoxide.enable = true;
-    eza.enable = true;
-    fzf.enable = true;
-    command-not-found.enable = true;
-
-    git = {
-      enable = true;
-      userName = "Random936";
-      userEmail = "randomdude936@gmail.com";
-    };
-
-    zsh = {
-      enable = true;
-      enableCompletion = true;
-      enableAutosuggestions = true;
-      syntaxHighlighting.enable = true;
-
-      zplug = {
-        enable = true;
-        plugins = [
-          { name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; }
-        ];
-      };
-
-    };
-  };
-
-  home.stateVersion = "23.05";
-}
diff --git a/home-manager/darwin-home.nix b/home/darwin.nix
similarity index 95%
rename from home-manager/darwin-home.nix
rename to home/darwin.nix
index d3e6a80..f6489e8 100644
--- a/home-manager/darwin-home.nix
+++ b/home/darwin.nix
@@ -12,7 +12,7 @@ in
   };
 
   imports = [
-    ./common.nix
+    ./shared.nix
     ./emacs.nix
     ./zsh.nix
   ];
diff --git a/home-manager/emacs.nix b/home/emacs.nix
similarity index 100%
rename from home-manager/emacs.nix
rename to home/emacs.nix
diff --git a/home-manager/nixos-home.nix b/home/nixos.nix
similarity index 98%
rename from home-manager/nixos-home.nix
rename to home/nixos.nix
index 4fb211c..c575e49 100644
--- a/home-manager/nixos-home.nix
+++ b/home/nixos.nix
@@ -6,7 +6,7 @@
   };
 
   imports = [
-    ./common.nix
+    ./shared.nix
     ./emacs.nix
     ./zsh.nix
   ];
diff --git a/home-manager/common.nix b/home/shared.nix
similarity index 100%
rename from home-manager/common.nix
rename to home/shared.nix
diff --git a/home-manager/zsh.nix b/home/zsh.nix
similarity index 100%
rename from home-manager/zsh.nix
rename to home/zsh.nix