merge changes from main

3 files changed, 6 insertions, 16 deletions

diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index 80dd198..ea33143 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -1,15 +1,4 @@
-{inputs, ...}: {
-  nix-furnace = {
-    extraHomeModules = [
-      ./home.nix
-    ];
-
-    extraSystemModules = [
-      ./system.nix
-      inputs.hjem.nixosModules.default
-    ];
-  };
-
+{
   collinux = {
     theme = "adwaita";
 
@@ -21,6 +10,8 @@
     desktop = {
       gnome.enable = true;
 
+      gdm.enable = true;
+
       programs = {
         firefox.enable = true;
         blackbox.enable = true;
diff --git a/hosts/jupiter/home.nix b/hosts/jupiter/hjem.nix
index 137c74a..33d260a 100644
--- a/hosts/jupiter/home.nix
+++ b/hosts/jupiter/hjem.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
-  home.preferXdgDirectories = true;
-  home.packages = with pkgs; [
+  packages = with pkgs; [
     orca-slicer
     freecad-wayland
     gimp
@@ -8,6 +7,4 @@
     bottles
     musescore
   ];
-
-  home.stateVersion = "25.05";
 }
diff --git a/hosts/jupiter/system.nix b/hosts/jupiter/nixos.nix
index b82f70a..268b2bc 100644
--- a/hosts/jupiter/system.nix
+++ b/hosts/jupiter/nixos.nix
@@ -25,4 +25,6 @@
   fonts.packages = [pkgs.nerd-fonts.iosevka];
 
   system.stateVersion = "25.05";
+
+  nixpkgs.hostPlatform = "x86_64-linux";
 }