diff --git a/configs/hypr-desktop/hyprland.conf b/configs/hypr-desktop/hyprland.conf
index 604e0b6..c1d929e 100644
--- a/configs/hypr-desktop/hyprland.conf
+++ b/configs/hypr-desktop/hyprland.conf
@@ -16,7 +16,7 @@ env=HYPRCURSOR_SIZE,24
 env=XDG_CURRENT_DESKTOP,Hyprland
 env=XDG_SESSION_TYPE,wayland
 env=XDG_SESSION_DESKTOP,Hyprland
-env=QT_QPA_PLATFORM,Hyprland
+env=QT_QPA_PLATFORM,wayland
 env=XCURSOR_THEME,Bibata-Modern-Ice
 env=XCURSOR_SIZE,24
 
diff --git a/configs/hypr/hyprlock.conf b/configs/hypr/hyprlock.conf
index 7451a92..5ef053f 100644
--- a/configs/hypr/hyprlock.conf
+++ b/configs/hypr/hyprlock.conf
@@ -1,7 +1,7 @@
 background {
   blur_passes=2
   blur_size=8
-  path=$HOME/pictures/.wallpapers/green-forest.png
+  path=$HOME/pictures/.wallpapers/frieren-flowers.jpg
 }
 
 general {
diff --git a/configs/river/init b/configs/river/init
index 3279b02..d3eef2d 100755
--- a/configs/river/init
+++ b/configs/river/init
@@ -6,20 +6,26 @@ longitude="-6.2"
 
 # Startup
 function execs() {
-  systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-  dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river && systemctl --user restart xdg-desktop-portal xdg-desktop-portal-wlr
+  host=$1
+
+  systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
+  dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river && systemctl --user restart xdg-desktop-portal xdg-desktop-portal-wlr &
   rivertile -view-padding 1 -outer-padding 2 &
   swaync &
-  # quickshell &
-  waybar &
-  hypridle &
   emacs --daemon &
   wl-clipboard-history -t &
   wl-paste -p --watch wl-copy -p '' &
   wlsunset -l "$longitude" -L "$latitude" &
   swww-daemon &
-  hyprlock &
-  fcitx5 -d &
+
+  if [ $host == "lmdesktop" ]; then
+    # TODO: find alternative screenlocker/idle manager
+    quickshell &
+  elif [ $host == "darp8" ]; then
+    waybar &
+    hypridle &
+    hyprlock &
+  fi
 }
 
 # Monitors
@@ -28,7 +34,7 @@ function monitors() {
 
   if [ $host == "lmdesktop" ]
   then
-    wlr-randr  --output DP-1      --mode 2560x1440@143.973007Hz  --pos 0,0       --scale 1
+    wlr-randr  --output DP-1      --mode 2560x1440@143.973007Hz  --pos 0,0       --scale 1 &&
     wlr-randr  --output HDMI-A-1  --mode 1920x1080@60Hz          --pos 2560,180  --scale 1
   elif [ $host == "darp8" ]
   then
@@ -170,11 +176,11 @@ function colors() {
 for arg in "$@"; do declare $arg='1'; done
 
 # Run Sections
-monitors $HOSTNAME
-layout
+binds
 colors
 inputs
-binds
+layout
+monitors $HOSTNAME
 
 # Don't run execs on reload
 if ! [ -v no_execs ]; then execs ; fi
diff --git a/flake.nix b/flake.nix
index 91f8862..bbf5566 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hyprland.url = "github:hyprwm/Hyprland";
+    caelestia-shell = {
+      url = "github:caelestia-dots/shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index c18d808..579f354 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -214,6 +214,7 @@
     ghostty
     glib
     gnome-keyring
+    inputs.caelestia-shell.packages.${system}."with-cli"
     libdrm
     libnotify
     mesa
@@ -225,6 +226,7 @@
     usbutils
     uxplay
     vim
+    waypipe
     wget
     wl-clipboard
     xdg-user-dirs
@@ -253,7 +255,13 @@
     };
   };
 
-  # services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      PermitRootLogin = "no";
+    };
+  };
 
   # This option defines the first version of NixOS you have installed on this particular machine
   # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
diff --git a/hosts/desktop/file.nix b/hosts/desktop/file.nix
index 9a81ab0..94ee978 100644
--- a/hosts/desktop/file.nix
+++ b/hosts/desktop/file.nix
@@ -31,6 +31,11 @@ in
       outOfStoreSymlink = true;
       recursive = true;
     };
+    ".config/emacs" = {
+      source = ../../configs/emacs;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
     ".config/waybar" = {
       source = ../../configs/waybar;
       outOfStoreSymlink = true;
@@ -61,12 +66,5 @@ in
       outOfStoreSymlink = true;
       recursive = true;
     };
-
-    # I have no idea why this is an issue...
-    # ".config/emacs" = {
-    #   source = ../../configs/emacs;
-    #   outOfStoreSymlink = true;
-    #   recursive = true;
-    # };
   };
 }
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 47a9184..1b061cb 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -68,11 +68,6 @@
   # ENV SETTINGS
   xdg.enable = true;
   xdg.configFile = {
-    "emacs" = {
-      recursive = true;
-      source = ../../configs/emacs;
-    };
-
     "user-dirs.dirs".source = ../../configs/user-dirs.dirs;
     "user-dirs.locale".source = ../../configs/user-dirs.locale;
   };
diff --git a/hosts/desktop/pkgs.nix b/hosts/desktop/pkgs.nix
index 90bf0c4..74ff3f8 100644
--- a/hosts/desktop/pkgs.nix
+++ b/hosts/desktop/pkgs.nix
@@ -31,7 +31,7 @@
     imagemagick
     kdePackages.kdenlive
     keepassxc
-    libsForQt5.polkit-kde-agent
+    kdePackages.polkit-kde-agent-1
     localsend
     mpv
     mupdf
@@ -102,6 +102,26 @@
         ".." = "cd ..";
       };
     };
+    # caelestia = {
+    #   enable = true;
+    #   systemd = {
+    #     enable = false;
+    #     target = "graphical-session.target";
+    #     environment = [ ];
+    #   };
+    #   settings = {
+    #     bar.status = {
+    #       showBattery = false;
+    #     };
+    #     paths.wallpaperDir = "~/pictures/.wallpapers";
+    #   };
+    #   cli = {
+    #     enable = true;
+    #     settings = {
+    #       theme.enableGtk = false;
+    #     };
+    #   };
+    # };
     emacs = {
       enable = true;
       package = pkgs.emacs-gtk;