diff --git a/home/default.nix b/home/default.nix
index 64d354b..c6284a8 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -21,12 +21,16 @@
     settings.user.email = "me@syedm.dev";
   };
 
-  home.file.".xinitrc" = {
-    text = ''
-      exec dbus-run-session -- kutu.rb
-    '';
-    executable = true;
+  xsession = {
+    enable = true;
+    windowManager.command = "kutu.rb";
   };
 
+  home.file.".xinitrc".text = ''
+    if [ -f ~/.xsession ]; then
+      exec ~/.xsession
+    fi
+  '';
+
   home.stateVersion = "26.05";
 }
diff --git a/home/kitty/default.nix b/home/kitty/default.nix
index dcb3132..a69ebd9 100644
--- a/home/kitty/default.nix
+++ b/home/kitty/default.nix
@@ -4,13 +4,20 @@
   programs.kitty = {
     enable = true;
 
-    shellIntegration.enableFishIntegration = true;
+    shellIntegration = {
+      enableFishIntegration = true;
+      mode = "no-cursor";
+    };
 
     font = {
       name = "Agave Nerd Font";
       size = 13;
     };
 
+    environment = {
+      KITTY_STR = "1";
+    };
+
     settings = {
       bold_font = "Agave Nerd Font Bold";
       # italic_font = "Operator Mono Lig";
@@ -19,16 +26,15 @@
 
       cursor_shape = "block";
       cursor_blink_interval = 0;
-      shell_integration = "no-cursor";
 
       underline_position = "+3";
       underline_thickness = "150%";
 
+      window_margin_width = 8;
+
       allow_remote_control = "yes";
       listen_on = "unix:/tmp/mykitty";
 
-      startup_session = "${./startup}";
-
       foreground = "#CDD6F4";
       background = "#080014";
       selection_foreground = "#080014";
diff --git a/home/kitty/startup b/home/kitty/startup
deleted file mode 100644
index cceaeae..0000000
--- a/home/kitty/startup
+++ /dev/null
@@ -1,3 +0,0 @@
-# Run the command on new Kitty window creation
-
-launch env KITTY_STR=1 fish
diff --git a/hosts/common.nix b/hosts/common.nix
index 25233c2..d64cf49 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -9,6 +9,7 @@
   nixpkgs.config.allowUnfree = true;
 
   boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.consoleMode = "max";
   boot.loader.efi.canTouchEfiVariables = true;
 
   nix.settings.experimental-features = [
@@ -36,7 +37,7 @@
   users.users.me = {
     isNormalUser = true;
     shell = pkgs.fish;
-    extraGroups = [ "wheel" ];
+    extraGroups = [ "wheel" "video" "networkmanager" "input" ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPFh01e9doyInt0980V8T4xaakcSaOyXaxxYE4+oSwM me@syedm # server"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJFUwk54CNtSLUyXSTLsIs5KXgEsjOgE4HGlA4FacKjV me@tardis # msi laptop"
@@ -44,6 +45,8 @@
     ];
   };
 
+  security.sudo.wheelNeedsPassword = false;
+
   services.getty = {
     autologinUser = "me";
     autologinOnce = true;
diff --git a/hosts/tardis/default.nix b/hosts/tardis/default.nix
index 83d5979..8e487ad 100644
--- a/hosts/tardis/default.nix
+++ b/hosts/tardis/default.nix
@@ -10,10 +10,14 @@
     "nouveau"
   ];
 
+  boot.kernelParams = [ "video=efifb:1920x1080" ];
+
   environment.systemPackages = lib.mkAfter (with pkgs; [
     firefox
     xdg-utils
     dmenu
+    pulseaudio
+    brightnessctl
 
     inputs.kutu.packages.${stdenv.hostPlatform.system}.default
   ]);
@@ -36,6 +40,7 @@
   };
 
   services.dbus.enable = true;
+  services.clipmenu.enable = true;
 
   xdg.portal = {
     enable = true;
@@ -44,5 +49,19 @@
     ];
   };
 
+  security.rtkit.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  hardware.pulseaudio.enable = false;
+
+  services.power-profiles-daemon.enable = true;
+
   networking.hostName = "tardis";
 }