4 files changed, 40 insertions, 50 deletions
diff --git a/home/live-user.nix b/home/live-user.nix
deleted file mode 100644
index f7ece2a..0000000
--- a/home/live-user.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [ ../home-modules ];
-
-  homeapps = { 
-    nvim.enable = true; 
-    nvim.lsp = false;
-
-    presets = {
-      browser.enable = true;
-      utils.enable = true;
-    };
-  };
-
-  home.username = "live-user";
-  home.homeDirectory = "/home/live-user";
-  home.stateVersion = "24.11";
-  programs.home-manager.enable = true;
-}
diff --git a/home/wilkuu.nix b/home/wilkuu.nix
deleted file mode 100644
index 1e744cd..0000000
--- a/home/wilkuu.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  config,
-  pkgs,
-  hostconfig,
-  ...
-}:
-{
-  imports = [ ../home-modules ];
-
-  homeapps.presets.full.enable = true;
-  # homeapps.vnc = true;
-
-  services.wayvnc = {
-    enable = true;
-    autoStart = false;
-    settings = {
-      # Todo, bind to vpn and LAN explicitly somehow
-      address = "0.0.0.0";
-      port = 5900;
-    };
-  };
-
-  homesv.vdirsyncer.enable = true;
-
-  home.username = "wilkuu";
-  home.homeDirectory = "/home/wilkuu";
-  home.stateVersion = "24.11";
-  programs.home-manager.enable = true;
-}
diff --git a/users/live-user.nix b/users/live-user.nix
index ec5074e..d5e9d2c 100644
--- a/users/live-user.nix
+++ b/users/live-user.nix
@@ -22,6 +22,22 @@
     ];
   };
 
-  home-manager.users.live-user.imports = [ ../home/live-user.nix ];
+  home-manager.users.live-user = {
+    imports = [ ../home-modules ];
 
+    homeapps = { 
+      nvim.enable = true; 
+      nvim.lsp = false;
+
+      presets = {
+        browser.enable = true;
+        utils.enable = true;
+      };
+    };
+
+    home.username = "live-user";
+    home.homeDirectory = "/home/live-user";
+    home.stateVersion = "24.11";
+    programs.home-manager.enable = true;
+  };
 }
diff --git a/users/wilkuu.nix b/users/wilkuu.nix
index e5404ae..63d6c88 100644
--- a/users/wilkuu.nix
+++ b/users/wilkuu.nix
@@ -27,6 +27,28 @@
     ];
   };
 
-  home-manager.users.wilkuu.imports = [ ../home/wilkuu.nix ];
+  home-manager.users.wilkuu = {
+    imports = [ ../home-modules ];
+
+    homeapps.presets.full.enable = true;
+    # homeapps.vnc = true;
+
+    services.wayvnc = {
+      enable = true;
+      autoStart = false;
+      settings = {
+        # Todo, bind to vpn and LAN explicitly somehow
+        address = "0.0.0.0";
+        port = 5900;
+      };
+    };
+
+    homesv.vdirsyncer.enable = true;
+
+    home.username = "wilkuu";
+    home.homeDirectory = "/home/wilkuu";
+    home.stateVersion = "24.11";
+    programs.home-manager.enable = true;
+  }; 
 
 }