refactor

hosts/yodaNas/configuration.nix

@@ -3,27 +3,13 @@
 # and in the NixOS manual (accessible by running `nixos-help`).
 
 { config, pkgs, ... }:
-let
-  # Import Home Manager with niv.
-  home-manager = (import ../../nix/sources.nix).home-manager;
-  #home-manager-source = import (import ../../nix/sources.nix).home-manager {};
-in
 {
-  # Paths to other modules.
-  # Compose this module out of smaller ones.
-  # https://nixos.wiki/wiki/NixOS_modules
   imports =
     [
-      # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      # Home Manager.
-      (import "${home-manager}/nixos")
-      #home-manager-source.nixos
-      ../../modules/home-manager.nix
-      # NUR.
-      ../../modules/nur.nix
       ./host-specific.nix
-
+      ../../modules/home-manager.nix
+      ../../modules/nur.nix
       ../../modules/base.nix
       ../../modules/headless.nix
 

hosts/yodaTab/configuration.nix

@@ -3,26 +3,12 @@
 # and in the NixOS manual (accessible by running `nixos-help`).
 
 { config, pkgs, ... }:
-let
-  # Import Home Manager with niv.
-  home-manager = (import ../../nix/sources.nix).home-manager;
-  #home-manager-source = import (import ../../nix/sources.nix).home-manager {};
-in
 {
-  # Paths to other modules.
-  # Compose this module out of smaller ones.
-  # https://nixos.wiki/wiki/NixOS_modules
   imports =
     [
-      # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      # Home Manager.
-      (import "${home-manager}/nixos")
-      #home-manager-source.nixos
       ../../modules/home-manager.nix
-      # NUR.
       ../../modules/nur.nix
-
       ../../modules/base.nix
       #../../modules/headless.nix
 

hosts/yodaTux/configuration.nix

@@ -3,26 +3,12 @@
 # and in the NixOS manual (accessible by running `nixos-help`).
 
 { config, pkgs, ... }:
-let
-  # Import Home Manager with niv.
-  home-manager = (import ../../nix/sources.nix).home-manager;
-  #home-manager-source = import (import ../../nix/sources.nix).home-manager {};
-in
 {
-  # Paths to other modules.
-  # Compose this module out of smaller ones.
-  # https://nixos.wiki/wiki/NixOS_modules
   imports =
     [
-      # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      # Home Manager.
-      (import "${home-manager}/nixos")
-      #home-manager-source.nixos
       ../../modules/home-manager.nix
-      # NUR.
       ../../modules/nur.nix
-
       ../../modules/base.nix
       #../../modules/headless.nix
 

hosts/yodaYoga/configuration.nix

@@ -3,27 +3,13 @@
 # and in the NixOS manual (accessible by running `nixos-help`).
 
 { config, pkgs, ... }:
-let
-  # Import Home Manager with niv.
-  home-manager = (import ../../nix/sources.nix).home-manager;
-  #home-manager-source = import (import ../../nix/sources.nix).home-manager {};
-in
 {
-  # Paths to other modules.
-  # Compose this module out of smaller ones.
-  # https://nixos.wiki/wiki/NixOS_modules
   imports =
     [
-      # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      # Home Manager.
-      (import "${home-manager}/nixos")
-      #home-manager-source.nixos
-      ../../modules/home-manager.nix
-      # NUR.
-      ../../modules/nur.nix
       ./host-specific.nix
-
+      ../../modules/home-manager.nix
+      ../../modules/nur.nix
       ../../modules/base.nix
       ../../modules/headless.nix
 

modules/home-manager.nix

@@ -1,6 +1,16 @@
 { config, pkgs, ... }:
-
+let
+  # Import Home Manager with niv.
+  home-manager = (import ../nix/sources.nix).home-manager;
+  #home-manager-source = import (import ../nix/sources.nix).home-manager {};
+in
 {
+  imports = [
+    # Home Manager.
+    (import "${home-manager}/nixos")
+    #home-manager-source.nixos
+  ];
+
   # This option may become the default value in the future.
   # https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module
   home-manager.useUserPackages = true;