feat(ssh): update hostnames and comment out mirai block from ssh config

fix(configuration): set uid for remotebuilder user
feat(configuration): enable Nix and upgrade system state version
2025-12-06 05:53:30 +05:30 · 2025-12-06 03:44:52 +05:30 · 2025-12-06 03:42:04 +05:30 · 2025-12-06 03:36:58 +05:30 · 2025-12-05 15:31:41 +05:30 · 2025-12-05 15:09:06 +05:30
28 changed files with 278 additions and 137 deletions
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@

 1. Ryu Dektop (Intel i9-14900KS / Nvidia 5090 / 64GB CL36@6000MTs) 
    ```
+    deploy -s .#ryu
    ```
 2. Mirai Server (AMD Ryzen 7 7700 / 64GB@5200MHz)
 3. Tako Server (Intel Xeon E-2236 / 64GB)
--- a/builders/mirai.nix
+++ b/builders/mirai.nix
@@ -1,7 +1,7 @@
-{
-  hostName = "mirai.darksailor.dev";
-  sshUser = "remotebuilder";
-  systems = ["x86_64-linux" "aarch64-linux"];
-  protocol = "ssh-ng";
-  supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
-}
+# {
+#   hostName = "mirai.darksailor.dev";
+#   sshUser = "remotebuilder";
+#   systems = ["x86_64-linux" "aarch64-linux"];
+#   protocol = "ssh-ng";
+#   supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+# }
--- a/darwin/kuro/configuration.nix
+++ b/darwin/kuro/configuration.nix
@@ -30,7 +30,7 @@
    '';
    package = pkgs.nixVersions.latest;
    buildMachines = [
-      ../../builders/mirai.nix
+      ../../builders/tako.nix
      ../../builders/shiro.nix
    ];
    distributedBuilds = true;
--- a/darwin/shiro/configuration.nix
+++ b/darwin/shiro/configuration.nix
@@ -8,7 +8,7 @@

  # environment.systemPackages = with pkgs; [nix neovim];
  nix = {
-    enable = false;
+    enable = true;
    settings = {
      experimental-features = "nix-command flakes auto-allocate-uids";
      max-jobs = 8;
@@ -29,8 +29,8 @@
    '';
    package = pkgs.nixVersions.latest;
    buildMachines = [
-      ../../builders/mirai.nix
-      # ../../builders/shiro.nix
+      ../../builders/tako.nix
+      ../../builders/shiro.nix
    ];
    distributedBuilds = true;
  };
@@ -43,9 +43,9 @@
    ];
  };
  users.users.remotebuilder = {
-    name = "remotebuilder";
+    description = "User for Nix remote builds";
    uid = 700;
-    home = "/var/lib/remotebuilder";
+    # home = "/var/remotebuilder";
    createHome = true;
    shell = "/bin/bash";
    openssh.authorizedKeys.keyFiles = [
@@ -76,7 +76,7 @@

  # services.nix-daemon.enable = true;
  system.primaryUser = "servius";
-  system.stateVersion = 4;
+  system.stateVersion = 5;

  system.keyboard.enableKeyMapping = true;
  system.keyboard.remapCapsLockToControl = true;
--- a/darwin/shiro/homebrew.nix
+++ b/darwin/shiro/homebrew.nix
@@ -6,14 +6,14 @@
    ];
    casks = [
      "docker"
-      "librewolf"
      "raycast"
-      "kunkun" # Soon
      "lunar"
      "virtual-desktop-streamer"
      "kicad"
      "shapr3d"
      "orcaslicer"
+      "zed"
+      "zen"
    ];
  };
 }
--- a/darwin/shiro/services/default.nix
+++ b/darwin/shiro/services/default.nix
@@ -1,11 +1,11 @@
 {...}: {
  imports = [
-    ../../../modules/darwin/caddy
+    # ../../../modules/darwin/caddy
    ./yabai.nix
    ./skhd.nix
    ./tailscale.nix
    ./autossh.nix
-    ./caddy.nix
+    # ./caddy.nix
    ./sops.nix
    # ./lmstudio.nix
    # ./colima.nix
--- a/deploy.nix
+++ b/deploy.nix
@@ -37,24 +37,24 @@
        user = "root";
      };
    };
