reorg

hosts/darwin/shared.nix

@@ -1,5 +1,5 @@
 {
   imports = [
-    ../../modules/platform/darwin
+    ../../modules/darwin
   ];
 }

hosts/nixos/tahani/default.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [
-    ../../../modules/platform/nixos
+    ../../../modules/nixos
   ];
 
   boot = {

modules/core.nix

@@ -6,7 +6,7 @@
       allowUnfree = true;
     };
     overlays = let
-      path = ../../overlays;
+      path = ../overlays;
     in
       with builtins;
         map (n: import (path + ("/" + n))) (

modules/darwin/default.nix

@@ -8,9 +8,9 @@
   ...
 }: {
   imports = [
-    ../../core
+    ../core.nix
-    ../../networking/tailscale.nix
+    ../tailscale.nix
-    ../../services/syncthing.nix
+    ../syncthing.nix
     ./dock
     ./homebrew.nix
     ./system.nix
@@ -49,13 +49,13 @@
       _module.args = {inherit user;};
       imports = [
         nixvim.homeModules.nixvim
-        ../../home-manager/base
+        ../home-manager
-        ../../home-manager/darwin
+        ../home-manager/darwin
       ];
       fonts.fontconfig.enable = true;
       home = {
         packages =
-          pkgs.callPackage ../../packages {}
+          pkgs.callPackage ../packages.nix {}
           ++ pkgs.callPackage ./packages.nix {};
         stateVersion = constants.stateVersions.homeManager;
       };

modules/home-manager/base/default.nix

@@ -1,24 +0,0 @@
-{
-  imports = [
-    ./shell/aliases.nix
-    ./shell/fish.nix
-    ./shell/starship.nix
-    ./shell/zsh.nix
-    ./tools/atuin.nix
-    ./tools/bat.nix
-    ./tools/eza.nix
-    ./tools/git.nix
-    ./tools/lazygit.nix
-    ./tools/mise.nix
-    ./tools/ssh.nix
-    ./tools/zellij.nix
-    ./tools/zoxide.nix
-    ./editors/neovim
-  ];
-
-  programs.home-manager.enable = true;
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-}

modules/home-manager/base/shell/aliases.nix

@@ -1,6 +0,0 @@
-{
-  home.shellAliases = {
-    v = "nvim";
-    lg = "lazygit";
-  };
-}

modules/home-manager/darwin/default.nix

@@ -1,5 +1,5 @@
 {
   imports = [
-    ./terminal/ghostty.nix
+    ./ghostty.nix
   ];
 }

modules/home-manager/default.nix

@@ -0,0 +1,28 @@
+{
+  imports = [
+    ./fish.nix
+    ./starship.nix
+    ./zsh.nix
+    ./atuin.nix
+    ./bat.nix
+    ./eza.nix
+    ./git.nix
+    ./lazygit.nix
+    ./mise.nix
+    ./ssh.nix
+    ./zellij.nix
+    ./zoxide.nix
+    ./neovim
+  ];
+
+  programs.home-manager.enable = true;
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+
+  home.shellAliases = {
+    v = "nvim";
+    lg = "lazygit";
+  };
+}

modules/home-manager/nixos/default.nix

@@ -1,5 +1,5 @@
 {
   imports = [
-    ./terminal/zellij.nix
+    ./zellij.nix
   ];
 }

modules/nixos/default.nix

@@ -7,12 +7,12 @@
   ...
 }: {
   imports = [
-    ../../core
+    ../core.nix
-    ../../networking/firewall.nix
+    ./firewall.nix
-    ../../networking/ssh.nix
+    ./ssh.nix
-    ../../networking/tailscale.nix
+    ./adguard.nix
-    ../../services/adguard.nix
+    ../tailscale.nix
-    ../../services/syncthing.nix
+    ../syncthing.nix
     sops-nix.nixosModules.sops
   ];
 
@@ -57,12 +57,12 @@
       _module.args = {inherit user;};
       imports = [
         nixvim.homeModules.nixvim
-        ../../home-manager/base
+        ../home-manager
-        ../../home-manager/nixos
+        ../home-manager/nixos
       ];
       home = {
         packages =
-          pkgs.callPackage ../../packages {}
+          pkgs.callPackage ../packages.nix {}
           ++ pkgs.callPackage ./packages.nix {};
         stateVersion = constants.stateVersions.homeManager;
       };