7 files changed, 16 insertions, 16 deletions
diff --git a/hosts/ahmed/configuration.nix b/hosts/ahmed/configuration.nix
index f3a7981..1da2dd8 100644
--- a/hosts/ahmed/configuration.nix
+++ b/hosts/ahmed/configuration.nix
@@ -9,9 +9,9 @@
     ./hardware-configuration.nix
 
     ../../shared/nixos/cloudflare-proxy
-    ../../shared/nixos/common-nix-settings
-    ../../shared/nixos/common-shell-settings
-    ../../shared/nixos/common-hm-settings
+    ../../shared/nixos-and-darwin/common-nix-settings
+    ../../shared/nixos-and-darwin/common-shell-settings
+    ../../shared/nixos-and-darwin/common-hm-settings
 
     ./duksebot
     ./git.linus.onl
diff --git a/hosts/muhammed/configuration.nix b/hosts/muhammed/configuration.nix
index 0943fef..9c0bef2 100644
--- a/hosts/muhammed/configuration.nix
+++ b/hosts/muhammed/configuration.nix
@@ -5,9 +5,9 @@
   ...
 }: {
   imports = [
-    ../../shared/nixos/common-shell-settings
-    ../../shared/nixos/common-nix-settings
-    ../../shared/nixos/common-hm-settings
+    ../../shared/nixos-and-darwin/common-shell-settings
+    ../../shared/nixos-and-darwin/common-nix-settings
+    ../../shared/nixos-and-darwin/common-hm-settings
 
     ./remote-builders
   ];
diff --git a/hosts/omar/configuration.nix b/hosts/omar/configuration.nix
index 9248c3c..681a199 100644
--- a/hosts/omar/configuration.nix
+++ b/hosts/omar/configuration.nix
@@ -8,9 +8,9 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
 
-    ../../shared/nixos/common-nix-settings
-    ../../shared/nixos/common-shell-settings
-    ../../shared/nixos/common-hm-settings
+    ../../shared/nixos-and-darwin/common-nix-settings
+    ../../shared/nixos-and-darwin/common-shell-settings
+    ../../shared/nixos-and-darwin/common-hm-settings
     ../../shared/nixos/zfs-impermenance
   ];
 
diff --git a/overlays/compat.nix b/overlays/compat.nix
index 0f7aeb4..6482509 100644
--- a/overlays/compat.nix
+++ b/overlays/compat.nix
@@ -1,7 +1,7 @@
 # Returns a list of overlays such that this file can be used for the value of
 # nixpkgs-overlays in NIX_PATH.
 #
-# See: shared/nixos/common-nix-options/
+# See: shared/nixos-and-darwin/common-nix-options/
 # See: https://nixos.org/manual/nixpkgs/stable/#sec-overlays-lookup
 [
   (import ./additions.nix)
diff --git a/shared/nixos/common-hm-settings/default.nix b/shared/nixos-and-darwin/common-hm-settings/default.nix
index 9262f51..4c02005 100644
--- a/shared/nixos/common-hm-settings/default.nix
+++ b/shared/nixos-and-darwin/common-hm-settings/default.nix
@@ -1,8 +1,8 @@
 # This module sets common settings related to home-manager (HM). All hosts that
 # I directly interact with should include this module.
 #
-# NOTE: Even though this lives under `shared/nixos` the configuration in here
-# should also be compatible with nix-darwin!!
+# NOTE: This lives under `shared/nixos-and-darwin`. The configuration in here
+# should be compatible with both nixos and nix-darwin!!
 {
   flakeInputs,
   flakeOutputs,
diff --git a/shared/nixos/common-nix-settings/default.nix b/shared/nixos-and-darwin/common-nix-settings/default.nix
index 6a34cac..92e14f3 100644
--- a/shared/nixos/common-nix-settings/default.nix
+++ b/shared/nixos-and-darwin/common-nix-settings/default.nix
@@ -1,8 +1,8 @@
 # This module sets common settings related to Nix such as enabling flakes and
 # using overlays everywhere..
 #
-# NOTE: Even though this lives under `shared/nixos` the configuration in here
-# should also be compatible with nix-darwin!!
+# NOTE: This lives under `shared/nixos-and-darwin`. The configuration in here
+# should be compatible with both nixos and nix-darwin!!
 {
   pkgs,
   lib,
diff --git a/shared/nixos/common-shell-settings/default.nix b/shared/nixos-and-darwin/common-shell-settings/default.nix
index ec71861..982296d 100644
--- a/shared/nixos/common-shell-settings/default.nix
+++ b/shared/nixos-and-darwin/common-shell-settings/default.nix
@@ -1,8 +1,8 @@
 # This module sets options to ensure a consistent Baseline Shell Experince™
 # across the entire fleet. This includes e.g. common utilities and aliases.
 #
-# NOTE: Even though this lives under `shared/nixos` the configuration in here
-# should also be compatible with nix-darwin!!
+# NOTE: This lives under `shared/nixos-and-darwin`. The configuration in here
+# should be compatible with both nixos and nix-darwin!!
 {pkgs, ...}: {
   # Set ZSH as the shell.
   # https://nixos.wiki/wiki/Command_Shell#Changing_default_shelltrue