Merge pull request #267 from himkt/refactor-nix

refactor: project structure
himkt · Dec 7, 2024 · d0021ec · d0021ec
2 parents a730fca + e0b8dbe
commit d0021ec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/nix/config.d/darwin.nix → nix/config.d/darwin/darwin.nix b/nix/config.d/darwin.nix → nix/config.d/darwin/darwin.nix
@@ -6,16 +6,16 @@
   nix.settings.trusted-users = [ "root" "himkt" ];
 
   imports = [
-    ./darwin/system/defaults/controlcenter.nix
-    ./darwin/system/defaults/dock.nix
-    ./darwin/system/defaults/finder.nix
-    ./darwin/system/defaults/NSGlobalDomain.nix
-    ./darwin/system/defaults/loginwindow.nix
-    ./darwin/system/keyboard.nix
-    ./darwin/security/pam.nix
-    ./darwin/homebrew.nix
-    ./darwin/font.nix
-    ./darwin/environment/systemPackages.nix
+    ./environment/systemPackages.nix
+    ./fonts/packages.nix
+    ./homebrew.nix
+    ./system/defaults/controlcenter.nix
+    ./system/defaults/dock.nix
+    ./system/defaults/finder.nix
+    ./system/defaults/NSGlobalDomain.nix
+    ./system/defaults/loginwindow.nix
+    ./system/keyboard.nix
+    ./security/pam.nix
   ];
 
   # Used for backwards compatibility, please read the changelog before changing.

diff --git a/nix/config.d/darwin/font.nix → nix/config.d/darwin/fonts/packages.nix b/nix/config.d/darwin/font.nix → nix/config.d/darwin/fonts/packages.nix
diff --git a/nix/config.d/flake.nix b/nix/config.d/flake.nix
@@ -15,8 +15,8 @@
         system = "aarch64-darwin";
         modules = [
           home-manager.darwinModules.home-manager
-          ./home-manager.nix
-          ./darwin.nix
+          ./darwin/darwin.nix
+          ./home/home.nix
         ];
       };
     };

diff --git a/nix/config.d/home-manager.nix → nix/config.d/home/home.nix b/nix/config.d/home-manager.nix → nix/config.d/home/home.nix
@@ -18,8 +18,8 @@
     home.username = "himkt";
 
     imports = [
-      ./home/programs/zsh.nix
       ./home/packages.nix
+      ./programs/zsh.nix
     ];
 
     programs.home-manager.enable = true;

diff --git a/nix/config.d/home/packages.nix → nix/config.d/home/home/packages.nix b/nix/config.d/home/packages.nix → nix/config.d/home/home/packages.nix