-    # kuro = {
-    #   hostname = "kuro";
-    #   interactiveSudo = true;
-    #   profiles.system = {
-    #     sshUser = "fs0c131y";
-    #     path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
-    #     user = "root";
-    #   };
-    # };
-    # shiro = {
-    #   hostname = "shiro";
-    #   interactiveSudo = true;
-    #   profiles.system = {
-    #     sshUser = "servius";
-    #     path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
-    #     user = "root";
-    #   };
-    # };
+    kuro = {
+      hostname = "kuro";
+      interactiveSudo = true;
+      profiles.system = {
+        sshUser = "fs0c131y";
+        path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro;
+        user = "root";
+      };
+    };
+    shiro = {
+      hostname = "shiro";
+      interactiveSudo = true;
+      profiles.system = {
+        sshUser = "servius";
+        path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
+        user = "root";
+      };
+    };
    # deck = {
    #   hostname = "steamdeck";
    #   profiles.system = {
--- a/flake.lock
+++ b/flake.lock
@@ -355,11 +355,11 @@
    "base16-helix_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1752979451,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "lastModified": 1748408240,
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
        "type": "github"
      },
      "original": {
@@ -407,11 +407,11 @@
        "fromYaml": "fromYaml_2"
      },
      "locked": {
-        "lastModified": 1755819240,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "lastModified": 1746562888,
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
        "type": "github"
      },
      "original": {
@@ -835,11 +835,11 @@
    "firefox-gnome-theme_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1758112371,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
+        "lastModified": 1748383148,
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
        "type": "github"
      },
      "original": {
@@ -1187,11 +1187,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "lastModified": 1749398372,
+        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
        "type": "github"
      },
      "original": {
@@ -1415,7 +1415,7 @@
    },
    "flake-utils_20": {
      "inputs": {
-        "systems": "systems_26"
+        "systems": "systems_27"
      },
      "locked": {
        "lastModified": 1726560853,
@@ -1433,7 +1433,7 @@
    },
    "flake-utils_21": {
      "inputs": {
-        "systems": "systems_27"
+        "systems": "systems_28"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -1695,20 +1695,18 @@
    "gnome-shell_2": {
      "flake": false,
      "locked": {
-        "host": "gitlab.gnome.org",
-        "lastModified": 1762869044,
-        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
+        "lastModified": 1744584021,
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
-        "type": "gitlab"
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "type": "github"
      },
      "original": {
-        "host": "gitlab.gnome.org",
        "owner": "GNOME",
-        "ref": "gnome-49",
+        "ref": "48.1",
        "repo": "gnome-shell",
-        "type": "gitlab"
+        "type": "github"
      }
    },
    "guihua": {
@@ -1814,16 +1812,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1764177491,
-        "narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=",
+        "lastModified": 1763992789,
+        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2217780c39169a9c77915200137550c2ef0fa974",
+        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -2863,16 +2861,16 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1764020296,
-        "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
+        "lastModified": 1764560356,
+        "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
+        "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -2949,6 +2947,22 @@
        "type": "github"
      }
    },
+    "nixpkgs_13": {
+      "locked": {
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 315532800,
@@ -3211,14 +3225,15 @@
        "nixpkgs": [
          "stylix-stable",
          "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1758998580,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "lastModified": 1751320053,
+        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
        "type": "github"
      },
      "original": {
@@ -3424,6 +3439,7 @@
        "tree-sitter-pest": "tree-sitter-pest",
        "tree-sitter-slint": "tree-sitter-slint",
        "typr": "typr",
+        "vicinae": "vicinae",
        "volt": "volt",
        "yabai": "yabai",
        "zen-browser": "zen-browser",
@@ -3754,16 +3770,16 @@
        "tinted-zed": "tinted-zed_2"
      },
      "locked": {
-        "lastModified": 1764193603,
-        "narHash": "sha256-guX30TWe8HRG2qPFiM9893F2uTw4B8D/xkE6Mq7MiYg=",
+        "lastModified": 1763845106,
+        "narHash": "sha256-S3HH655nydKoLTuqX8qcJidZH0PiWGB/YcoPomH1DaQ=",
        "owner": "nix-community",
        "repo": "stylix",
-        "rev": "9bf8725a3d65b3ff0ba68ce13779657f5095e36b",
+        "rev": "b9b8173a6e31c6d06f328307ddbdf7d6af82b7ad",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-25.05",
        "repo": "stylix",
        "type": "github"
      }
@@ -4068,6 +4084,21 @@
        "type": "github"
      }
    },
+    "systems_28": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
@@ -4258,11 +4289,11 @@
    "tinted-schemes_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1757716333,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
+        "lastModified": 1750770351,
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
        "type": "github"
      },
      "original": {
@@ -4290,11 +4321,11 @@
    "tinted-tmux_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1757811970,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
+        "lastModified": 1751159871,
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
        "type": "github"
      },
      "original": {
@@ -4322,11 +4353,11 @@
    "tinted-zed_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1757811247,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
+        "lastModified": 1751158968,
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
        "type": "github"
      },
      "original": {
@@ -4461,6 +4492,28 @@
        "type": "github"
      }
    },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix-stable",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
    "typr": {
      "flake": false,
      "locked": {
@@ -4495,6 +4548,25 @@
        "type": "github"
      }
    },
