4 files changed, 58 insertions, 22 deletions
diff --git a/machines/z/configuration.nix b/machines/x/configuration.nix
index 5af5c58..de93a4f 100644
--- a/machines/z/configuration.nix
+++ b/machines/x/configuration.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, ... }:
+{ lib, inputs, pkgs, ... }:
 
 {
   imports = [
@@ -7,6 +7,13 @@
   ] ++ (map (path: ../../modules/${path}) [
     "global.nix"
     "compromyse.nix"
+    "desktop.nix"
+    "login.nix"
+    "fonts.nix"
+    "bluetooth.nix"
+    "audio.nix"
+    # "virtualization.nix"
+    # "nvidia.nix"
   ]);
 
   boot.loader.systemd-boot.enable = true;
@@ -15,12 +22,17 @@
 
   boot.extraModprobeConfig = "options kvm_intel nested=1";
 
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfreePredicate = _: true;
+
+  hardware.opengl.enable = true;
+
   fileSystems."/data" = {
     device = "/dev/sda";
     fsType = "ext4";
   };
 
-  networking.hostName = "z";
+  networking.hostName = "x";
 
   home-manager.users.compromyse = import ./home.nix;
 }
diff --git a/machines/z/hardware-configuration.nix b/machines/x/hardware-configuration.nix
index aeb8272..aeb8272 100644
--- a/machines/z/hardware-configuration.nix
+++ b/machines/x/hardware-configuration.nix
diff --git a/machines/x/home.nix b/machines/x/home.nix
new file mode 100644
index 0000000..292495c
--- /dev/null
+++ b/machines/x/home.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+
+  home = {
+    username = "compromyse";
+    homeDirectory = "/home/compromyse";
+  };
+
+  home.packages = with pkgs; [
+    wget
+
+    tmux
+    fzf
+    fd
+    ripgrep
+
+    cinnamon.nemo
+    mate.eom
+
+    # spotify
+    # firefox
+
+    # obs-studio
+
+    pavucontrol
+    blueman
+    brillo
+  ];
+
+  imports = (map (path: ../../config/${path}) [
+    "themes.nix"
+    "dotfiles.nix"
+    "git"
+    "nvim"
+    "alacritty"
+    "dwl.nix"
+    "bash.nix"
+    "fuzzel"
+  ]);
+
+  home.stateVersion = "23.11";
+}
diff --git a/machines/z/home.nix b/machines/z/home.nix
deleted file mode 100644
index 564d4d5..0000000
--- a/machines/z/home.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  home = {
-    username = "compromyse";
-    homeDirectory = "/home/compromyse";
-  };
-
-  imports = [
-    ../../config/themes.nix
-    ../../config/alacritty
-  ];
-
-  home.packages = with pkgs; [
-    wget
-  ];
-
-  home.stateVersion = "23.11";
-}