diff --git a/.config/selfci/ci.yaml b/.config/selfci/ci.yaml
deleted file mode 100644
index 0bbb96f..0000000
--- a/.config/selfci/ci.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# SelfCI Configuration
-
-job:
-  # This command will be executed for all jobs
-  # Use $SELFCI_JOB_NAME env var to determine which job is running
-  command: |
-    set -eou pipefail
-
-    selfci step start "check"
-    nix flake check .
-
-  # Command prefix for executing the command
-  # Can be used to change the shell, or disable shell interpretation
-  # of `command` altogether.
-  # command-prefix: ["bash", "-c"]
-
-  # Clone mode: "partial", "shallow", or "full" (default: partial)
-  # - partial: Fast, uses partial clone (--filter=blob:none) - all commits, blobs on-demand
-  # - shallow: Most compact, uses shallow clone (--depth=1) - single commit only
-  # - full: Complete clone with all history and objects
-  clone-mode: partial
-
-# Merge queue configuration (optional)
-# mq:
-#   # Default base branch for merge queue
-#   base-branch: main
-#
-#   # Merge style: "rebase" or "merge" (default: rebase)
-#   # - rebase: Rebase candidate commits on top of base branch (no merge commit)
-#   # - merge: Create a merge commit
-#   merge-style: rebase
diff --git a/devShells/flake-module.nix b/devShells/flake-module.nix
index 87b679f..961492c 100644
--- a/devShells/flake-module.nix
+++ b/devShells/flake-module.nix
@@ -13,7 +13,6 @@
           pkgs.nil # Nix language server
           pkgs.nixfmt
           pkgs.opentofu
-          pkgs.selfci
           pkgs.terraform-ls
           pkgs.deploy-rs
           pkgs.zsh
diff --git a/home/.config/niri/config.kdl b/home/.config/niri/config.kdl
index 09fca5f..6504b43 100644
--- a/home/.config/niri/config.kdl
+++ b/home/.config/niri/config.kdl
@@ -115,19 +115,11 @@ binds {
     Mod+Shift+Comma { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Mod+Return { spawn-sh "alacritty msg create-window || alacritty"; }
+    Mod+Return { spawn "ghostty" "+new-window"; }
     // Mod+D { spawn "dms" "ipc" "call" "spotlight" "toggle"; }
     Mod+D { spawn "vicinae" "toggle"; }
     Super+Alt+L hotkey-overlay-title="Lock session" { spawn "loginctl" "lock-session"; }
 
-    XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+"; }
-	XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-"; }
-	XF86AudioMute        allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
-	XF86AudioMicMute     allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } 
-
-    XF86MonBrightnessUp   allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; }
-	XF86MonBrightnessDown allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; }  
-
     XF86AudioPlay { spawn "playerctl" "play-pause"; }
     XF86AudioNext { spawn "playerctl" "next"; }
     XF86AudioPrev { spawn "playerctl" "previous"; }
@@ -303,7 +295,7 @@ binds {
     Mod+Shift+P { power-off-monitors; }
 
     Mod+N hotkey-overlay-title="Open notes" {
-        spawn-sh "alacritty --working-directory ~/notes -e hx ~/notes/notes.dj:9999";
+        spawn-sh "ghostty -e hx --working-dir ~/notes ~/notes/notes.dj:9999";
     }
 }
 
diff --git a/machines/crocus/configuration.nix b/machines/crocus/configuration.nix
index ce090f8..eebb568 100644
--- a/machines/crocus/configuration.nix
+++ b/machines/crocus/configuration.nix
@@ -6,6 +6,7 @@
   imports = [
     self.nixosModules.radicle
     self.nixosModules.nix-defaults
+    self.nixosModules.remote-builder
     self.inputs.srvos.nixosModules.server
     self.inputs.srvos.nixosModules.hardware-hetzner-cloud
   ];
@@ -38,7 +39,7 @@
   services.garage.settings.data_dir = [
     {
       path = "/var/lib/garage/data";
-      capacity = "24G";
+      capacity = "20G";
     }
     {
       path = "/data1/garage";
@@ -48,6 +49,8 @@
 
   clan.core.settings.state-version.enable = true;
 
+  clan.core.networking.buildHost = "root@haze";
+
   services.avahi.allowInterfaces = [
     "zts7mq7onf"
   ];
diff --git a/machines/haze/configuration.nix b/machines/haze/configuration.nix
index 1946ccd..efc2dde 100644
--- a/machines/haze/configuration.nix
+++ b/machines/haze/configuration.nix
@@ -54,6 +54,8 @@
     pkgs.anki
   ];
 
+  programs.kdeconnect.enable = true;
+
   nixpkgs.config.allowUnfree = true;
 
   i18n.supportedLocales = [