move nixos and darwin back into modules dir

README.md

@@ -8,10 +8,10 @@ configuration may be difficult to translate to a non-Nix system.
 
 However, some of the configurations are easier to lift directly:
 
-- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/neovim/config)
-- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/shell/fish/functions)
-- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/fish/default.nix)
-- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/git.nix)
+- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/common/neovim/config)
+- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/common/shell/fish/functions)
+- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/fish/default.nix)
+- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/git.nix)
 - [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon)
 
 Try out my Neovim config (requires [nix](https://nixos.org/download.html)):

apps/default.nix

@@ -57,7 +57,7 @@
   neovim = {
     type = "app";
     program = "${
-        (import ../modules/neovim/package {
+        (import ../modules/common/neovim/package {
           inherit pkgs;
           colors =
             import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };

flake.nix

@@ -161,7 +161,7 @@
         };
 
         neovim = let pkgs = import nixpkgs { inherit system overlays; };
-        in import ./modules/neovim/package {
+        in import ./modules/common/neovim/package {
           inherit pkgs;
           colors =
             import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };

generators/aws/default.nix

@@ -15,16 +15,16 @@ nixos-generators.nixosGenerate {
       gitEmail = globals.gitEmail;
       networking.hostName = "sheep";
       gui.enable = false;
-      colorscheme = (import ../modules/colorscheme/gruvbox);
+      colorscheme = (import ../colorscheme/gruvbox);
       passwordHash = null;
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
       # AWS settings require this
       permitRootLogin = "prohibit-password";
     }
-    ../../hosts/common.nix
+    ../../modules/common
     ../../modules/nixos
-    ../../modules/services/sshd.nix
+    ../../modules/common/services/sshd.nix
   ] ++ [
     # Required to fix diskSize errors during build
     ({ ... }: { amazonImage.sizeMB = 16 * 1024; })

hosts/flame/default.nix

@@ -13,8 +13,8 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ../../modules
-    ../../nixos
+    ../../modules/common
+    ../../modules/nixos
     (removeAttrs globals [ "mail.server" ])
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/hydra/default.nix

@@ -9,8 +9,8 @@ nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
-    ../../modules
-    ../../nixos
+    ../../modules/common
+    ../../modules/nixos
     globals
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/lookingglass/default.nix

@@ -9,8 +9,8 @@ darwin.lib.darwinSystem {
   system = "x86_64-darwin";
   specialArgs = { };
   modules = [
-    ../../modules
-    ../../darwin
+    ../../modules/common
+    ../../modules/darwin
     (globals // {
       user = "Noah.Masur";
       gitName = "Noah-Masur_1701";

hosts/swan/default.nix

@@ -10,8 +10,8 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ../../modules
-    ../../nixos
+    ../../modules/common
+    ../../modules/nixos
     (removeAttrs globals [ "mail.server" ])
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/tempest/default.nix

@@ -10,8 +10,8 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ../../modules
-    ../../nixos
+    ../../modules/common
+    ../../modules/nixos
     globals
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

modules/common/neovim/package/default.nix

@@ -13,16 +13,16 @@
 # in pkgs.neovimBuilder {
 #   package = pkgs.neovim-unwrapped;
 #   imports = [
-#     ./modules/neovim/plugins/bufferline.nix
-#     ./modules/neovim/plugins/completion.nix
-#     ./modules/neovim/plugins/gitsigns.nix
-#     ./modules/neovim/plugins/lsp.nix
-#     ./modules/neovim/plugins/misc.nix
-#     ./modules/neovim/plugins/statusline.nix
-#     ./modules/neovim/plugins/syntax.nix
-#     ./modules/neovim/plugins/telescope.nix
-#     ./modules/neovim/plugins/toggleterm.nix
-#     ./modules/neovim/plugins/tree.nix
+#     ./modules/common/neovim/plugins/bufferline.nix
+#     ./modules/common/neovim/plugins/completion.nix
+#     ./modules/common/neovim/plugins/gitsigns.nix
+#     ./modules/common/neovim/plugins/lsp.nix
+#     ./modules/common/neovim/plugins/misc.nix
+#     ./modules/common/neovim/plugins/statusline.nix
+#     ./modules/common/neovim/plugins/syntax.nix
+#     ./modules/common/neovim/plugins/telescope.nix
+#     ./modules/common/neovim/plugins/toggleterm.nix
+#     ./modules/common/neovim/plugins/tree.nix
 #   ] ++ extraConfig;
 # }