From 2558b356369cac18e84115c80517e0cb928a7149 Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:42:16 +0300
Subject: [PATCH] Use proper home manager setting for home modules

---
 flake.nix                         | 26 +++++++++++++-------------
 machines/enka/ghostty/default.nix |  4 +---
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index c14fb8b..13942a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,7 +160,15 @@
     };
 
     defaultConfiguration = host: with abstractions; systemConfiguration {
-      nix.package = upkgs.nixSuper;
+      boot.tmp.cleanOnBoot = true;
+
+      environment.defaultPackages = [];
+
+      home-manager.sharedModules   = [ ghosttyModule.homeModules.default ];
+      home-manager.useGlobalPkgs   = true;
+      home-manager.useUserPackages = true;
+
+      networking.hostName = host;
 
       nix.gc = {
         automatic  = true;
@@ -169,9 +177,11 @@
         persistent = true;
       };
 
+      nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
+
       nix.optimise.automatic = true;
 
-      nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
+      nix.package = upkgs.nixSuper;
 
       nix.registry = {
         nixpkgs.flake = nixpkgs;
@@ -186,26 +196,16 @@
       ];
 
       nix.settings.trusted-users = [ "root" "@wheel" ];
-
       nix.settings.warn-dirty = false;
 
       nixpkgs.config.allowUnfree = true;
       nixpkgs.overlays           = [ fenix.overlays.default ];
 
       programs.nix-ld = enabled {};
-
-      environment.defaultPackages = [];
-
-      boot.tmp.cleanOnBoot = true;
-
-      networking.hostName = host;
-
-      home-manager.useGlobalPkgs   = true;
-      home-manager.useUserPackages = true;
     };
 
     specialArgs = abstractions // {
-      inherit upkgs ulib theme ghosttyModule;
+      inherit upkgs ulib theme;
     };
 
     importConfigurations = tools.recursiveUpdateMap (host: {
diff --git a/machines/enka/ghostty/default.nix b/machines/enka/ghostty/default.nix
index 2f9b2ea..e0ee245 100644
--- a/machines/enka/ghostty/default.nix
+++ b/machines/enka/ghostty/default.nix
@@ -1,8 +1,6 @@
-{ pkgs, upkgs, theme, homeConfiguration, enabled, ghosttyModule, ... }:
+{ pkgs, upkgs, theme, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
-  imports = [ ghosttyModule.homeModules.default ];
-
   programs.nushell.environmentVariables.TERMINAL = "ghostty";
 
   programs.ghostty = enabled {