diff --git a/flake.lock b/flake.lock
index ce3533dc..8ae76d13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -275,17 +275,14 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1750536858,
-        "narHash": "sha256-bcftbYApVuB4bUqP6Z0frUh2b9+yiAkyy+EXijZcoc4=",
-        "owner": "uttarayan21",
-        "repo": "command-runner",
-        "rev": "534df9bd86329544d3be74faf1e47996da912b2f",
-        "type": "github"
+        "lastModified": 1751306389,
+        "narHash": "sha256-7AL2SENMyjXTiedkNvvBfxh6JxNTm/UmDmp66ovwEIY=",
+        "path": "/home/servius/Projects/command-runner",
+        "type": "path"
       },
       "original": {
-        "owner": "uttarayan21",
-        "repo": "command-runner",
-        "type": "github"
+        "path": "/home/servius/Projects/command-runner",
+        "type": "path"
       }
     },
     "crane": {
diff --git a/flake.nix b/flake.nix
index 451aceea..c2c9c3ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -174,11 +174,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     command-runner = {
-      url = "github:uttarayan21/command-runner";
+      # url = "github:uttarayan21/command-runner";
+      url = "path:/home/servius/Projects/command-runner";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # alvr = {
-    #   url = "git+file:/home/servius/Projects/ALVR";
+    #   url = "path:/home/servius/Projects/ALVR";
     #   inputs.nixpkgs.follows = "nixpkgs";
     # };
   };
diff --git a/home/default.nix b/home/default.nix
index 7fa7dc18..38f0c5fb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -14,7 +14,7 @@
     ./linux
     ./programs
     ./scripts.nix
-    # ./services
+    ./services
   ];
 
   xdg.enable = true;
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 62c327e5..735c1bfe 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -31,6 +31,7 @@
     ./zoxide.nix
     ./mpris-scrobbler.nix
     ./omnix.nix
+    # ./magika.nix
     # ./ncmpcpp.nix
     # ./neomutt.nix
     # ./zellij.nix
diff --git a/home/programs/magika.nix b/home/programs/magika.nix
new file mode 100644
index 00000000..23091fa2
--- /dev/null
+++ b/home/programs/magika.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.magika];
+}
diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix
index 9ffa5592..3bf9e51e 100644
--- a/home/programs/ssh.nix
+++ b/home/programs/ssh.nix
@@ -11,6 +11,10 @@
         user = "servius";
         hostname = "rpi";
       };
+      tsuba = {
+        user = "servius";
+        hostname = "tsuba";
+      };
       github = {
         user = "git";
         host = "github.com";
diff --git a/home/services/command-runner.nix b/home/services/command-runner.nix
new file mode 100644
index 00000000..a7fe77d7
--- /dev/null
+++ b/home/services/command-runner.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.command-runner.homeManagerModules.command-runner
+  ];
+  services.command-runner = {
+    enable = true;
+    port = 5599;
+    database.path = "${config.home.homeDirectory}/.local/share/command-runner.db";
+    commands = let
+      hyprctl = "${pkgs.hyprland}/bin/hyprctl";
+    in
+      {
+        "display_on" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "on"];
+        "display_off" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "off"];
+        "display_toggle" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "toggle"];
+        "display_status" = [hyprctl "-i" "{instance}" "-j" "monitors"];
+        "hyprland_instance" = [hyprctl "-j" "instances"];
+      }
+      // (builtins.foldl' (acc: elem: acc // elem) {} (lib.map (name: {
+        "display_on_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "on" name];
+        "display_off_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "off" name];
+        "display_toggle_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "toggle" name];
+      }) ["HDMI-A-1" "DP-3" "DP-1"]));
+  };
+}
diff --git a/home/services/default.nix b/home/services/default.nix
index 1f34490a..a3868f1b 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -1,5 +1,6 @@
 {...}: {
   imports = [
     # ./syncthing.nix
+    ./command-runner.nix
   ];
 }
diff --git a/nixos/default.nix b/nixos/default.nix
index c5416de8..799eeefd 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -23,7 +23,7 @@
           ./${device.name}/configuration.nix
           home-manager.nixosModules.home-manager
           inputs.arion.nixosModules.arion
-          inputs.command-runner.nixosModules.command-runner
+          # inputs.command-runner.nixosModules.command-runner
           inputs.lanzaboote.nixosModules.lanzaboote
           inputs.musnix.nixosModules.musnix
           {
@@ -37,7 +37,9 @@
                 inherit device;
                 stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system};
               };
-              users.${device.user}.imports = [../home];
+              users.${device.user}.imports = [
+                ../home
+              ];
             };
           }
         ];
