fix: Make chocolatebar work with the new config

.gitignore

@@ -3,12 +3,12 @@ up
 hosts/up-*
 .direnv
 doc/index.html
-<<<<<<< HEAD
-tags
-=======
 
 # Result of flk commands
 vm
 iso
 doi
->>>>>>> devos/core
+
+# PubSolarOS
+tags
+/owners

hosts/chocolatebar.nix

@@ -1,6 +0,0 @@
-{ suites, ... }:
-{
-  imports = [
-    ./chocolatebar
-  ] ++ suites.chocolatebar;
-}

hosts/chocolatebar/base.nix

@@ -0,0 +1,31 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  psCfg = config.pub-solar;
+  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
+in
+{
+  imports = [
+    ./configuration.nix
+    ./virtualisation
+  ];
+
+  config = {
+    pub-solar.x-os.keyfile = "/etc/nixos/hosts/chocolatebar/secrets/keyfile.bin";
+
+    pub-solar.virtualisation.isolateGPU = "rx550x";
+
+    hardware.cpu.amd.updateMicrocode = true;
+
+    hardware.opengl.extraPackages = with pkgs; [
+      rocm-opencl-icd
+      rocm-opencl-runtime
+    ];
+
+    home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
+      "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
+      "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
+      "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
+    };
+  };
+}

hosts/chocolatebar/default.nix

@@ -1,31 +1,6 @@
-{ config, pkgs, lib, ... }:
+{ suites, ... }:
-with lib;
-let
-  psCfg = config.pub-solar;
-  xdg = config.home-manager.users."${psCfg.user.name}".xdg;
-in
 {
   imports = [
-    ./configuration.nix
+    ./base.nix
-    ./virtualisation
+  ] ++ suites.chocolatebar;
-  ];
-
-  config = {
-    pub-solar.x-os.keyfile = "/etc/nixos/hosts/chocolatebar/secrets/keyfile.bin";
-
-    pub-solar.virtualisation.isolateGPU = "rx550x";
-
-    hardware.cpu.amd.updateMicrocode = true;
-
-    hardware.opengl.extraPackages = with pkgs; [
-      rocm-opencl-icd
-      rocm-opencl-runtime
-    ];
-
-    home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
-      "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
-      "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf;
-      "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
-    };
-  };
 }