+    "vicinae": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_13",
+        "systems": "systems_26"
+      },
+      "locked": {
+        "lastModified": 1764589741,
+        "narHash": "sha256-RRh/sN/0lzcSc9ZiINOQCx/CrR10fvdt7i/vRAlG6FQ=",
+        "owner": "vicinaehq",
+        "repo": "vicinae",
+        "rev": "35523ad27e8949fada3ecf6eed6c317492102fe3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vicinaehq",
+        "repo": "vicinae",
+        "type": "github"
+      }
+    },
    "volt": {
      "flake": false,
      "locked": {
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    nixpkgs-master.url = "github:nixos/nixpkgs/master";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
    flake-utils.url = "github:numtide/flake-utils";
    disko = {
      url = "github:nix-community/disko/latest";
@@ -18,11 +18,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    stylix-stable = {
-      url = "github:nix-community/stylix/release-25.11";
+      url = "github:nix-community/stylix/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs-stable";
    };
    home-manager-stable = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs-stable";
    };
    nix-darwin = {
@@ -235,6 +235,10 @@
      url = "github:tale/headplane";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    vicinae = {
+      url = "github:vicinaehq/vicinae";
+      # inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = {
@@ -251,14 +255,14 @@
    ...
  } @ inputs: let
    devices = {
-      mirai = mkDevice {
-        name = "mirai";
-        system = "x86_64-linux";
-        user = "fs0c131y";
-        hasGui = false; # Don't wan't to run GUI apps on a headless server
-        isNix = true;
-        isServer = true;
-      };
+      # mirai = mkDevice {
+      #   name = "mirai";
+      #   system = "x86_64-linux";
+      #   user = "fs0c131y";
+      #   hasGui = false; # Don't wan't to run GUI apps on a headless server
+      #   isNix = true;
+      #   isServer = true;
+      # };
      tako = mkDevice {
        name = "tako";
        system = "x86_64-linux";
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -39,5 +39,6 @@ lib.optionalAttrs device.hasGui {
    ./zathura.nix
    ./zed.nix
    ./zen.nix
+    ./vicinae.nix
  ];
 }
--- a/home/apps/gimp.nix
+++ b/home/apps/gimp.nix
@@ -1,3 +1,8 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [gimp];
+{
+  pkgs,
+  device,
+  lib,
+  ...
+}: {
+  home.packages = with pkgs; lib.optionals (device.is "ryu") [gimp];
 }
--- a/home/apps/vicinae.nix
+++ b/home/apps/vicinae.nix
@@ -0,0 +1,16 @@
+{
+  pkgs,
+  inputs,
+  device,
+  ...
+}: {
+  imports = [inputs.vicinae.homeManagerModules.default];
+  services.vicinae = {
+    enable = device.is "ryu";
+    autoStart = true;
+    extensions = [];
+    # package = pkgs.vicinae.overrideAttrs (old: {
+    #   patches = [../../patches/vicinae-ctrl-np.patch];
+    # });
+  };
+}
--- a/home/programs/aichat.nix
+++ b/home/programs/aichat.nix
@@ -16,8 +16,8 @@
    enableNushellIntegration = false;
    settings = {
      save_session = true;
-      # model = "openai:gpt-4o";
-      model = "ryu:qwen3-coder-30b";
+      model = "openai:gpt-4o";
+      # model = "ryu:qwen3-coder-30b";
      rag_embedding_model = "ollama:RobinBially/nomic-embed-text-8k";
      clients = [
        {
@@ -174,9 +174,9 @@
        */
        ''
          ---
-          model: ryu:qwen3-coder-30b
+          model: openai:gpt-4o
          ---
-          Your task is to generate a concise and informative commit message based on the provided diff. Use the conventional commit format, which includes a type (feat, fix, chore, docs, style, refactor, perf, test) and an optional scope. The message should be in the imperative mood and should not exceed 72 characters in the subject line. Don't include any additional text or explanations, just the commit message.
+          Your task is to generate a concise and informative commit message based on the provided diff. Use the conventional commit format, which includes a type (feat, fix, chore, docs, style, refactor, perf, test) and an optional scope. The message should be in the imperative mood and should not exceed 72 characters in the subject line. Do not under any circumstance include any additional text or explanations, just add the commit message.
        '';
    };
  };
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
@@ -6,7 +6,7 @@
  ...
 }: {
  stylix.targets.nixvim.enable = false;
-  programs = lib.optionalAttrs (device.is "ryu" || device.is "kuro" || device.is "mirai" || device.is "tako") {
+  programs = lib.optionalAttrs (device.is "ryu" || device.is "kuro" || device.is "mirai" || device.is "tako" || device.is "shiro") {
    nixvim =
      {
        enable = true;
--- a/home/programs/ssh.nix
+++ b/home/programs/ssh.nix
@@ -9,17 +9,17 @@
    matchBlocks = {
      tsuba = {
        user = "servius";
-        hostname = "tsuba";
+        hostname = "tsuba.darksailor.dev";
      };
      github = {
        user = "git";
        host = "github.com";
      };
-      mirai = {
-        user = "fs0c131y";
-        hostname = "mirai.darksailor.dev";
-        forwardAgent = true;
-      };
+      # mirai = {
+      #   user = "fs0c131y";
+      #   hostname = "mirai.darksailor.dev";
+      #   forwardAgent = true;
+      # };
      tako = {
        user = "servius";
        hostname = "tako.darksailor.dev";
@@ -27,7 +27,7 @@
      };
      ryu = {
        user = "servius";
-        hostname = "ryu";
+        hostname = "ryu.darksailor.dev";
        forwardAgent = true;
      };
      kuro = {
--- a/home/services/gtk.nix
+++ b/home/services/gtk.nix
@@ -7,6 +7,7 @@
 lib.optionalAttrs (device.is "ryu") {
  gtk = {
    enable = device.is "ryu";
+    colorScheme = lib.mkForce "dark";
    theme = {
      name = "catppuccin-mocha-mauve-standard+normal";
      package = pkgs.catppuccinThemes.gtk;
@@ -38,5 +39,7 @@ lib.optionalAttrs (device.is "ryu") {
    # pkgs.catppuccinThemes.gtk
    pkgs.catppuccinThemes.papirus-folders
  ];
+  # stylix.targets.gtk.enable = false;
  stylix.targets.gtk.enable = false;
+  stylix.targets.gnome.enable = false;
 }
--- a/home/services/gui.nix
+++ b/home/services/gui.nix
@@ -25,7 +25,7 @@
      nautilus
      totem
      ffmpegthumbnailer
-      polkit_gnome
+      # polkit_gnome
      seahorse
      signal-desktop
      # sony-headphones-client
--- a/home/services/hyprland.nix
+++ b/home/services/hyprland.nix
@@ -199,8 +199,8 @@
        "$mainModShift, f, alterzorder, top"
        "$mainMod, f, fullscreen,"
        "$mainMod, g, fullscreenstate,0,2"
-        "$mainMod, d, exec, ${lib.getExe pkgs.anyrun}"
-        "$mainMod, Space, exec, ${lib.getExe pkgs.anyrun}"
+        "$mainMod, d, exec, ${lib.getExe pkgs.vicinae} toggle"
+        "$mainMod, Space, exec, ${lib.getExe pkgs.vicinae} toggle"
        "$mainMod, p, pseudo, # dwindle"
        "$mainMod, v, togglesplit,"
        "$mainMod, a, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
--- a/home/services/xdg.nix
+++ b/home/services/xdg.nix
@@ -8,11 +8,13 @@ lib.optionalAttrs (device.is "ryu") {
  xdg.portal = {
    enable = pkgs.stdenv.isLinux;
    config = {
-      hyprland.default = ["hyprland" "kde"];
+      hyprland.default = ["kde" "hyprland"];
+      common.default = ["*" "hyprland"];
    };
    extraPortals = with pkgs; [
-      xdg-desktop-portal-hyprland
      kdePackages.xdg-desktop-portal-kde
+      xdg-desktop-portal-hyprland
+      xdg-desktop-portal-gtk
    ];
  };
 }
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -22,7 +22,7 @@
  programs = {
    hyprland = {
      enable = true;
-      # withUWSM = true;
+      withUWSM = true;
      xwayland.enable = true;
    };
  };
@@ -70,7 +70,6 @@
    package = pkgs.nixVersions.latest; # deploy-rs doesn't work with nix >= 2.32
    buildMachines = [
      ../../builders/tako.nix
-      ../../builders/mirai.nix
      ../../builders/shiro.nix
      # ../../builders/tsuba.nix
    ];
@@ -79,7 +78,7 @@

  users.users.${device.user} = {
    isNormalUser = true;
-    extraGroups = ["wheel" "audio" "i2c" "media" "openrazer" "video" "tss"];
+    extraGroups = ["wheel" "audio" "i2c" "media" "video" "tss"];
    openssh.authorizedKeys.keyFiles = [
      ../../secrets/id_ed25519.pub
      ../../secrets/id_ios.pub
@@ -199,10 +198,11 @@
        "tailscale0"
      ];
      allowedUDPPorts = [
-        4950
-        4955
-        3113
-      ]; # Warframe
+        9 # Wake on LAN
+        4950 # Warframe
+        4955 # Warframe
+        3113 # Other
+      ];
      allowedTCPPortRanges = [
        {
          from = 1714;
--- a/nixos/ryu/programs/gamemode.nix
+++ b/nixos/ryu/programs/gamemode.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  device,
+  ...
+}: {
  programs.gamemode = {
    enable = true;
    settings = {
@@ -16,4 +20,5 @@
      };
    };
  };
+  users.users.${device.user}.extraGroups = ["gamemode"];
 }
--- a/nixos/ryu/ryu.nix
+++ b/nixos/ryu/ryu.nix
@@ -100,20 +100,19 @@
  '';

  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/11d8beef-2a63-4231-af35-b9b8d3a17e9b";
+    device = "/dev/disk/by-uuid/7b488da9-49d3-44d1-b11b-bc6dcd418b1d";
    fsType = "ext4";
  };

  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/64099f91-d4d6-44fa-92d4-9e905b3e7829";
+    device = "/dev/disk/by-uuid/ef734595-a856-4207-8da1-1f0bde4bad61";
    fsType = "ext4";
-    neededForBoot = true;
-    options = ["noatime"];
  };

  fileSystems."/boot" = {
    device = "/dev/disk/by-uuid/4E27-DAC0";
    fsType = "vfat";
+    options = ["fmask=0007" "dmask=0007"];
  };

  fileSystems."/home" = {
@@ -122,12 +121,6 @@
    neededForBoot = true;
  };

-  # fileSystems."/media" = {
-  #   device = "/dev/storage/media";
-  #   fsType = "ext4";
-  #   options = ["users" "nofail"];
-  # };
-
  fileSystems."/games" = {
    device = "/dev/storage/games";
    fsType = "ext4";
--- a/nixos/tako/services/default.nix
+++ b/nixos/tako/services/default.nix
@@ -5,7 +5,7 @@
    # ./llama.nix
    # ./monitoring.nix
    # ./paperless.nix
-    # ./shitpost.nix
+    ./shitpost.nix
    ./atuin.nix
    ./authelia.nix
    ./caddy.nix
--- a/nixos/tako/services/games/default.nix
+++ b/nixos/tako/services/games/default.nix
@@ -1,7 +1,7 @@
 {...}: {
  imports = [
-    ./minecraft.nix
-    ./satisfactory.nix
-    ./terraria.nix
+    # ./minecraft.nix
+    # ./satisfactory.nix
+    # ./terraria.nix
  ];
 }
--- a/nixos/tsuba/configuration.nix
+++ b/nixos/tsuba/configuration.nix
@@ -41,7 +41,6 @@
    distributedBuilds = true;
    buildMachines = [
      ../../builders/tako.nix
-      ../../builders/mirai.nix
      ../../builders/shiro.nix
    ];
  };
--- a/nixos/tsuba/tsuba.nix
+++ b/nixos/tsuba/tsuba.nix
@@ -10,6 +10,8 @@
  networking.useNetworkd = true;
  systemd.services.NetworkManager-wait-online.enable = false;
  systemd.network.wait-online.enable = false;
+  boot.loader.raspberryPi.bootloader = "kernel";
+
  fileSystems."/home".neededForBoot = true;

  system.nixos.tags = let
@@ -31,5 +33,6 @@
  hardware.raspberry-pi.extra-config = ''
    [all]
    dtparam=pciex1_gen=2
+    os_prefix=nixos/default/
  '';
 }
--- a/overlays.nix
+++ b/overlays.nix
@@ -162,9 +162,10 @@
        cargoLock = {lockFile = "${src}/Cargo.lock";};
      };
    # alvr-master = inputs.alvr.packages.${prev.system}.default;
-    caddyWithCloudflare = final.pkgs.caddy.withPlugins {
+    caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${final.system}.caddy.withPlugins {
      plugins = ["github.com/caddy-dns/cloudflare@v0.2.2"];
      hash = "sha256-ea8PC/+SlPRdEVVF/I3c1CBprlVp1nrumKM5cMwJJ3U=";
+      # hash = "sha256-Z8nPh4OI3/R1nn667ZC5VgE+Q9vDenaQ3QPKxmqPNkc=";
    };
    nix-auth = inputs.nix-auth.packages.${prev.system}.nix-auth;
    kitty = inputs.nixpkgs-stable.legacyPackages.${prev.system}.kitty;
@@ -284,6 +285,7 @@ in
    inputs.rust-overlay.overlays.default
    inputs.handoff.overlays.default
    inputs.headplane.overlays.default
+    inputs.vicinae.overlays.default
    jellyfin
    libfprint
    misc-applications
--- a/patches/vicinae-ctrl-np.patch
+++ b/patches/vicinae-ctrl-np.patch
@@ -0,0 +1,35 @@
+diff --git a/vicinae/src/services/keybinding/keybinding-service.hpp b/vicinae/src/services/keybinding/keybinding-service.hpp
+index 61b31590..1df8c548 100644
+--- a/vicinae/src/services/keybinding/keybinding-service.hpp
+++ b/vicinae/src/services/keybinding/keybinding-service.hpp
+@@ -22,28 +22,14 @@ public:
+     KeyBindingMode mode = getMode(keybinding);
+ 
+     if (!usesOnly(event, Qt::ControlModifier)) { return false; }
+-
+-    switch (mode) {
+-    case KeyBindingMode::Default:
+-      return event->key() == Qt::Key_J;
+-    case KeyBindingMode::Emacs:
+-      return event->key() == Qt::Key_N;
+-    }
+-    return false;
+    return (event->key() == Qt::Key_N);
+   }
+ 
+   static bool isUpKey(QKeyEvent *event, const QString &keybinding) {
+     KeyBindingMode mode = getMode(keybinding);
+ 
+     if (!usesOnly(event, Qt::ControlModifier)) { return false; }
+-
+-    switch (mode) {
+-    case KeyBindingMode::Default:
+-      return event->key() == Qt::Key_K;
+-    case KeyBindingMode::Emacs:
+-      return event->key() == Qt::Key_P;
+-    }
+-    return false;
+    return (event->key() == Qt::Key_P)
+   }
+ 
+   static bool isLeftKey(QKeyEvent *event, const QString &keybinding) {
Author	SHA1	Message	Date
uttarayan21	24fab1402b	feat(ssh): update hostnames and comment out mirai block from ssh config Some checks are pending Flake checker / Build Nix targets (push) Waiting to run Details	2025-12-06 05:53:30 +05:30
uttarayan21	5e7bb9c986	fix(configuration): set uid for remotebuilder user Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-06 03:44:52 +05:30
uttarayan21	0dda14266d	feat(configuration): enable Nix and upgrade system state version Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-06 03:42:04 +05:30
uttarayan21	0b1924359e	feat(gtk): force dark color scheme for ryu device	2025-12-06 03:36:58 +05:30
uttarayan21	7dcb0df9b8	fix(darwin): uncomment user and host configurations Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-05 15:31:41 +05:30
uttarayan21	ec543d6c5d	feat(configuration): add system user flag and description for remotebuilder Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-05 15:09:06 +05:30
uttarayan21	224edeb402	refactor(aichat): update model to openai:gpt-4o from selfhosted Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details fix(configuration): add Wake on LAN to allowed UDP ports	2025-12-05 14:21:20 +05:30
uttarayan21	85a130d868	chore(build): replace mirai builder with tako in build machine configurations Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-05 02:06:28 +05:30
uttarayan21	2347c002d8	feat: Remove the game servers Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-05 01:44:05 +05:30
uttarayan21	7e9a64023f	feat(vicinae): update nixpkgs and adjust keybinding patch for Ctrl+N/P support Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-05 00:01:34 +05:30
uttarayan21	630c087308	fix: Nix modify root and /nix partition uuids Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-04 13:53:26 +05:30
uttarayan21	452e287fb0	feat: remove mirai Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-03 17:38:20 +05:30
uttarayan21	97434671a9	feat: Added zed and zen Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-03 15:06:45 +05:30
uttarayan21	dcfe921975	feat: Added nvim to shiro Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-03 01:29:53 +05:30
uttarayan21	0e8d262b4a	fix: Don't enable gimp in macos Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-02 12:43:33 +05:30
uttarayan21	25db631be3	feat(vicinae): enable service based on device type Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-01 20:14:53 +05:30
uttarayan21	19ee636814	feat(ryu): added vicinae	2025-12-01 20:13:39 +05:30
uttarayan21	1c8f908375	feat: update flake inputs to 25.05 and add deploy command for ryu Some checks failed Flake checker / Build Nix targets (push) Has been cancelled Details	2025-12-01 19:19:41 +05:30
uttarayan21	cebf1c9052	fix(aichat): correct commit message generation instruction in prompt	2025-12-01 16:43:09 +05:30
uttarayan21	ddb42b131a	fix(ryu): remove openrazer group and add gamemode group for user	2025-12-01 16:40:48 +05:30