From d946fa1e9d0d9e4193a71d3373929d94bc516375 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Sat, 3 Aug 2024 20:08:28 +0200
Subject: [PATCH] Split home from system in host specific user configs

---
 users/seb/@inspiron/default.nix | 15 ++-------------
 users/seb/@inspiron/home.nix    | 11 +++++++++++
 users/seb/@north/default.nix    | 28 ++--------------------------
 users/seb/@north/home.nix       | 23 +++++++++++++++++++++++
 4 files changed, 38 insertions(+), 39 deletions(-)
 create mode 100644 users/seb/@inspiron/home.nix
 create mode 100644 users/seb/@north/home.nix

diff --git a/users/seb/@inspiron/default.nix b/users/seb/@inspiron/default.nix
index 20841ad..6cf0a20 100644
--- a/users/seb/@inspiron/default.nix
+++ b/users/seb/@inspiron/default.nix
@@ -1,19 +1,8 @@
-{ self, ... }:
 {
   imports = [
-    "${self}/users/home-manager.nix"
+    ../../home-manager.nix
     ../user.nix
   ];
 
-  home-manager.users.seb = {
-    imports = [ ../home.nix ];
-
-    home.stateVersion = "23.11";
-    myConfig.theme = "light";
-
-    wayland.windowManager.hyprland.settings.monitor = [
-      "eDP-1,1920x1080@60,0x0,1"
-      ",preferred,auto,1,mirror,eDP-1"
-    ];
-  };
+  home-manager.users.seb = ./home.nix;
 }
diff --git a/users/seb/@inspiron/home.nix b/users/seb/@inspiron/home.nix
new file mode 100644
index 0000000..91d730f
--- /dev/null
+++ b/users/seb/@inspiron/home.nix
@@ -0,0 +1,11 @@
+{
+  imports = [ ../home.nix ];
+
+  home.stateVersion = "23.11";
+  myConfig.theme = "light";
+
+  wayland.windowManager.hyprland.settings.monitor = [
+    "eDP-1,1920x1080@60,0x0,1"
+    ",preferred,auto,1,mirror,eDP-1"
+  ];
+}
diff --git a/users/seb/@north/default.nix b/users/seb/@north/default.nix
index 591ddda..6cf0a20 100644
--- a/users/seb/@north/default.nix
+++ b/users/seb/@north/default.nix
@@ -1,32 +1,8 @@
-{ self, ... }:
 {
   imports = [
-    "${self}/users/home-manager.nix"
+    ../../home-manager.nix
     ../user.nix
   ];
 
-  home-manager.users.seb =
-    { pkgs, ... }:
-    {
-      imports = [ ../home.nix ];
-
-      home.stateVersion = "23.11";
-      myConfig.theme = "dark";
-
-      home.packages = [
-        pkgs.ffmpeg
-        pkgs.obs-studio
-        pkgs.davinci-resolve
-        pkgs.gimp
-      ];
-
-      wayland.windowManager.hyprland.settings = {
-        monitor = [
-          "Unknown-1,disable"
-          "DP-1,2560x1440@144,0x0,1"
-          "HDMI-A-1,2560x1440@60,-1440x-617,1,transform,1"
-        ];
-        workspace = [ "m[HDMI-A-1],layoutopt:orientation:top" ];
-      };
-    };
+  home-manager.users.seb = ./home.nix;
 }
diff --git a/users/seb/@north/home.nix b/users/seb/@north/home.nix
new file mode 100644
index 0000000..09b1a50
--- /dev/null
+++ b/users/seb/@north/home.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  imports = [ ../home.nix ];
+
+  home.stateVersion = "23.11";
+  myConfig.theme = "dark";
+
+  home.packages = [
+    pkgs.ffmpeg
+    pkgs.obs-studio
+    pkgs.davinci-resolve
+    pkgs.gimp
+  ];
+
+  wayland.windowManager.hyprland.settings = {
+    monitor = [
+      "Unknown-1,disable"
+      "DP-1,2560x1440@144,0x0,1"
+      "HDMI-A-1,2560x1440@60,-1440x-617,1,transform,1"
+    ];
+    workspace = [ "m[HDMI-A-1],layoutopt:orientation:top" ];
+  };
+}