diff --git a/flake.nix b/flake.nix
index ce5a76d..68607e9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -98,7 +98,7 @@
             deimos = inputs.self.lib.mkLinuxSystem [
               ./systems/deimos
               ./profiles/user0
-              ./profiles/user1
+              # ./profiles/user1
               config.nixosModules.deimos
               config.nixosModules.core
               config.nixosModules.mantle
diff --git a/lib/default.nix b/lib/default.nix
index 4847c23..0e5b5b3 100755
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -3,11 +3,9 @@
   inputs,
   self,
   ...
-}:
-{
+}: {
   flake.lib = {
-    mkHome =
-      modules: system:
+    mkHome = modules: system:
       inputs.home-manager.lib.homeManagerConfiguration {
         pkgs = import inputs.nixpkgs {
           inherit
@@ -24,8 +22,7 @@
           modules
           ;
       };
-    mkLinuxSystem =
-      modules:
+    mkLinuxSystem = modules:
       inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {
           flake = {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 1dbd48a..8cc1307 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -145,8 +145,8 @@ in
             systemMonitor
             usbImager
             virtManager
-            # hypr
-            # wayland
+            hypr
+            wayland
             theming
             polychromatic
             dolphin
@@ -170,8 +170,9 @@ in
             scrcpy
             bitwarden
             emote
-            # hypr
-            # wayland
+            desktop
+            hypr
+            wayland
             theming
             ;
         };
diff --git a/modules/home/gui/apps/emulators/ghostty/config/settings.nix b/modules/home/gui/apps/emulators/ghostty/config/settings.nix
index 4ca9e05..c342831 100755
--- a/modules/home/gui/apps/emulators/ghostty/config/settings.nix
+++ b/modules/home/gui/apps/emulators/ghostty/config/settings.nix
@@ -1,17 +1,16 @@
 {
   flake,
-  osConfig,
   pkgs,
   ...
 }:
 let
-  inherit (flake.config.aesthetics.themes) fonts;
-  inherit (flake.config.machines.devices) deimos;
-  hostname = osConfig.networking.hostName;
+  inherit (flake.config.aesthetics.themes)
+    fonts
+    ;
 in
 {
   confirm-close-surface = false;
-  window-decoration = if hostname == deimos.name then true else false;
+  window-decoration = false;
   font-size = fonts.sizes.terminal.size0;
   font-family = fonts.names.name0;
   window-padding-x = 10;
diff --git a/modules/home/gui/apps/emulators/ghostty/default.nix b/modules/home/gui/apps/emulators/ghostty/default.nix
index e1f8e20..42d27b5 100755
--- a/modules/home/gui/apps/emulators/ghostty/default.nix
+++ b/modules/home/gui/apps/emulators/ghostty/default.nix
@@ -2,19 +2,11 @@
   config,
   flake,
   pkgs,
-  osConfig,
   ...
 }:
 let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) {
-    inherit
-      flake
-      config
-      osConfig
-      pkgs
-      ;
-  };
+  settingsPath = import (configPath + /settings.nix) { inherit flake pkgs; };
   themesPath = import (configPath + /themes.nix) { inherit config flake; };
 in
 {
diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix
index 2b0cc03..4534d4a 100755
--- a/modules/nixos/core/doas/default.nix
+++ b/modules/nixos/core/doas/default.nix
@@ -27,16 +27,13 @@ let
         ceres
       ]
     then
-      [
-        user0
-        user1
-      ]
+      user0
     else if hostname == charon then
-      [ user1 ]
+      user1
     else if hostname == venus then
-      [ user2 ]
+      user2
     else
-      [ ];
+      "";
 in
 {
   security = {
@@ -46,7 +43,9 @@ in
         {
           keepEnv = true;
           noPass = true;
-          users = userLogic;
+          users = [
+            userLogic
+          ];
         }
       ];
     };
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index cd5ae03..db5df92 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -32,10 +32,10 @@ in
     deimos = {
       imports = builtins.attrValues {
         inherit (modules)
-          # hypr
-          # wayland
-          plasma
-          sddm
+          hypr
+          wayland
+          # plasma
+          # sddm
           flatpak
           xserver
           ;
diff --git a/modules/nixos/desktop/xserver/default.nix b/modules/nixos/desktop/xserver/default.nix
index 6fa2898..410c748 100755
--- a/modules/nixos/desktop/xserver/default.nix
+++ b/modules/nixos/desktop/xserver/default.nix
@@ -10,14 +10,11 @@
     libinput = {
       enable = true;
       touchpad = {
-        scrollMethod = "twofinger";
-        naturalScrolling = true;
-        middleEmulation = true;
-        accelSpeed = "5";
-        accelProfile = "adaptive";
-        disableWhileTyping = true;
+        tapping = true;
+        naturalScrolling = false;
       };
       mouse.accelProfile = "flat";
+      touchpad.accelProfile = "flat";
     };
   };
   console.useXkbConfig = true;
diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix
index 655e030..c6d06a1 100755
--- a/modules/nixos/hardware/bluetooth/default.nix
+++ b/modules/nixos/hardware/bluetooth/default.nix
@@ -1,13 +1,8 @@
 {
   pkgs,
-  config,
-  flake,
   ...
 }:
-let
-  inherit (flake.config.machines) devices;
-  hostname = config.networking.hostName;
-in
+
 {
   hardware = {
     bluetooth = {
@@ -25,5 +20,5 @@ in
       ];
     };
   };
-  services.blueman.enable = if hostname == devices.deimos.name then false else true;
+  services.blueman.enable = true;
 }