From 8968c1c83e88e01ccb0c2e39f5b713e03a7c1ec1 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Mon, 24 Mar 2025 10:58:27 +0100
Subject: [PATCH] feat: move variables into user module

---
 modules/core/default.nix        | 3 +--
 modules/core/default.server.nix | 3 +--
 modules/core/user.nix           | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index d776c75..6f160d3 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,8 +1,7 @@
 { ... }:
 {
   imports =
-       [(import ./../../variables.nix)] # Does not really fit here but I have no clue where else
-    ++ [(import ./docker.nix)]
+       [(import ./docker.nix)]
     ++ [(import ./hardware.nix)]
     ++ [(import ./displaylink.nix)]
     # ++ [(import ./printing.nix)]
diff --git a/modules/core/default.server.nix b/modules/core/default.server.nix
index 72a0f86..118f8a3 100644
--- a/modules/core/default.server.nix
+++ b/modules/core/default.server.nix
@@ -1,8 +1,7 @@
 { ... }:
 {
   imports =
-       [(import ./../../variables.nix)]
-    ++ [(import ./hardware.nix)]
+       [(import ./hardware.nix)]
     ++ [(import ./network.nix)]
     ++ [(import ./program.nix)]
     ++ [(import ./sshd.nix)]
diff --git a/modules/core/user.nix b/modules/core/user.nix
index c2d0f06..fa4a29b 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -1,6 +1,6 @@
 { pkgs, inputs, config, username, host, ...}:
 {
-  imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ];
+  imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ] ++ [./../../variables.nix];
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;