diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 460194a..1d2849c 100755 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -1,7 +1,7 @@ { within = { - shell = ./services/shell.nix; - gnome = ./services/gnome.nix; - zed = ./submodules/zed.nix; + shell = import ./services/shell.nix; + gnome = import ./services/gnome.nix; + zed = import ./submodules/zed.nix; }; } diff --git a/modules/apps/services/gnome.nix b/modules/apps/services/gnome.nix index 7f71b73..0c4d407 100644 --- a/modules/apps/services/gnome.nix +++ b/modules/apps/services/gnome.nix @@ -1,4 +1,4 @@ { - shell = ../submodules/gnome-shell.nix; - apps = ../submodules/gnome-apps.nix; + shell = import ../submodules/gnome-shell.nix; + apps = import ../submodules/gnome-apps.nix; } diff --git a/modules/apps/services/shell.nix b/modules/apps/services/shell.nix index b46679d..ab8acd9 100644 --- a/modules/apps/services/shell.nix +++ b/modules/apps/services/shell.nix @@ -1,6 +1,6 @@ { - zsh = ../submodules/zsh.nix; - nh = ../submodules/nh.nix; - git = ../submodules/git.nix; - docker = ../submodules/docker.nix; + zsh = import ../submodules/zsh.nix; + nh = import ../submodules/nh.nix; + git = import ../submodules/git.nix; + docker = import ../submodules/docker.nix; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index dac45c0..f98da38 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,9 +1,9 @@ { within = { - boot = ./services/boot.nix; - graphics = ./services/graphics.nix; - networks = ./services/networks.nix; - audio = ./services/audio.nix; - keyboard = ./services/keyboard.nix; + boot = import ./services/boot.nix; + graphics = import ./services/graphics.nix; + networks = import ./services/networks.nix; + audio = import ./services/audio.nix; + keyboard = import ./services/keyboard.nix; }; } diff --git a/modules/nixos/services/audio.nix b/modules/nixos/services/audio.nix index c4bc690..c2676e1 100644 --- a/modules/nixos/services/audio.nix +++ b/modules/nixos/services/audio.nix @@ -1,3 +1,3 @@ { - pipewire = ../submodules/pipewire.nix; + pipewire = import ../submodules/pipewire.nix; } diff --git a/modules/nixos/services/boot.nix b/modules/nixos/services/boot.nix index 5df2f3a..0dd5d16 100644 --- a/modules/nixos/services/boot.nix +++ b/modules/nixos/services/boot.nix @@ -1,4 +1,4 @@ { - systemd = ../submodules/systemd-boot.nix; + systemd = import ../submodules/systemd-boot.nix; plymouth = ../submodules/plymouth.nix; } diff --git a/modules/nixos/services/graphics.nix b/modules/nixos/services/graphics.nix index 38092b9..c20ff3a 100644 --- a/modules/nixos/services/graphics.nix +++ b/modules/nixos/services/graphics.nix @@ -1,6 +1,6 @@ { nvidia = { - base = ../submodules/nvidia.nix; - prime = ../submodules/nvidia-prime.nix; + base = import ../submodules/nvidia.nix; + prime = import ../submodules/nvidia-prime.nix; }; } diff --git a/modules/nixos/services/keyboard.nix b/modules/nixos/services/keyboard.nix index 4d248fb..941f4da 100644 --- a/modules/nixos/services/keyboard.nix +++ b/modules/nixos/services/keyboard.nix @@ -1,3 +1,3 @@ { - apple = ../submodules/keyboard-apple.nix; + apple = import ../submodules/keyboard-apple.nix; } diff --git a/modules/nixos/services/networks.nix b/modules/nixos/services/networks.nix index fa58c56..e8bcc24 100755 --- a/modules/nixos/services/networks.nix +++ b/modules/nixos/services/networks.nix @@ -1,4 +1,4 @@ { - dns = ../submodules/dns.nix; - manager = ../submodules/manager.nix; + dns = import ../submodules/dns.nix; + manager = import ../submodules/manager.nix; }