refactor

hosts/yodaTab/configuration.nix

@@ -3,15 +3,22 @@
 # 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;
+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.
+    [
+      # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./home-manager.nix
+
+      (import "${home-manager}/nixos")
+      ../../modules/home-manager.nix
+
       ../../modules/base.nix
       ../../modules/programs.nix
       ../../modules/autostart.nix
@@ -19,6 +26,14 @@
       ../../modules/print-and-scan.nix
       #../../modules/fde-ssh-unlock.nix
       ../../modules/nextcloud-integration.nix
+
+      ../../modules/gnome-config.nix
+      ../../modules/gnome-extensions.nix
+      #../../modules/gnome-fractional-scaling.nix
+      ../../modules/git.nix
+      ../../modules/zsh.nix
+      ../../modules/nitrokey-ssh-gpg.nix
+      ../../modules/thunderbird.nix
     ];
 
   networking.hostName = "yodaTab";

hosts/yodaTab/home-manager.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-let
-  # Import Home Manager with niv.
-  home-manager = (import ../../nix/sources.nix).home-manager;
-in
-{
-  imports = [
-    (import "${home-manager}/nixos")
-    ../../modules/home-manager.nix
-    ../../modules/gnome-config.home.nix
-    ../../modules/gnome-extensions.home.nix
-    #../../modules/gnome-fractional-scaling.home.nix
-    ../../modules/git.nix
-    ../../modules/zsh.home.nix
-    ../../modules/nitrokey-ssh-gpg.home.nix
-    ../../modules/thunderbird.home.nix
-  ];
-}

hosts/yodaTux/configuration.nix

@@ -3,15 +3,22 @@
 # 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;
+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.
+    [
+      # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./home-manager.nix
+
+      (import "${home-manager}/nixos")
+      ../../modules/home-manager.nix
+
       ../../modules/base.nix
       ../../modules/programs.nix
       ../../modules/autostart.nix
@@ -19,6 +26,14 @@
       ../../modules/print-and-scan.nix
       ../../modules/fde-ssh-unlock.nix
       ../../modules/nextcloud-integration.nix
+
+      ../../modules/gnome-config.nix
+      ../../modules/gnome-extensions.nix
+      ../../modules/gnome-fractional-scaling.nix
+      ../../modules/git.nix
+      ../../modules/zsh.nix
+      ../../modules/nitrokey-ssh-gpg.nix
+      ../../modules/thunderbird.nix
     ];
 
   networking.hostName = "yodaTux";

hosts/yodaTux/home-manager.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-let
-  # Import Home Manager with niv.
-  home-manager = (import ../../nix/sources.nix).home-manager;
-in
-{
-  imports = [
-    (import "${home-manager}/nixos")
-    ../../modules/home-manager.nix
-    ../../modules/gnome-config.home.nix
-    ../../modules/gnome-extensions.home.nix
-    ../../modules/gnome-fractional-scaling.home.nix
-    ../../modules/git.nix
-    ../../modules/zsh.home.nix
-    ../../modules/nitrokey-ssh-gpg.home.nix
-    ../../modules/thunderbird.home.nix
-  ];
-}