diff --git a/nixos/mirai/services/caddy.nix b/nixos/mirai/services/caddy.nix
index eeda72f8..7c287d7a 100644
--- a/nixos/mirai/services/caddy.nix
+++ b/nixos/mirai/services/caddy.nix
@@ -1,5 +1,12 @@
 {...}: {
   services = {
-    caddy.enable = true;
+    caddy = {
+      enable = true;
+      # virtualHosts = {
+      #   "home.darksailor.dev".extraConfig = ''
+      #     reverse_proxy http://tsuba.lemur-newton.ts.net:8123
+      #   '';
+      # };
+    };
   };
 }
diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix
index 795583e0..0d24aaee 100644
--- a/nixos/mirai/services/default.nix
+++ b/nixos/mirai/services/default.nix
@@ -9,6 +9,7 @@
     ./caddy.nix
     ./fail2ban.nix
     ./gitea.nix
+    # ./nextcloud.nix
 
     # ./navidrome.nix
     # ./home-assistant.nix
@@ -16,7 +17,6 @@
     # ./polaris.nix
     # ./syncthing.nix
     # ./vscode.nix
-    # ./nextcloud.nix
     # ./ldap.nix
     # ./llama.nix
     # ./nextcloud.nix
diff --git a/nixos/mirai/services/nextcloud.nix b/nixos/mirai/services/nextcloud.nix
index 2d96a0ff..39347fc3 100644
--- a/nixos/mirai/services/nextcloud.nix
+++ b/nixos/mirai/services/nextcloud.nix
@@ -8,15 +8,20 @@
   };
   services = {
     nextcloud = {
-      enable = false;
+      enable = true;
       package = pkgs.nextcloud30;
+      # extraApps = {
+      #   inherit (config.services.nextcloud.package.packages.apps) news contacts calendar;
+      # };
+      # extraAppsEnable = true;
       hostName = "cloud.darksailor.dev";
       config.adminuser = "servius";
       config.adminpassFile = config.sops.secrets."nextcloud/adminpass".path;
       config.dbtype = "sqlite";
       configureRedis = true;
-      https = true;
-      datadir = "/media/nextcloud";
+      https = false;
+      # datadir = "/media/nextcloud";
+      home = "/media/nextcloud";
     };
     caddy = {
       virtualHosts."cloud.darksailor.dev".extraConfig = ''
diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index f5771555..a3826629 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -108,7 +108,7 @@
 
   users.users.servius = {
     isNormalUser = true;
-    extraGroups = ["wheel" "audio" "i2c" "media" "openrazer"];
+    extraGroups = ["wheel" "audio" "i2c" "media" "openrazer" "video"];
     openssh.authorizedKeys.keyFiles = [
       ../../secrets/id_ed25519.pub
       ../../secrets/id_ios.pub
@@ -284,6 +284,7 @@
     # List packages installed in system profile. To search, run:
     # $ nix search wget
     systemPackages = with pkgs; [
+      v4l-utils
       polychromatic
       openrazer-daemon
       cudatoolkit
diff --git a/nixos/ryu/services/command-runner.nix b/nixos/ryu/services/command-runner.nix
index 36fe5d69..90da3b0b 100644
--- a/nixos/ryu/services/command-runner.nix
+++ b/nixos/ryu/services/command-runner.nix
@@ -4,24 +4,24 @@
   pkgs,
   ...
 }: {
-  services.command-runner = {
-    enable = true;
-    port = 5599;
-    user = "servius";
-    commands = let
-      hyprctl = "${pkgs.hyprland}/bin/hyprctl";
-    in
-      {
-        "display_on" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "on"];
-        "display_off" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "off"];
-        "display_toggle" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "toggle"];
-        "display_status" = [hyprctl "-i" "{instance}" "-j" "monitors"];
-        "hyprland_instance" = [hyprctl "-j" "instances"];
-      }
-      // (builtins.foldl' (acc: elem: acc // elem) {} (lib.map (name: {
-        "display_on_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "on" name];
-        "display_off_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "off" name];
-        "display_toggle_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "toggle" name];
-      }) ["HDMI-A-1" "DP-3" "DP-1"]));
-  };
+  # services.command-runner = {
+  #   enable = false;
+  #   port = 5599;
+  #   user = "servius";
+  #   commands = let
+  #     hyprctl = "${pkgs.hyprland}/bin/hyprctl";
+  #   in
+  #     {
+  #       "display_on" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "on"];
+  #       "display_off" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "off"];
+  #       "display_toggle" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "toggle"];
+  #       "display_status" = [hyprctl "-i" "{instance}" "-j" "monitors"];
+  #       "hyprland_instance" = [hyprctl "-j" "instances"];
+  #     }
+  #     // (builtins.foldl' (acc: elem: acc // elem) {} (lib.map (name: {
+  #       "display_on_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "on" name];
+  #       "display_off_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "off" name];
+  #       "display_toggle_${name}" = [hyprctl "-i" "{instance}" "dispatch" "dpms" "toggle" name];
+  #     }) ["HDMI-A-1" "DP-3" "DP-1"]));
+  # };
 }