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

fix(configuration): add Wake on LAN to allowed UDP ports

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"];
+# }

darwin/kuro/configuration.nix

@@ -30,7 +30,7 @@
     '';
     package = pkgs.nixVersions.latest;
     buildMachines = [
-      ../../builders/mirai.nix
+      ../../builders/tako.nix
       ../../builders/shiro.nix
     ];
     distributedBuilds = true;

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;

darwin/shiro/homebrew.nix

@@ -6,14 +6,14 @@
     ];
     casks = [
       "docker"
-      "librewolf"
       "raycast"
-      "kunkun" # Soon
       "lunar"
       "virtual-desktop-streamer"
       "kicad"
       "shapr3d"
       "orcaslicer"
+      "zed"
+      "zen"
     ];
   };
 }

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

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 = {

flake.lock

@@ -2947,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,
@@ -4534,9 +4550,7 @@
     },
     "vicinae": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_13",
         "systems": "systems_26"
       },
       "locked": {

flake.nix

@@ -237,7 +237,7 @@
     };
     vicinae = {
       url = "github:vicinaehq/vicinae";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -255,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";

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];
 }

home/apps/vicinae.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   inputs,
   device,
   ...
@@ -8,5 +9,8 @@
     enable = device.is "ryu";
     autoStart = true;
     extensions = [];
+    # package = pkgs.vicinae.overrideAttrs (old: {
+    #   patches = [../../patches/vicinae-ctrl-np.patch];
+    # });
   };
 }

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,7 +174,7 @@
         */
         ''
           ---
-          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. Do not under any circumstance include any additional text or explanations, just add the commit message.
         '';

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;

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 = {

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;
 }

home/services/gui.nix

@@ -25,7 +25,7 @@
       nautilus
       totem
       ffmpegthumbnailer
-      polkit_gnome
+      # polkit_gnome
       seahorse
       signal-desktop
       # sony-headphones-client

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
     ];
   };
 }

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
     ];
@@ -199,10 +198,11 @@
         "tailscale0"
       ];
       allowedUDPPorts = [
-        4950
-        4955
-        3113
-      ]; # Warframe
+        9 # Wake on LAN
+        4950 # Warframe
+        4955 # Warframe
+        3113 # Other
+      ];
       allowedTCPPortRanges = [
         {
           from = 1714;

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";

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

nixos/tako/services/games/default.nix

@@ -1,7 +1,7 @@
 {...}: {
   imports = [
-    ./minecraft.nix
-    ./satisfactory.nix
-    ./terraria.nix
+    # ./minecraft.nix
+    # ./satisfactory.nix
+    # ./terraria.nix
   ];
 }

nixos/tsuba/configuration.nix

@@ -41,7 +41,6 @@
     distributedBuilds = true;
     buildMachines = [
       ../../builders/tako.nix
-      ../../builders/mirai.nix
       ../../builders/shiro.nix
     ];
   };

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/
   '';
 }

overlays.nix

@@ -162,7 +162,7 @@
         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=";
@@ -285,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

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) {