diff --git a/flake.nix b/flake.nix
index 68607e9..ce5a76d 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 0e5b5b3..4847c23 100755
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -3,9 +3,11 @@
   inputs,
   self,
   ...
-}: {
+}:
+{
   flake.lib = {
-    mkHome = modules: system:
+    mkHome =
+      modules: system:
       inputs.home-manager.lib.homeManagerConfiguration {
         pkgs = import inputs.nixpkgs {
           inherit
@@ -22,7 +24,8 @@
           modules
           ;
       };
-    mkLinuxSystem = modules:
+    mkLinuxSystem =
+      modules:
       inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {
           flake = {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 8cc1307..1dbd48a 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,9 +170,8 @@ in
             scrcpy
             bitwarden
             emote
-            desktop
-            hypr
-            wayland
+            # 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 c342831..4ca9e05 100755
--- a/modules/home/gui/apps/emulators/ghostty/config/settings.nix
+++ b/modules/home/gui/apps/emulators/ghostty/config/settings.nix
@@ -1,16 +1,17 @@
 {
   flake,
+  osConfig,
   pkgs,
   ...
 }:
 let
-  inherit (flake.config.aesthetics.themes)
-    fonts
-    ;
+  inherit (flake.config.aesthetics.themes) fonts;
+  inherit (flake.config.machines.devices) deimos;
+  hostname = osConfig.networking.hostName;
 in
 {
   confirm-close-surface = false;
-  window-decoration = false;
+  window-decoration = if hostname == deimos.name then true else 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 42d27b5..e1f8e20 100755
--- a/modules/home/gui/apps/emulators/ghostty/default.nix
+++ b/modules/home/gui/apps/emulators/ghostty/default.nix
@@ -2,11 +2,19 @@
   config,
   flake,
   pkgs,
+  osConfig,
   ...
 }:
 let
   configPath = ./config;
-  settingsPath = import (configPath + /settings.nix) { inherit flake pkgs; };
+  settingsPath = import (configPath + /settings.nix) {
+    inherit
+      flake
+      config
+      osConfig
+      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 4534d4a..2b0cc03 100755
--- a/modules/nixos/core/doas/default.nix
+++ b/modules/nixos/core/doas/default.nix
@@ -27,13 +27,16 @@ let
         ceres
       ]
     then
-      user0
+      [
+        user0
+        user1
+      ]
     else if hostname == charon then
-      user1
+      [ user1 ]
     else if hostname == venus then
-      user2
+      [ user2 ]
     else
-      "";
+      [ ];
 in
 {
   security = {
@@ -43,9 +46,7 @@ in
         {
           keepEnv = true;
           noPass = true;
-          users = [
-            userLogic
-          ];
+          users = userLogic;
         }
       ];
     };
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index db5df92..cd5ae03 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 410c748..6fa2898 100755
--- a/modules/nixos/desktop/xserver/default.nix
+++ b/modules/nixos/desktop/xserver/default.nix
@@ -10,11 +10,14 @@
     libinput = {
       enable = true;
       touchpad = {
-        tapping = true;
-        naturalScrolling = false;
+        scrollMethod = "twofinger";
+        naturalScrolling = true;
+        middleEmulation = true;
+        accelSpeed = "5";
+        accelProfile = "adaptive";
+        disableWhileTyping = true;
       };
       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 c6d06a1..655e030 100755
--- a/modules/nixos/hardware/bluetooth/default.nix
+++ b/modules/nixos/hardware/bluetooth/default.nix
@@ -1,8 +1,13 @@
 {
   pkgs,
+  config,
+  flake,
   ...
 }:
-
+let
+  inherit (flake.config.machines) devices;
+  hostname = config.networking.hostName;
+in
 {
   hardware = {
     bluetooth = {
@@ -20,5 +25,5 @@
       ];
     };
   };
-  services.blueman.enable = true;
+  services.blueman.enable = if hostname == devices.deimos.name then false else true;
 }