feat: disable prometheus for homeassistant

Reviewed-on: #1

AGENTS.md

@@ -4,28 +4,8 @@ This repository contains NixOS, nix-darwin, and Home Manager configurations in N
 
 ## Build, Test, and Deployment Commands
 
-### Build and Apply Configurations
+### Build and Apply Configurations & Deploy to Remote Machines
-
+Can use deploy for both local and remote hosts
-**Linux (NixOS):**
-```bash
-just build                          # Build configuration
-just install cores='32'             # Apply with 32 cores
-sudo nixos-rebuild test --fast --flake .  # Test without activation
-sudo nixos-rebuild switch --rollback --flake .  # Rollback
-```
-
-**macOS (nix-darwin):**
-```bash
-just build                          # Build configuration
-just install                        # Apply configuration
-```
-
-**Home Manager:**
-```bash
-just home
-```
-
-### Deploy to Remote Machines (deploy-rs)
 
 ```bash
 deploy -s .#ryu      # Desktop (x86_64-linux)
@@ -35,6 +15,23 @@ deploy -s .#kuro     # MacBook M4 Pro (aarch64-darwin)
 deploy -s .#shiro    # Mac Mini M4 (aarch64-darwin)
 ```
 
+**Linux (NixOS):**
+```bash
+deploy -s .#ryu 
+deploy -s .#tako
+deploy -s .#tako --builders '' --cores 32 # with no other builders and 32 cores
+deploy -s .#ryu --max-jobs 4 --cores 32 # use 32 cores and 4 parallel derivations
+sudo nixos-rebuild test --fast --flake .  # Test without activation
+sudo nixos-rebuild switch --rollback --flake .  # Rollback
+```
+
+**macOS (nix-darwin):**
+```bash
+deploy -s .#kuro
+deploy -s .#shiro
+sudo nix-darwin test --fast --flake .
+```
+
 ### Validation and Formatting
 
 ```bash
@@ -162,6 +159,11 @@ sessionVariables.BROWSER = if device.isDarwin then "open" else "xdg-open";
 just add program myprogram  # Creates home/programs/myprogram.nix and adds import
 ```
 
+### Adding a new dns entry
+```bash
+cfcli add --type A foobar.bazbar.biz 100.102.64.19
+```
+
 ### Creating a Module
 
 1. Determine location: `modules/nixos/`, `modules/darwin/`, or `modules/home/`

darwin/kuro/configuration.nix

@@ -22,6 +22,7 @@
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         # "mirai:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM="
       ];
+      download-buffer-size = 524288000;
     };
     extraOptions = ''
       build-users-group = nixbld

darwin/kuro/homebrew.nix

@@ -6,10 +6,7 @@
     casks = [
       "1password"
       "lunar"
-      "orcaslicer"
       "raycast"
-      "zed"
-      "zen"
     ];
   };
 }

darwin/shiro/homebrew.nix

@@ -2,15 +2,12 @@
   homebrew = {
     enable = true;
     brews = [
-      "docker-compose"
     ];
     casks = [
       "1password"
-      "docker"
       "raycast"
       "lunar"
       "orcaslicer"
-      "zed"
       "zen"
     ];
   };

darwin/shiro/services/default.nix

@@ -1,15 +1,18 @@
 {...}: {
   imports = [
     # ../../../modules/darwin/caddy
-    ./yabai.nix
+
-    ./skhd.nix
-    ./tailscale.nix
-    ./autossh.nix
-    # ./caddy.nix
-    ./sops.nix
-    # ./lmstudio.nix
-    # ./colima.nix
-    # ./zerotier.nix
     # ./aerospace.nix
+    # ./caddy.nix
+    # ./colima.nix
+    # ./lmstudio.nix
+    # ./zerotier.nix
+
+    ./autossh.nix
+    ./skhd.nix
+    ./sops.nix
+    ./sunshine.nix
+    ./tailscale.nix
+    ./yabai.nix
   ];
 }

darwin/shiro/services/sunshine.nix

@@ -0,0 +1,10 @@
+{...}: {
+  homebrew = {
+    taps = [
+      "lizardbyte/homebrew"
+    ];
+    brews = [
+      "lizardbyte/homebrew/sunshine-beta"
+    ];
+  };
+}

deploy.nix

@@ -5,14 +5,6 @@
   ...
 }: {
   nodes = {
-    mirai = {
-      hostname = "mirai.darksailor.dev";
-      profiles.system = {
-        sshUser = "fs0c131y";
-        path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
-        user = "root";
-      };
-    };
     tsuba = {
       hostname = "tsuba.darksailor.dev";
       profiles.system = {
@@ -55,13 +47,13 @@
         user = "root";
       };
     };
-    # deck = {
+    deck = {
-    #   hostname = "steamdeck";
+      hostname = "sdeck";
-    #   profiles.system = {
+      profiles.system = {
-    #     sshUser = "deck";
+        sshUser = "deck";
-    #     path = deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
+        path = deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
-    #     user = "deck";
+        user = "deck";
-    #   };
+      };
-    # };
+    };
   };
 }

flake.nix

@@ -17,10 +17,6 @@
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    stylix-stable = {
-      url = "github:nix-community/stylix/release-25.11";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
-    };
     home-manager-stable = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs-stable";
@@ -51,26 +47,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nur.url = "github:nix-community/nur";
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprlock = {
-      url = "github:hyprwm/hyprlock";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     zjstatus = {
       url = "github:dj95/zjstatus";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    openapi-tui = {
-      url = "github:zaghaghi/openapi-tui";
-      flake = false;
-    };
     musnix = {
       url = "github:musnix/musnix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -83,26 +63,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    csshacks = {
-      url = "github:MrOtherGuy/firefox-csshacks";
-      flake = false;
-    };
     nno = {
       url = "github:nvim-neorg/nixpkgs-neorg-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    pets = {
-      url = "github:giusgad/pets.nvim";
-      flake = false;
-    };
-    rest-nvim = {
-      url = "github:rest-nvim/rest.nvim";
-      flake = false;
-    };
-    neogit = {
-      url = "github:NeogitOrg/neogit/nightly";
-      flake = false;
-    };
     d2 = {
       url = "github:terrastruct/d2-vim";
       flake = false;
@@ -127,25 +91,6 @@
       url = "github:pest-parser/tree-sitter-pest";
       flake = false;
     };
-    navigator = {
-      url = "github:ray-x/navigator.lua";
-      flake = false;
-    };
-    guihua = {
-      url = "github:ray-x/guihua.lua";
-      flake = false;
-    };
-    ghostty = {
-      url = "github:ghostty-org/ghostty";
-    };
-    typr = {
-      url = "github:nvzone/typr";
-      flake = false;
-    };
-    volt = {
-      url = "github:nvzone/volt";
-      flake = false;
-    };
     arion = {
       url = "github:hercules-ci/arion";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -155,9 +100,9 @@
     };
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
-      # IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
+      # IMPORTANT: To ensure compatibility with the latest Firefox version, use nixpkgs-unstable.
-      # to have it up-to-date or simply don't specify the nixpkgs input
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
     };
 
     anyrun = {
@@ -169,18 +114,10 @@
       url = "github:uttarayan21/anyrun-hyprwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    anyrun-rink = {
-      url = "github:uttarayan21/anyrun-rink";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     onepassword-shell-plugins = {
       url = "github:1Password/shell-plugins";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zeronsd = {
-      url = "github:uttarayan21/zeronsd";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     tmux-float = {
       url = "github:uttarayan21/tmux-float";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -199,24 +136,6 @@
     #   url = "path:/home/servius/Projects/ALVR";
     #   inputs.nixpkgs.follows = "nixpkgs";
     # };
-    ik_llama = {
-      url = "github:ikawrakow/ik_llama.cpp?submodules=1";
-      # submodules = true;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    llama-cpp = {
-      # url = "https://github.com/ggml-org/llama.cpp";
-      url = "github:ggml-org/llama.cpp/b6178?submodules=1";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    yabai = {
-      url = "github:koekeishiya/yabai";
-      flake = false;
-    };
-    nix-auth = {
-      url = "github:numtide/nix-auth";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixpkgs-xr = {
       url = "github:nix-community/nixpkgs-xr";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -241,16 +160,33 @@
       url = "github:vicinaehq/vicinae";
       # inputs.nixpkgs.follows = "nixpkgs";
     };
-    wivrn = {
-      url = "github:uttarayan21/wivrn?submodules=1";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     eilmeldung = {
       url = "github:christo-auer/eilmeldung";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hytale-launcher = {
+    servius-website = {
-      url = "github:JPyke3/hytale-launcher-nix";
+      url = "git+https://git.darksailor.dev/servius/servius.neocities.org";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixify = {
+      url = "github:uttarayan21/nixify";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    tangled-core = {
+      url = "git+https://tangled.org/tangled.org/core";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    iamb = {
+      url = "github:ulyssa/iamb/latest";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    cinny = {
+      url = "github:cinnyapp/cinny/dev";
+      flake = false;
     };
   };
 
@@ -429,16 +365,20 @@
           };
           config.allowUnfree = true;
         };
+        cratesNix = inputs.crates-nix.mkLib {inherit pkgs;};
       in {
-        # packages = rec {
-        #   default = neovim;
-        #   neovim = pkgs.nixvim.makeNixvim (pkgs.callPackage ./neovim);
-        # };
         devShells = {
           default = pkgs.mkShell {
             packages = with pkgs; [sops just openssl ast-grep];
           };
         };
+        packages = {
+          default = cratesNix.buildCrate "ironclaw" {
+            nativeBuildInputs = [pkgs.pkg-config];
+            buildInputs = [pkgs.openssl];
+            doCheck = false;
+          };
+        };
       }
     );
 }

home/accounts/fastmail.nix

@@ -5,43 +5,65 @@
 }: {
   sops = {
     secrets."accounts/mail/fastmail" = {};
+    secrets."accounts/calendar/fastmail" = {};
   };
-  accounts.email = {
+  accounts = {
-    maildirBasePath = "Mail";
+    email = {
-    accounts = {
+      maildirBasePath = "Mail";
-      fastmail = rec {
+      accounts = {
-        maildir = {
+        fastmail = rec {
-          path = "fastmail";
+          maildir = {
+            path = "fastmail";
+          };
+          primary = true;
+          address = "email@uttarayan.me";
+          aliases = ["servius@darksailor.dev"];
+          userName = address;
+          realName = "Uttarayan Mondal";
+          imap = {
+            host = "imap.fastmail.com";
+            port = 993;
+            tls.enable = true;
+            # authentication = "login";
+          };
+          smtp = {
+            host = "smtp.fastmail.com";
+            port = 465;
+            tls.enable = true;
+          };
+          passwordCommand = ["cat" "${config.sops.secrets."accounts/mail/fastmail".path}"];
+          mbsync = {
+            enable = true;
+            create = "both";
+          };
         };
-        primary = true;
+      };
-        address = "email@uttarayan.me";
+    };
-        aliases = ["servius@darksailor.dev"];
+    calendar = {
-        userName = address;
+      basePath = "Calendar";
-        realName = "Uttarayan Mondal";
+      accounts = {
-        imap = {
+        fastmail = {
-          host = "imap.fastmail.com";
+          remote = {
-          port = 993;
+            url = "https://caldav.fastmail.com/dav/calendars/user/email@uttarayan.me";
-          tls.enable = true;
+            userName = "email@uttarayan.me";
-          # authentication = "login";
+            passwordCommand = ["cat" "${config.sops.secrets."accounts/calendar/fastmail".path}"];
-        };
+            type = "caldav";
-        smtp = {
+          };
-          host = "smtp.fastmail.com";
+          khal = {
-          port = 465;
+            enable = true;
-          tls.enable = true;
+            addresses = ["email@uttarayan.me"];
-        };
+            type = "discover";
-        imapnotify = {
+          };
-          enable = true;
+          vdirsyncer = {
-        };
+            enable = true;
-        passwordCommand = ["cat" "${config.sops.secrets."accounts/mail/fastmail".path}"];
+            conflictResolution = "remote wins";
-        mbsync = {
+            collections = ["from a"];
-          enable = true;
+            metadata = ["color" "displayname"];
-          create = "both";
+          };
         };
       };
     };
   };
-  programs.mbsync.enable = true;
-  services.mbsync.enable = pkgs.stdenv.isLinux;
   # accounts.email.accounts.<name>.mbsync.create
   # services.mbsync.enable = true;
 }

home/apps/affine.nix

@@ -0,0 +1,9 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.optionals pkgs.stdenv.isLinux [
+    pkgs.affine
+  ];
+}

home/apps/cinny.nix

@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.cinny-desktop];}

home/apps/default.nix

@@ -7,42 +7,47 @@ lib.optionalAttrs device.hasGui {
   imports = [
     # ./audacity.nix
     # ./bottles.nix
+    # ./cinny.nix
     # ./cursor.nix
     # ./gimp.nix
     # ./guitarix.nix
     # ./ida.nix
     # ./jellyflix.nix
     # ./kicad.nix
+    # ./lmstudio.nix
     # ./neovide.nix
     # ./openscad.nix
+    # ./orcaslicer.nix
     # ./pcsx2.nix
+    # ./prismlauncher.nix
     # ./rpcs3.nix
+    # ./shadps4.nix
     # ./thunderbird.nix
     # ./tsukimi.nix
     # ./vial.nix
+    # ./vlc.nix
     # ./vscode.nix
+    # ./zen.nix
 
+    ./moonlight.nix
+    # ./zed.nix
+
+    ./affine.nix
     ./blueman.nix
     ./chromium.nix
-    ./discord.nix
+    # ./discord.nix
     ./firefox.nix
     ./ghostty.nix
     ./hyprpicker.nix
     ./kitty.nix
-    ./lmstudio.nix
+    ./matrix.nix
     ./mpv.nix
     ./nextcloud.nix
-    ./matrix.nix
     ./obs-studio.nix
-    ./orcaslicer.nix
-    ./prismlauncher.nix
-    ./shadps4.nix
     ./slack.nix
     ./vicinae.nix
-    ./vlc.nix
     ./wezterm.nix
     ./zathura.nix
-    ./zed.nix
     ./zen.nix
   ];
 }

home/apps/discord.nix

@@ -3,13 +3,13 @@
   lib,
   ...
 }: {
-  home.packages = lib.optionals pkgs.stdenv.isLinux [
+  # home.packages = lib.optionals pkgs.stdenv.isLinux [
-    (pkgs.discord.override {
+  #   (pkgs.discord.override {
-      withOpenASAR = true;
+  #     withOpenASAR = true;
-      withVencord = true;
+  #     withVencord = true;
-    })
+  #   })
-    # pkgs.vesktop
+  #   # pkgs.vesktop
-    # pkgs.discord-canary
+  #   # pkgs.discord-canary
-    # pkgs.discord-ptb
+  #   # pkgs.discord-ptb
-  ];
+  # ];
 }

home/apps/kitty.nix

@@ -8,11 +8,8 @@
   stylix.targets.kitty.enable = false;
   programs.kitty = {
     enable = true;
-    # enable = false;
     font = {
-      # name = "FiraCode Nerd Font Mono";
       name = "Hasklug Nerd Font Mono";
-      # name = "Monaspace Krypton Var Light";
       size = lib.mkForce 13;
     };
     settings = {

home/apps/matrix.nix

@@ -6,7 +6,7 @@
 }: {
   home.packages = lib.optionals (device.is "ryu") [
     pkgs.fluffychat
-    pkgs.fractal
+    pkgs.element-desktop
     # pkgs.quaternion
   ];
 }

home/apps/moonlight.nix

@@ -0,0 +1,8 @@
+{
+  lib,
+  pkgs,
+  device,
+  ...
+}: {
+  home.packages = lib.optionals (device.name == "ryu") [pkgs.moonlight-qt];
+}

home/apps/mpv.nix

@@ -8,20 +8,20 @@
       loop-playlist = "inf";
     };
     profiles = {
-      hdr = {
+      # hdr = {
-        vo = "gpu-next";
+      #   vo = "gpu-next";
-        gpu-api = "vulkan";
+      #   gpu-api = "vulkan";
-        hdr-compute-peak = "yes";
+      #   hdr-compute-peak = "yes";
-        hdr-peak-detect = "yes";
+      #   hdr-peak-detect = "yes";
-        target-peak = 400;
+      #   target-peak = 400;
-        target-prim = "bt.2020";
+      #   target-prim = "bt.2020";
-        target-trc = "pq";
+      #   target-trc = "pq";
-        inverse-tone-mapping = "yes";
+      #   inverse-tone-mapping = "yes";
-        tone-mapping = "spline";
+      #   tone-mapping = "spline";
-        tone-mapping-mode = "auto";
+      #   tone-mapping-mode = "auto";
-        target-colorspace-hint = "auto";
+      #   target-colorspace-hint = "auto";
-        gamut-mapping = "desaturate";
+      #   gamut-mapping = "desaturate";
-      };
+      # };
     };
   };
 }

home/apps/vicinae.nix

@@ -12,7 +12,9 @@
       autoStart = true;
     };
   };
-  home.packages = with pkgs; [
+  home.packages = with pkgs;
-    pulseaudio
+    lib.optionals (device.is "ryu") [
-  ];
+      # pulseaudio
+      playerctl
+    ];
 }

home/apps/zen.nix

@@ -2,26 +2,151 @@
   pkgs,
   inputs,
   device,
+  config,
   ...
 }: {
   imports = [
     inputs.zen-browser.homeModules.beta
   ];
+  programs.zen-browser.darwinDefaultsId = "org.mozilla.firefox.plist";
   programs.zen-browser = {
-    enable = device.isLinux;
+    enable = true;
-    profiles.default = {
+    profiles.default = rec {
+      containersForce = true;
+      containers = {
+        Personal = {
+          color = "purple";
+          icon = "fingerprint";
+          id = 1;
+        };
+        Work = {
+          color = "blue";
+          icon = "briefcase";
+          id = 2;
+        };
+        Shopping = {
+          color = "yellow";
+          icon = "dollar";
+          id = 3;
+        };
+      };
+      spacesForce = true;
+      spaces = let
+        containers = config.programs.zen-browser.profiles."default".containers;
+      in {
+        "Personal" = {
+          id = "0b4dab19-9b39-4f2c-8ad1-0268d9fa2e49";
+          icon = "👤";
+          container = containers."Personal".id;
+          position = 1000;
+        };
+        "Work" = {
+          id = "8f687163-6b15-4c3c-885f-8ffe465b386f";
+          icon = "💼";
+          container = containers."Work".id;
+          position = 2000;
+        };
+        "Shopping" = {
+          id = "74f46a1b-cdd7-408c-98d7-382a2b11bd51";
+          icon = "💸";
+          container = containers."Shopping".id;
+          position = 3000;
+        };
+      };
       extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-        privacy-badger
-        violentmonkey
-        tridactyl
         clearurls
-        onepassword-password-manager
+        floccus
-        ublock-origin
         i-dont-care-about-cookies
         keepa
+        onepassword-password-manager
+        privacy-badger
         sponsorblock
-        floccus
+        tridactyl
+        ublock-origin
+        violentmonkey
       ];
+      search = {
+        force = true;
+        default = "ddg";
+        engines = {
+          mynixos = {
+            name = "My NixOS";
+            urls = [
+              {
+                template = "https://mynixos.com/search?q={searchTerms}";
+              }
+            ];
+
+            icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+            definedAliases = ["@nx"]; # Keep in mind that aliases defined here only work if they start with "@"
+          };
+          hm = {
+            name = "Home Manager Options";
+            urls = [
+              {
+                template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=master";
+              }
+            ];
+            definedAliases = ["@hm"];
+          };
+          nv = {
+            name = "NixVim";
+            urls = [
+              {
+                template = "https://nix-community.github.io/nixvim/search";
+                params = [
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+            definedAliases = ["@nv"];
+          };
+          lib = {
+            name = "Lib.rs";
+            urls = [
+              {
+                template = "https://lib.rs/search";
+                params = [
+                  {
+                    name = "q";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+            definedAliases = ["@lib"];
+          };
+          searchix = {
+            name = "Searchix";
+            urls = [
+              {
+                template = "https://searchix.ovh/?query={searchTerms}";
+              }
+            ];
+            definedAliases = ["sx"];
+          };
+        };
+      };
+      pins = {
+        dashboard = {
+          id = "d163f090-67b7-47d2-8f76-7d638b9f742b";
+          workspace = spaces.Personal.id;
+          url = "https://dashboard.darksailor.dev";
+          isEssential = true;
+          position = 101;
+        };
+        github = {
+          id = "db2f3e36-9279-4b8d-8b5d-52a90f34ea0d";
+          workspace = spaces.Personal.id;
+          url = "https://github.com";
+          isEssential = true;
+          position = 102;
+        };
+      };
+      pinsForce = true;
     };
     nativeMessagingHosts = [pkgs.tridactyl-native];
     policies = {

home/default.nix

@@ -27,6 +27,7 @@
     home-manager = {
       enable = true;
     };
+    man.generateCaches = true;
   };
 
   fonts.fontconfig.enable = true;

home/programs/calendar.nix

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  programs.khal = {
+    enable = true;
+    settings = {
+      default = {
+        # default_calendar = "fastmail";
+      };
+      view = {
+        agenda_event_format = "{calendar-color}{cancelled}{start-end-time-style} {title}{repeat-symbol}{reset}";
+      };
+    };
+  };
+  programs.qcal.enable = true;
+  programs.vdirsyncer.enable = true;
+  services.vdirsyncer.enable = true;
+  accounts.calendar.accounts.fastmail.qcal.enable = true;
+}

home/programs/carapace.nix

@@ -1,13 +1,8 @@
-{
+{...}: {
-  pkgs,
-  lib,
-  device,
-  ...
-}: {
   programs.
     carapace = {
     enable = false;
-    enableFishIntegration = true;
+    enableFishIntegration = false;
     enableNushellIntegration = true;
   };
 }

home/programs/cargo.nix

@@ -4,7 +4,9 @@
   cratesNix,
   ...
 }: let
-  cargo-credential-1password = cratesNix.buildCrate "cargo-credential-1password" {};
+  cargo-credential-1password = cratesNix.buildCrate "cargo-credential-1password" {
+    meta.mainProgram = "cargo-credential-1password";
+  };
 in
   lib.mkIf (!device.isServer) {
     home.file.".cargo/config.toml".text =
@@ -13,6 +15,7 @@ in
         [alias]
         lldb = ["with", "rust-lldb", "--"]
         t = ["nextest", "run"]
+        pkgs = ["metadata", "--no-deps", "--format-version", "1"]
 
         [net]
         git-fetch-with-cli = true

home/programs/cfcli.nix

@@ -0,0 +1,27 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  sops.secrets."cloudflare/darksailor_dev_api_key" = {};
+  home.packages = [
+    # (pkgs.stdenv.mkDerivation {
+    #   pname = "cfcli";
+    #   version = "0.1.0";
+    #   buildInputs = [pkgs.cloudflare-cli];
+    #   nativeBuildInputs = [pkgs.makeWrapper];
+    #   installPhase = ''
+    #     $out/bin/cfcli \
+    #       --run "export CF_API_KEY=\`cat -v ${config.sops.secrets."cloudflare/darksailor_dev_api_key".path}\`"
+    #   '';
+    # })
+    (pkgs.writeShellScriptBin
+      "cfcli"
+      ''
+        #!/bin/sh
+        export CF_API_KEY="$(cat -v ${config.sops.secrets."cloudflare/darksailor_dev_api_key".path})"
+        exec ${pkgs.cloudflare-cli}/bin/cfcli "$@"
+      '')
+  ];
+}

home/programs/codex.nix

@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.codex];}

home/programs/default.nix

@@ -7,6 +7,7 @@
     # ./bluetui.nix
     # ./goread.nix
     # ./helix.nix
+    # ./iamb.nix
     # ./magika.nix
     # ./mpd.nix
     # ./mpris-scrobbler.nix
@@ -19,6 +20,7 @@
     # ./template.nix
     # ./tuifeed.nix
     # ./xh.nix
+    # ./yt-dlp.nix
     # ./zellij.nix
 
     ../../modules
@@ -28,6 +30,7 @@
     ./alejandra.nix
     ./aria2.nix
     ./ast-grep.nix
+    ./attic.nix
     ./atuin.nix
     ./bat.nix
     ./binwalk.nix
@@ -35,8 +38,11 @@
     ./bottom.nix
     ./btop.nix
     ./cachix.nix
+    ./calendar.nix
     ./carapace.nix
     ./cargo.nix
+    ./cfcli.nix
+    ./codex.nix
     ./ddcbacklight.nix
     ./deploy-rs.nix
     ./direnv.nix
@@ -55,11 +61,13 @@
     ./himalaya.nix
     ./hyprshade.nix
     ./jq.nix
+    ./jujutsu.nix
     ./just.nix
     ./ncpamixer.nix
     ./neomutt.nix
     ./neovim.nix
     ./nix-index.nix
+    ./nixify.nix
     ./nushell.nix
     ./omnix.nix
     ./opencode.nix
@@ -76,8 +84,7 @@
     ./tmux.nix
     ./uv.nix
     ./yazi.nix
-    ./yt-dlp.nix
+    ./yq.nix
     ./zoxide.nix
-    ./attic.nix
   ];
 }

home/programs/deploy-rs.nix

@@ -1 +1,8 @@
-{pkgs, ...}: {home.packages = [pkgs.deploy-rs.deploy-rs];}
+{
+  pkgs,
+  lib,
+  device,
+  ...
+}: {
+  home.packages = lib.optionals (device.is "ryu") [pkgs.deploy-rs.deploy-rs];
+}

home/programs/fish.nix

@@ -23,6 +23,7 @@
       j = "just --choose";
       # t = "zellij a -c --index 0";
       t = "tmux";
+      neorg = "nvim -c ':Neorg index'";
     };
     shellAliases = {
       g = "git";
@@ -33,7 +34,7 @@
     '';
     # ${pkgs.spotify-player}/bin/spotify_player generate fish | source
     interactiveShellInit = ''
-      if test -n "$TMUX"; ${lib.getExe pkgs.fastfetch} --logo-type sixel; else ${lib.getExe pkgs.fastfetch}; end
+      if test -n "$TMUX"; ${lib.getExe pkgs.fastfetch} --logo-type kitty-icat; else ${lib.getExe pkgs.fastfetch}; end
       # ${pkgs.nb}/bin/nb todo undone
       ${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"}
       ${lib.optionalString (device.is "ryu") ''
@@ -43,6 +44,16 @@
       ''}
     '';
   };
+  home.shell.enableFishIntegration = true;
+
+  # programs.bash = {
+  #   enable = true;
+  #   initExtra = ''
+  #     if [[ $- == *i* && -z "$FISH_VERSION" ]]; then
+  #       ${lib.getExe pkgs.fish}
+  #     fi
+  #   '';
+  # };
 }
 // lib.optionalAttrs (!(device.is "tsuba")) {
   stylix.targets.fish.enable = false;

home/programs/iamb.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.iamb];
+}

home/programs/jujutsu.nix

@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.jujutsu];}

home/programs/neomutt.nix

@@ -1,4 +1,9 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  theme = builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/catppuccin/neomutt/refs/heads/main/neomuttrc";
+    sha256 = "sha256:1q086p5maqwxa4gh6z8g7h3nfavdmkbql025ibdhglpz46hsq0hs";
+  };
+in {
   programs.neomutt = {
     enable = true;
     vimKeys = true;
@@ -6,6 +11,9 @@
     sidebar = {
       enable = true;
     };
+    extraConfig = ''
+      source ${theme}
+    '';
   };
   programs.notmuch = {
     enable = true;
@@ -17,4 +25,38 @@
     enable = true;
     neomutt.enable = true;
   };
+  services.imapnotify = {
+    enable = true;
+    path = [pkgs.coreutils pkgs.isync pkgs.libnotify];
+  };
+  accounts.email.accounts.fastmail.imapnotify = {
+    enable = true;
+    boxes = ["Inbox"];
+    onNotify = "${pkgs.writeShellScript "mbsync-notify" ''
+      ${pkgs.isync}/bin/mbsync $1
+      ${pkgs.libnotify}/bin/notify-send "New Mail" "New email in $1"
+    ''} %s";
+  };
+  programs.mbsync.enable = true;
+  services.mbsync.enable = pkgs.stdenv.isLinux;
+
+  # launchd.agents.mbsync = {
+  #   enable = true;
+  #   config = {
+  #     # A label for the service
+  #     Label = "dev.darksailor.atuin-daemon";
+  #     # The command to run
+  #     ProgramArguments = [
+  #       "${pkgs.atuin}/bin/atuin"
+  #       "daemon"
+  #     ];
+  #     # Run the service when you log in
+  #     RunAtLoad = true;
+  #     # Keep the process alive, or restart if it dies
+  #     KeepAlive = true;
+  #     # Log files
+  #     StandardOutPath = "${device.home}/Library/Logs/atuin-daemon.log";
+  #     StandardErrorPath = "${device.home}/Library/Logs/atuin-daemon.error.log";
+  #   };
+  # };
 }

home/programs/nixify.nix

@@ -0,0 +1,9 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  home.packages = [
+    inputs.nixify.packages.${pkgs.system}.default
+  ];
+}

home/programs/nushell.nix

@@ -26,4 +26,5 @@
       }
     '';
   };
+  home.shell.enableNushellIntegration = true;
 }

home/programs/opencode.nix

@@ -6,5 +6,20 @@
 lib.optionalAttrs (device.is "ryu" || device.is "kuro") {
   programs.opencode = {
     enable = true;
+    settings.provider = {
+      ollama = {
+        models = {
+          "glm-4.7-flash" = {
+            # "_launch" = true;
+            name = "glm-4.7-flash";
+          };
+        };
+        name = "Ollama (local)";
+        npm = "@ai-sdk/openai-compatible";
+        options = {
+          baseURL = "https://ollama.darksailor.dev/v1";
+        };
+      };
+    };
   };
 }

home/programs/ssh.nix

@@ -16,11 +16,6 @@
         user = "git";
         host = "github.com";
       };
-      # mirai = {
-      #   user = "fs0c131y";
-      #   hostname = "mirai.darksailor.dev";
-      #   forwardAgent = true;
-      # };
       tako = {
         user = "servius";
         hostname = "tako.darksailor.dev";

home/programs/yazi.nix

@@ -17,5 +17,6 @@
         cache_dir = config.home.homeDirectory + "/.cache/yazi/previews";
       };
     };
+    shellWrapperName = "yy";
   };
 }

home/programs/yq.nix

@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.yq];}

home/scripts.nix

@@ -36,11 +36,11 @@ in {
       pkgs.writeShellApplication {
         name = "git-install-prepare-commit-msg";
         text = ''
-          cp ${../scripts/prepare-commit-msg} .git/hooks/prepare-commit-msg
+          ln -sf ${../scripts/prepare-commit-msg} .git/hooks/prepare-commit-msg
         '';
       }
     )
-    (mkScript ../scripts/yt-dlp.sh (with pkgs; [yt-dlp]))
+    # (mkScript ../scripts/yt-dlp.sh (with pkgs; [yt-dlp]))
-    (mkScript ../scripts/autossh.sh (with pkgs; [autossh openssh]))
+    # (mkScript ../scripts/autossh.sh (with pkgs; [autossh openssh]))
   ];
 }

home/services/default.nix

@@ -1,18 +1,20 @@
 {...}: {
   imports = [
+    ./gtk.nix
+    ./gui.nix
+    ./hyprland.nix
+    ./hyprmon.nix
+    ./hyprpaper.nix
+    ./ironbar
+    ./kdeconnect.nix
+    ./remmina.nix
+    # ./ollama.nix
     ./swaync.nix
     ./swayosd.nix
-    ./kdeconnect.nix
-    ./gtk.nix
-    # ./anyrun.nix
-    ./ironbar
-    ./gui.nix
-    # ./eww.nix
     ./xdg.nix
-    ./hyprmon.nix
+    ./ironclaw.nix
-    ./hyprland.nix
+    # ./anyrun.nix
-    ./hyprpaper.nix
+    # ./eww.nix
-    ./remmina.nix
     # ./wallpaperengine.nix
   ];
 }

home/services/hyprland.nix

@@ -2,6 +2,7 @@
   pkgs,
   device,
   lib,
+  inputs,
   ...
 }:
 # lib.optionalAttrs device.isNix
@@ -31,6 +32,8 @@
   wayland.windowManager.hyprland = {
     enable = device.is "ryu";
     systemd.enable = true;
+    package = pkgs.hyprland;
+    portalPackage = pkgs.xdph;
 
     settings = {
       # source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
@@ -61,9 +64,9 @@
         {
           output = device.monitors.secondary;
           mode = "2560x1440@170";
-          position = "-1440x-1120";
+          position = "-2560x0";
           scale = 1;
-          transform = 1;
+          transform = 0;
         }
         {
           output = device.monitors.tertiary;
@@ -172,7 +175,7 @@
 
       exec-once = [
         # "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
-        "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
+        "${pkgs.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
         # "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
         # "${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
         # "${pkgs.ironbar}/bin/ironbar"
@@ -203,7 +206,7 @@
         "$mainMod, d, exec, ${lib.getExe pkgs.vicinae} toggle"
         "$mainMod, Space, exec, ${lib.getExe pkgs.vicinae} toggle"
         "$mainMod, p, pseudo, # dwindle"
-        "$mainMod, v, togglesplit,"
+        "$mainMod, v, layoutmsg, togglesplit"
         "$mainMod, a, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
         "$mainMod, Tab, cyclenext"
         # Audio

home/services/hyprpaper.nix

@@ -8,8 +8,10 @@
     wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
     nextcloudWallpapers = name: config.home.homeDirectory + "/Nextcloud/Wallpapers/" + name;
     # silksongFleas = nextcloudWallpapers "silksong-fleas.jpg";
-    bocchiVertical = nextcloudWallpapers "bocchi-vertical.jpg";
+
-    silksongShadeLord = nextcloudWallpapers "silksong-shadelord.jpg";
+    # The artist https://www.bilibili.com/video/BV1s44y1S7MM/
+    bocchiVertical = nextcloudWallpapers "bocchi-guitar.jpg";
+    frieren = nextcloudWallpapers "frieren.png";
   in {
     enable = device.is "ryu";
     settings = {
@@ -17,12 +19,12 @@
       wallpaper = [
         {
           monitor = device.monitors.primary;
-          path = silksongShadeLord;
+          path = wallpapers.moon;
           fit_mode = "cover";
         }
         {
           monitor = device.monitors.secondary;
-          path = wallpapers.frieren_3;
+          path = frieren;
           fit_mode = "cover";
         }
         {

home/services/ironclaw.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  lib,
+  device,
+  ...
+}: {
+  home.packages =
+    lib.optionals (device.is "ryu")
+    [
+      pkgs.ironclaw
+    ];
+}

home/services/ollama.nix

@@ -0,0 +1,7 @@
+{
+  pkgs,
+  device,
+  ...
+}: {
+  services.ollama.enable = device.is "shiro";
+}

home/services/xdg.nix

@@ -2,6 +2,7 @@
   pkgs,
   lib,
   device,
+  inputs,
   ...
 }: {
   xdg.portal = {
@@ -10,10 +11,9 @@
       hyprland.default = ["hyprland"];
       common.default = ["*" "hyprland"];
     };
-    extraPortals = with pkgs; [
-      kdePackages.xdg-desktop-portal-kde
-      xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ];
   };
 }
+# // lib.optionalAttrs (device.is "ryu") {
+#   environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
+# }
+

modules/nixos/affine.nix

@@ -0,0 +1,162 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.services.affine;
+  dbName = "affine";
+  dbUser = "affine";
+in {
+  options.services.affine = {
+    enable = mkEnableOption "AFFiNE self-hosted workspace";
+
+    port = mkOption {
+      type = types.port;
+      default = 3010;
+      description = "Port for the AFFiNE server to listen on";
+    };
+
+    domain = mkOption {
+      type = types.str;
+      description = "Public domain for AFFiNE (e.g. notes.darksailor.dev)";
+    };
+
+    imageTag = mkOption {
+      type = types.str;
+      default = "stable";
+      description = "Docker image tag for AFFiNE (stable, beta, canary)";
+    };
+
+    dataDir = mkOption {
+      type = types.str;
+      default = "/var/lib/affine";
+      description = "Base data directory for AFFiNE storage";
+    };
+
+    environmentFiles = mkOption {
+      type = types.listOf types.path;
+      default = [];
+      description = "Environment files containing secrets (DB password, etc.)";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Create data directories
+    systemd.tmpfiles.rules = [
+      "d ${cfg.dataDir} 0755 root root -"
+      "d ${cfg.dataDir}/storage 0755 root root -"
+      "d ${cfg.dataDir}/config 0755 root root -"
+      "d ${cfg.dataDir}/postgres 0700 root root -"
+      "d ${cfg.dataDir}/redis 0755 root root -"
+    ];
+
+    virtualisation.oci-containers = {
+      backend = "docker";
+      containers = {
+        affine-postgres = {
+          image = "pgvector/pgvector:pg16";
+          volumes = [
+            "${cfg.dataDir}/postgres:/var/lib/postgresql/data"
+          ];
+          environment = {
+            POSTGRES_USER = dbUser;
+            POSTGRES_DB = dbName;
+            POSTGRES_INITDB_ARGS = "--data-checksums";
+            POSTGRES_HOST_AUTH_METHOD = "trust";
+          };
+          environmentFiles = cfg.environmentFiles;
+          extraOptions = [
+            "--health-cmd=pg_isready -U ${dbUser} -d ${dbName}"
+            "--health-interval=10s"
+            "--health-timeout=5s"
+            "--health-retries=5"
+          ];
+          networks = ["affine-net"];
+        };
+
+        affine-redis = {
+          image = "redis:7";
+          volumes = [
+            "${cfg.dataDir}/redis:/data"
+          ];
+          networks = ["affine-net"];
+          extraOptions = [
+            "--health-cmd=redis-cli --raw incr ping"
+            "--health-interval=10s"
+            "--health-timeout=5s"
+            "--health-retries=5"
+          ];
+        };
+
+        affine = {
+          image = "ghcr.io/toeverything/affine:${cfg.imageTag}";
+          ports = ["127.0.0.1:${toString cfg.port}:3010"];
+          dependsOn = [
+            "affine-postgres"
+            "affine-redis"
+            "affine-migration"
+          ];
+          volumes = [
+            "${cfg.dataDir}/storage:/root/.affine/storage"
+            "${cfg.dataDir}/config:/root/.affine/config"
+          ];
+          environment = {
+            AFFINE_SERVER_PORT = "3010";
+            AFFINE_SERVER_HOST = cfg.domain;
+            AFFINE_SERVER_HTTPS = "true";
+            AFFINE_SERVER_EXTERNAL_URL = "https://${cfg.domain}";
+            REDIS_SERVER_HOST = "affine-redis";
+            DATABASE_URL = "postgresql://${dbUser}:$${AFFINE_DB_PASSWORD:-affine}@affine-postgres:5432/${dbName}";
+            AFFINE_INDEXER_ENABLED = "false";
+          };
+          environmentFiles = cfg.environmentFiles;
+          networks = ["affine-net"];
+        };
+
+        affine-migration = {
+          image = "ghcr.io/toeverything/affine:${cfg.imageTag}";
+          dependsOn = [
+            "affine-postgres"
+            "affine-redis"
+          ];
+          volumes = [
+            "${cfg.dataDir}/storage:/root/.affine/storage"
+            "${cfg.dataDir}/config:/root/.affine/config"
+          ];
+          cmd = ["sh" "-c" "node ./scripts/self-host-predeploy.js"];
+          environment = {
+            REDIS_SERVER_HOST = "affine-redis";
+            DATABASE_URL = "postgresql://${dbUser}:$${AFFINE_DB_PASSWORD:-affine}@affine-postgres:5432/${dbName}";
+            AFFINE_INDEXER_ENABLED = "false";
+          };
+          environmentFiles = cfg.environmentFiles;
+          networks = ["affine-net"];
+        };
+      };
+    };
+
+    # Create the Docker network
+    # systemd.services.affine-network = {
+    #   description = "Create AFFiNE Docker network";
+    #   after = ["docker.service"];
+    #   wantedBy = ["multi-user.target"];
+    #   serviceConfig = {
+    #     Type = "oneshot";
+    #     RemainAfterExit = true;
+    #     # ExecStart = "${config.virtualisation.docker.package}/bin/docker network create affine-net";
+    #     # ExecStop = "${config.virtualisation.docker.package}/bin/docker network remove affine-net";
+    #   };
+    # };
+    #
+    # Ensure containers start after the network is created
+    # systemd.services.docker-affine.after = ["affine-network.service"];
+    # systemd.services.docker-affine.requires = ["affine-network.service"];
+    # systemd.services.docker-affine-postgres.after = ["affine-network.service"];
+    # systemd.services.docker-affine-postgres.requires = ["affine-network.service"];
+    # systemd.services.docker-affine-redis.after = ["affine-network.service"];
+    # systemd.services.docker-affine-redis.requires = ["affine-network.service"];
+    # systemd.services.docker-affine-migration.after = ["affine-network.service"];
+    # systemd.services.docker-affine-migration.requires = ["affine-network.service"];
+  };
+}

modules/nixos/substituters.nix

@@ -1,50 +1,19 @@
-{
+{...}: {
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.nix.substituters;
-in {
-  options.nix.substituters = {
-    enableCuda = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable NixOS CUDA cache";
-    };
-
-    enableLlamaCpp = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable llama-cpp cache";
-    };
-  };
-
   config = {
     nix.settings = {
-      trusted-substituters =
+      trusted-substituters = [
-        [
+        "https://nix-community.cachix.org"
-          "https://nix-community.cachix.org"
+        "https://nixos-raspberrypi.cachix.org"
-          "https://nixos-raspberrypi.cachix.org"
+        "https://llama-cpp.cachix.org"
-        ]
+        "https://cache.nixos-cuda.org"
-        ++ optionals cfg.enableLlamaCpp [
+      ];
-          "https://llama-cpp.cachix.org"
-        ]
-        ++ optionals cfg.enableCuda [
-          "https://cache.nixos-cuda.org"
-        ];
 
-      trusted-public-keys =
+      trusted-public-keys = [
-        [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
-          "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
+        "llama-cpp.cachix.org-1:H75X+w83wUKTIPSO1KWy9ADUrzThyGs8P5tmAbkWhQc="
-        ]
+        "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
-        ++ optionals cfg.enableLlamaCpp [
+      ];
-          "llama-cpp.cachix.org-1:H75X+w83wUKTIPSO1KWy9ADUrzThyGs8P5tmAbkWhQc="
-        ]
-        ++ optionals cfg.enableCuda [
-          "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
-        ];
     };
   };
 }

neovim/default.nix

@@ -289,7 +289,7 @@ in {
         "core.keybinds" = {
           config = {
             default_keybinds = true;
-            neorg_leader = "<C-m>";
+            neorg_leader = "<C-i>";
           };
         };
         "core.integrations.treesitter" = {
@@ -620,6 +620,21 @@ in {
         };
         sources = {
           cmdline = [];
+          # default =
+          # rawLua
+          # /*
+          # lua
+          # */
+          # ''
+          #   function(ctx)
+          #     local success, node = pcall(vim.treesitter.get_node)
+          #     if success and node and vim.tbl_contains({ 'comment', 'line_comment', 'block_comment' }, node:type()) then
+          #       return { 'buffer' }
+          #     else
+          #       return { 'git', 'lsp', 'path', 'snippets', 'buffer', 'dictionary', 'ripgrep', 'tmux' }
+          #     end
+          #   end
+          # '';
           default = [
             "git"
             "lsp"
@@ -628,6 +643,7 @@ in {
             "path"
             "buffer"
             "ripgrep"
+            # "tmux"
           ];
           providers = {
             buffer = {
@@ -639,23 +655,30 @@ in {
             path = {};
             dictionary = {
               module = "blink-cmp-dictionary";
-              name = "Dict";
+              name = "dict";
               min_keyword_length = 3;
               opts = {
               };
             };
             git = {
               module = "blink-cmp-git";
-              name = "Git";
+              name = "git";
               opts = {
                 # -- options for the blink-cmp-git
               };
             };
             ripgrep = {
               module = "blink-ripgrep";
-              name = "Ripgrep";
+              name = "ripgrep";
               opts = {};
             };
+            # tmux = {
+            #   module = "blink-cmp-tmux";
+            #   name = "tmux";
+            #   opts = {
+            #     triggered_only = false;
+            #   };
+            # };
           };
         };
       };
@@ -663,8 +686,9 @@ in {
     blink-ripgrep.enable = true;
     blink-cmp-git.enable = true;
     blink-cmp-dictionary.enable = true;
-    blink-cmp-copilot.enable = true;
+    # blink-cmp-copilot.enable = true;
     blink-cmp-spell.enable = true;
+    blink-cmp-tmux.enable = true;
     blink-compat = {
       enable = true;
       settings.impersonate_nvim_cmp = true;

neovim/overlays.nix

@@ -42,8 +42,8 @@
       };
   };
 in [
-  inputs.nno.overlays.default
   inputs.nixvim.overlays.default
-  vimPlugins
+  inputs.nno.overlays.default
   tree-sitter-grammars
+  vimPlugins
 ]

nixos/default.nix

@@ -28,6 +28,7 @@
           inputs.sops-nix.nixosModules.sops
           inputs.stylix.nixosModules.stylix
           inputs.headplane.nixosModules.headplane
+          inputs.tangled-core.nixosModules.knot
 
           ./${device.name}/configuration.nix
           ../home/module.nix

nixos/documentation.nix

@@ -4,4 +4,5 @@
   documentation.dev.enable = true;
   documentation.doc.enable = true;
   documentation.nixos.enable = true;
+  documentation.man.cache.enable = true;
 }

nixos/ryu/apps/crosspipe.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [crosspipe];
+}

nixos/ryu/apps/default.nix

@@ -7,6 +7,11 @@
     # ./alvr.nix
     ./easyeffects.nix
     ./vr.nix
-    ./helvum.nix
+    ./crosspipe.nix
+    # ./wine.nix
+    # ./virt.nix
+    ./gparted.nix
+    ./nvtop.nix
+    # ./qpwgraph.nix
   ];
 }

nixos/ryu/apps/gparted.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [gparted];
+}

nixos/ryu/apps/helvum.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [helvum];
-}

nixos/ryu/apps/nvtop.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [nvtopPackages.nvidia];
+}

nixos/ryu/apps/qpwgraph.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [qpwgraph];
+}

nixos/ryu/apps/virt.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    virt-manager
+    quickemu
+  ];
+}

nixos/ryu/apps/wine.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    wine-wayland
+    winetricks
+    wineWowPackages.waylandFull
+  ];
+}

nixos/ryu/configuration.nix

@@ -2,6 +2,8 @@
   pkgs,
   lib,
   device,
+  config,
+  inputs,
   ...
 }: {
   imports = [
@@ -21,15 +23,6 @@
     tctiEnvironment.enable = true;
   };
 
-  programs = {
-    hyprland = {
-      enable = true;
-      withUWSM = true;
-      xwayland.enable = true;
-    };
-    uwsm.enable = true;
-  };
-
   systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
   # systemd.tmpfiles.rules = [
   #   "L+ /etc/gdm/.config/monitors.xml - - - - ${./monitors.xml}"
@@ -47,6 +40,8 @@
       auto-optimise-store = true;
       extra-experimental-features = "nix-command flakes auto-allocate-uids";
       trusted-users = [device.user];
+      extra-sandbox-paths = [config.programs.ccache.cacheDir];
+      download-buffer-size = 524288000;
     };
     extraOptions = ''
       build-users-group = nixbld
@@ -65,11 +60,6 @@
       # ../../builders/tsuba.nix
     ];
     distributedBuilds = true;
-    # Enable CUDA and llama-cpp caches
-    substituters = {
-      enableCuda = true;
-      enableLlamaCpp = true;
-    };
   };
 
   users.users.${device.user} = {
@@ -291,42 +281,6 @@
   fonts.fontconfig.enable = true;
   fonts.fontDir.enable = true;
   environment = {
-    # List packages installed in system profile. To search, run:
-    # $ nix search wget
-    systemPackages = with pkgs; [
-      v4l-utils
-      polychromatic
-      openrazer-daemon
-      cudatoolkit
-      # Wine
-      wine-wayland
-      winetricks
-      wineWowPackages.waylandFull
-
-      virt-manager
-      gparted
-      nvtopPackages.nvidia
-      quickemu
-      # (nixvim.makeNixvim (import ../../neovim))
-      qpwgraph
-      hyprland
-      xorg.xhost
-      foot
-      git
-      fish
-      nushell
-      # (pkgs.wrapFirefox
-      #   (pkgs.firefox-unwrapped.override {pipewireSupport = true;})
-      #   {})
-      gnumake
-      python3
-      nerd-fonts.fira-code
-      nerd-fonts.hasklug
-      nerd-fonts.symbols-only
-      monaspace
-      ddcutil
-      libnotify
-    ];
     sessionVariables = {
       WLR_NO_HARDWARE_CURSORS = "1";
       NIXOS_OZONE_WL = "1";

nixos/ryu/games/default.nix

@@ -1,5 +1,5 @@
 {...}: {
   imports = [
-    ./hytale.nix
+    # ./hytale.nix
   ];
 }

nixos/ryu/programs/ccache.nix

@@ -0,0 +1,6 @@
+{...}: {
+  programs.ccache = {
+    enable = true;
+    packageNames = ["ollama" "orca-slicer" "opencv" "onnxruntime" "obs-studio" "llama-cpp"];
+  };
+}

nixos/ryu/programs/cuda.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [cudatoolkit];
+}

nixos/ryu/programs/ddcutil.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [ddcutil];
+}

nixos/ryu/programs/default.nix

@@ -4,7 +4,7 @@
     ./steam.nix
     ./1password.nix
     ./localsend.nix
-    ./appimage.nix
+    # ./appimage.nix
     ./obs-studio.nix
     ./gnome-disks.nix
     ./nix-ld.nix
@@ -12,5 +12,16 @@
     ./droidcam.nix
     ./wireshark.nix
     ./flatpak.nix
+    ./v4l-utils.nix
+    ./razer.nix
+    ./cuda.nix
+    ./fonts.nix
+    ./dev.nix
+    ./shells.nix
+    ./hyprland.nix
+    ./foot.nix
+    ./ddcutil.nix
+    ./libnotify.nix
+    ./fish.nix
   ];
 }

nixos/ryu/programs/dev.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    git
+    gnumake
+    python3
+  ];
+}

nixos/ryu/programs/fish.nix

@@ -0,0 +1,7 @@
+{...}: {
+  programs.fish = {
+    enable = true;
+    generateCompletions = true;
+  };
+  stylix.targets.fish.enable = false;
+}

nixos/ryu/programs/fonts.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    nerd-fonts.fira-code
+    nerd-fonts.hasklug
+    nerd-fonts.symbols-only
+    monaspace
+  ];
+}

nixos/ryu/programs/foot.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [foot];
+}

nixos/ryu/programs/gamemode.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   device,
+  lib,
   ...
 }: {
   programs.gamemode = {
@@ -12,7 +13,7 @@
       custom = {
         start = let
           out = pkgs.writeScriptBin "gamemode-start" ''
-            ${pkgs.lmstudio}/bin/lms unload
+            ${lib.getExe pkgs.ollama} ps | tail +2 | cut -d' ' -f1 | xargs ${lib.getExe pkgs.ollama} stop
             ${pkgs.libnotify}/bin/notify-send 'GameMode started'
           '';
         in "${out}/bin/gamemode-start";

nixos/ryu/programs/hyprland.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    xhost
+  ];
+  programs = {
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+      xwayland.enable = true;
+      package = pkgs.hyprland;
+      portalPackage = pkgs.xdph;
+    };
+    uwsm.enable = true;
+  };
+}

nixos/ryu/programs/libnotify.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [libnotify];
+}

nixos/ryu/programs/razer.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    polychromatic
+    openrazer-daemon
+  ];
+}

nixos/ryu/programs/shells.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    fish
+    nushell
+  ];
+}

nixos/ryu/programs/v4l-utils.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [v4l-utils];
+}

nixos/ryu/programs/wireshark.nix

@@ -7,8 +7,5 @@
     enable = true;
     dumpcap.enable = true;
   };
-  environment.systemPackages = with pkgs; [
-    wireshark-qt
-  ];
   users.users.${device.user}.extraGroups = ["wireshark"];
 }

nixos/ryu/ryu.nix

@@ -130,11 +130,10 @@
     options = ["nofail"];
   };
 
-  # fileSystems."/volumes/windows-games" = {
+  fileSystems."/var" = {
-  #   device = "/dev/disk/by-partuuid/56359fb7-7d33-44d2-bebd-b0c53daeeb73";
+    device = "/dev/disk/by-uuid/ff874913-dc21-43f3-82f8-cdf45dd888f7";
-  #   fsType = "ntfs3";
+    fsType = "ext4";
-  #   options = ["nofail"];
+  };
-  # };
 
   swapDevices = [
     {

nixos/tako/configuration.nix

@@ -57,9 +57,6 @@
     };
     package = pkgs.nixVersions.nix_2_32; # deploy-rs doesn't work with nix >= 2.32
     distributedBuilds = true;
-    substituters = {
-      enableCuda = true;
-    };
   };
 
   users.users.${device.user} = {

nixos/tako/services/affine.nix

@@ -0,0 +1,89 @@
+{config, ...}: let
+  domain = "notes.darksailor.dev";
+in {
+  imports = [
+    ../../../modules/nixos/affine.nix
+  ];
+
+  # SOPS secrets
+  sops = {
+    secrets = {
+      "affine/db_password" = {};
+      "authelia/oidc/affine/client_id" = {
+        owner = config.systemd.services.authelia-darksailor.serviceConfig.User;
+        mode = "0440";
+        restartUnits = ["authelia-darksailor.service"];
+      };
+      "authelia/oidc/affine/client_secret" = {
+        owner = config.systemd.services.authelia-darksailor.serviceConfig.User;
+        mode = "0440";
+        restartUnits = ["authelia-darksailor.service"];
+      };
+    };
+    templates."affine.env".content = ''
+      AFFINE_DB_PASSWORD=${config.sops.placeholder."affine/db_password"}
+      POSTGRES_PASSWORD=${config.sops.placeholder."affine/db_password"}
+      AFFINE_SERVER_EXTERNAL_URL=https://${domain}
+    '';
+  };
+
+  # Enable AFFiNE service
+  services.affine = {
+    enable = true;
+    inherit domain;
+    environmentFiles = [
+      config.sops.templates."affine.env".path
+    ];
+  };
+
+  # Caddy reverse proxy with SSO forward auth
+  services.caddy.virtualHosts."${domain}".extraConfig = ''
+    reverse_proxy localhost:${toString config.services.affine.port}
+  '';
+
+  # Authelia access control rules
+  services.authelia.instances.darksailor.settings = {
+    access_control.rules = [
+      {
+        inherit domain;
+        policy = "bypass";
+        resources = [
+          "^/api/(sync|awareness)([/?].*)?$"
+          "^/socket\\.io([/?].*)?$"
+        ];
+      }
+      {
+        inherit domain;
+        policy = "one_factor";
+      }
+    ];
+    # OIDC client for AFFiNE
+    identity_providers.oidc.clients = [
+      {
+        client_name = "AFFiNE: Darksailor";
+        client_id = ''{{ secret "${config.sops.secrets."authelia/oidc/affine/client_id".path}" }}'';
+        client_secret = ''{{ secret "${config.sops.secrets."authelia/oidc/affine/client_secret".path}" }}'';
+        public = false;
+        authorization_policy = "one_factor";
+        require_pkce = false;
+        redirect_uris = [
+          "https://${domain}/oauth/callback"
+        ];
+        scopes = [
+          "openid"
+          "email"
+          "profile"
+        ];
+        response_types = ["code"];
+        grant_types = ["authorization_code"];
+        userinfo_signed_response_alg = "none";
+        token_endpoint_auth_method = "client_secret_post";
+      }
+    ];
+  };
+
+  # Ensure containers start after secrets are available
+  systemd.services.docker-affine.after = ["sops-install-secrets.service"];
+  systemd.services.docker-affine-migration.after = ["sops-install-secrets.service"];
+  systemd.services.docker-affine-postgres.after = ["sops-install-secrets.service"];
+}

nixos/tako/services/default.nix

@@ -1,31 +1,35 @@
 {...}: {
   imports = [
-    ./attic.nix
     ./atuin.nix
     ./authelia.nix
     ./caddy.nix
-    ./excalidraw.nix
     ./fail2ban.nix
-    ./flaresolverr.nix
-    ./games
-    ./gitea.nix
     ./homepage.nix
-    ./immich.nix
-    ./kellnr.nix
     ./lldap.nix
-    ./llms.nix
-    ./matrix
-    ./monitoring.nix
     ./navidrome.nix
     ./nextcloud.nix
     ./openssh.nix
-    ./prowlarr.nix
     ./resolved.nix
-    ./searxng.nix
-    ./shitpost.nix
     ./tailscale.nix
+    ./gitea.nix
+    ./knot.nix
+
+    ./affine.nix
+    ./attic.nix
+    ./excalidraw.nix
+    ./flaresolverr.nix
+    # ./games
     # ./headscale.nix
+    ./immich.nix
+    ./kellnr.nix
+    ./llms.nix
+    ./matrix
+    ./monitoring.nix
+    # ./servius-website.nix
     # ./paperless.nix
+    ./prowlarr.nix
+    # ./searxng.nix
+    ./shitpost.nix
   ];
   services = {
     nix-serve = {

nixos/tako/services/fail2ban.nix

@@ -16,6 +16,7 @@
       ignoreIP = [
         "106.219.121.52"
         "106.219.122.125"
+        "106.219.122.221"
       ];
     };
   };

nixos/tako/services/headscale.nix

@@ -34,12 +34,12 @@
         };
       };
     };
-    # headplane = {
+    headplane = {
-    #   enable = true;
+      enable = true;
-    #   settings = {
+      settings = {
-    #     server.port = 42562;
+        server.port = 42562;
-    #   };
+      };
-    # };
+    };
     caddy = {
       virtualHosts."headscale.darksailor.dev".extraConfig = ''
         reverse_proxy localhost:${toString config.services.headplane.settings.server.port}

nixos/tako/services/homepage.nix

@@ -59,6 +59,14 @@
                 siteMonitor = "https://deluge.tsuba.darksailor.dev";
               };
             }
+            {
+              "Aria2" = {
+                icon = "aria2.png";
+                description = "Aria2: Download Manager";
+                href = "https://aria2.tsuba.darksailor.dev";
+                siteMonitor = "https://aria2.tsuba.darksailor.dev";
+              };
+            }
             {
               "Home Assistant" = {
                 icon = "home-assistant.png";
@@ -198,19 +206,19 @@
         reverse_proxy localhost:${builtins.toString config.services.homepage-dashboard.listenPort}
       '';
     };
-    # authelia = {
+    authelia = {
-    #   instances.darksailor = {
+      instances.darksailor = {
-    #     settings = {
+        settings = {
-    #       access_control = {
+          access_control = {
-    #         rules = [
+            rules = [
-    #           {
+              {
-    #             domain = "dashboard.darksailor.dev";
+                domain = "dashboard.darksailor.dev";
-    #             policy = "one_factor";
+                policy = "one_factor";
-    #           }
+              }
-    #         ];
+            ];
-    #       };
+          };
-    #     };
+        };
-    #   };
+      };
-    # };
+    };
   };
 }

nixos/tako/services/knot.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  inputs,
+  pkgs,
+  ...
+}: {
+  services.tangled.knot = {
+    enable = true;
+    package = inputs.tangled-core.packages.${pkgs.system}.knot;
+    server = {
+      hostname = "tangled.darksailor.dev";
+      owner = "did:plc:tllyvpa5oxw6fwwhkj3kv6dr";
+      listenAddr = "127.0.0.1:5969";
+    };
+  };
+
+  services.caddy.virtualHosts."tangled.darksailor.dev".extraConfig = ''
+    reverse_proxy ${config.services.tangled.knot.server.listenAddr} {
+        header_up Host {host}
+        header_up X-Real-IP {remote}
+        header_up X-Forwarded-For {remote}
+        header_up X-Forwarded-Proto {scheme}
+    }
+    handle /events/* {
+        reverse_proxy ${config.services.tangled.knot.server.listenAddr} {
+            header_up X-Forwarded-For {remote}
+            header_up Host {host}
+        }
+    }
+  '';
+}

nixos/tako/services/matrix/cinny.nix

@@ -0,0 +1,66 @@
+{
+  pkgs,
+  config,
+  inputs,
+  ...
+}: let
+  base_domain = "darksailor.dev";
+  cinnyConfig = builtins.toJSON {
+    defaultHomeserver = 0;
+    homeserverList = ["darksailor.dev" "matrix.org"];
+    allowCustomHomeservers = false;
+    hashRouter = {
+      enabled = true;
+      basename = "/";
+    };
+  };
+  cinnyConfigFile = pkgs.writeText "cinny-config.json" cinnyConfig;
+  cinny = with pkgs;
+    buildNpmPackage rec {
+      pname = "cinny-unwrapped";
+      version = "4.11.1";
+      src = inputs.cinny;
+
+      nodejs = nodejs_22;
+
+      npmDepsHash = "sha256-27WFjb08p09aJRi0S2PvYq3bivEuG5+z2QhFahTSj4Q=";
+
+      nativeBuildInputs = [
+        python3
+        pkg-config
+      ];
+
+      buildInputs =
+        [
+          pixman
+          cairo
+          pango
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [giflib];
+
+      installPhase = ''
+        runHook preInstall
+
+        cp -r dist $out
+
+        runHook postInstall
+      '';
+    };
+in {
+  services.caddy.virtualHosts = {
+    "matrix.${base_domain}".extraConfig = ''
+      handle /_matrix/* {
+        reverse_proxy /_matrix/* localhost:${toString (builtins.elemAt config.services.matrix-tuwunel.settings.global.port 0)}
+      }
+      handle_path /config.json  {
+        file_server
+        root ${cinnyConfigFile}
+      }
+      handle {
+          root * ${cinny}
+          try_files {path} /index.html
+          file_server
+      }
+    '';
+  };
+}

nixos/tako/services/matrix/default.nix

@@ -1,7 +1,8 @@
 {...}: {
   imports = [
     ./tuwunel.nix
-    # ./signal.nix // libolm deprecated
+    ./cinny.nix
+    # ./signal.nix
     # ./discord.nix
   ];
 }

nixos/tako/services/matrix/tuwunel.nix

@@ -6,19 +6,8 @@
   port = 6167;
   base_domain = "darksailor.dev";
   client_id = "tuwunel";
-  elementConfig = builtins.toJSON {
+  rtc_domain = "matrix-rtc.${base_domain}";
-    default_server_config = {
+  jwt_port = 8081;
-      "m.homeserver" = {
-        base_url = "https://matrix.${base_domain}";
-      };
-    };
-    sso_redirect_options = {
-      immediate = false;
-      on_welcome_page = true;
-      on_login_page = true;
-    };
-  };
-  elementConfigFile = pkgs.writeText "element-config.json" elementConfig;
 in {
   sops = {
     secrets."tuwunel/client_id" = {
@@ -32,6 +21,11 @@ in {
       mode = "0440";
     };
     secrets."tuwunel/registration_token".owner = config.services.matrix-tuwunel.user;
+    secrets."livekit/key_name" = {};
+    secrets."livekit/key_secret" = {};
+    templates."livekit-keys".content = ''
+      ${config.sops.placeholder."livekit/key_name"}: ${config.sops.placeholder."livekit/key_secret"}
+    '';
   };
   services.matrix-tuwunel = {
     enable = true;
@@ -56,31 +50,91 @@ in {
       well_known = {
         client = "https://matrix.${base_domain}";
         server = "matrix.${base_domain}:443";
+        rtc_transports = [
+          {
+            type = "livekit";
+            livekit_service_url = "https://${rtc_domain}";
+          }
+        ];
       };
     };
     package = pkgs.matrix-tuwunel;
   };
   services.caddy.virtualHosts = {
-    "matrix.${base_domain}".extraConfig = ''
+    # "matrix.${base_domain}".extraConfig = ''
-      reverse_proxy /_matrix/* localhost:${toString port}
+    #   handle /_matrix/* {
-      handle_path /config.json  {
+    #     reverse_proxy /_matrix/* localhost:${toString port}
-        file_server
+    #   }
-        root ${elementConfigFile}
+    #   handle_path /config.json  {
-      }
+    #     file_server
-      root * ${pkgs.element-web}
+    #     root ${cinnyConfigFile}
-      file_server
+    #   }
-    '';
+    #   handle {
+    #       root * ${cinny}
+    #       try_files {path} /index.html
+    #       file_server
+    #   }
+    # '';
     "${base_domain}".extraConfig = ''
       reverse_proxy /.well-known/* localhost:${toString port}
     '';
-    # "matrix.${base_domain}:8448".extraConfig = ''
+    "${rtc_domain}".extraConfig = ''
-    #   reverse_proxy /_matrix/* localhost:${toString port}
+      @jwt_service {
-    # '';
+        path /sfu/get* /healthz*
+      }
+      handle @jwt_service {
+        reverse_proxy localhost:${toString jwt_port}
+      }
+      handle {
+        reverse_proxy localhost:${toString config.services.livekit.settings.port} {
+          header_up Connection "upgrade"
+          header_up Upgrade {http.request.header.Upgrade}
+        }
+      }
+    '';
+  };
+  networking.firewall = {
+    allowedTCPPorts = [8448 7881];
+    allowedUDPPorts = [3478];
+    allowedUDPPortRanges = [
+      {
+        from = 50300;
+        to = 65535;
+      }
+    ];
   };
-  networking.firewall.allowedTCPPorts = [8448];
 
   users.users.${config.services.caddy.user}.extraGroups = [config.services.matrix-tuwunel.group];
 
+  services.livekit = {
+    enable = true;
+    keyFile = config.sops.templates."livekit-keys".path;
+    openFirewall = true;
+    settings = {
+      rtc = {
+        tcp_port = 7881;
+        port_range_start = 50100;
+        port_range_end = 50200;
+        use_external_ip = true;
+        enable_loopback_candidate = false;
+      };
+      turn = {
+        enabled = true;
+        udp_port = 3478;
+        relay_range_start = 50300;
+        relay_range_end = 65535;
+        domain = rtc_domain;
+      };
+    };
+  };
+
+  services.lk-jwt-service = {
+    enable = true;
+    port = jwt_port;
+    livekitUrl = "wss://${rtc_domain}";
+    keyFile = config.sops.templates."livekit-keys".path;
+  };
+
   services = {
     authelia = {
       instances.darksailor = {

nixos/tako/services/monitoring.nix

@@ -23,6 +23,9 @@
     caddy = 2019;
   };
 in {
+  sops.secrets."grafana/secret_key" = {
+    owner = "grafana";
+  };
   # Grafana configuration with Authelia integration
   services.grafana = {
     enable = true;
@@ -54,6 +57,7 @@ in {
       security = {
         disable_gravatar = true;
         cookie_secure = true;
+        secret_key = ''$__file{${config.sops.secrets."grafana/secret_key".path}}'';
       };
 
       analytics = {
@@ -281,7 +285,7 @@ in {
           {
             targets = [
               "tsuba:8096" # jellyfin (built-in /metrics endpoint)
-              "tsuba:8123" # homeassistant (configure prometheus integration)
+              # "tsuba:8123" # homeassistant (configure prometheus integration)
               "tsuba:9617" # pihole-exporter
             ];
             labels = {
@@ -298,12 +302,12 @@ in {
             target_label = "__metrics_path__";
             replacement = "/metrics";
           }
-          {
+          # {
-            source_labels = ["__address__"];
+          #   source_labels = ["__address__"];
-            regex = "tsuba:8123";
+          #   regex = "tsuba:8123";
-            target_label = "__metrics_path__";
+          #   target_label = "__metrics_path__";
-            replacement = "/api/prometheus";
+          #   replacement = "/api/prometheus";
-          }
+          # }
         ];
       }
 

nixos/tako/services/nextcloud.nix

@@ -17,7 +17,7 @@
   services = {
     nextcloud = {
       enable = true;
-      package = pkgs.nextcloud32;
+      package = pkgs.nextcloud33;
       extraApps = {
         inherit (config.services.nextcloud.package.packages.apps) contacts calendar bookmarks user_oidc;
       };

nixos/tako/services/openssh.nix

@@ -2,6 +2,6 @@
   services.openssh = {
     enable = true;
     settings.PasswordAuthentication = false;
-    settings.PermitRootLogin = "prohibit-password";
+    settings.PermitRootLogin = "no";
   };
 }

nixos/tako/services/servius-website.nix

@@ -0,0 +1,12 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: let
+  website = inputs.servius-website.packages.${pkgs.system}.default;
+in {
+  services.caddy.virtualHosts."servius.darksailor.dev".extraConfig = ''
+    root * ${website}
+    file_server
+  '';
+}

nixos/tsuba/services/aria2.nix

@@ -0,0 +1,33 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  sops.secrets."aria2/rpc-secret" = {};
+
+  services.aria2 = {
+    enable = true;
+    rpcSecretFile = config.sops.secrets."aria2/rpc-secret".path;
+    settings = {
+      continue = true;
+      dir = "/media/downloads";
+      enable-rpc = true;
+      file-allocation = "none";
+      max-concurrent-downloads = 5;
+      max-connection-per-server = 16;
+      rpc-listen-all = true;
+      rpc-listen-port = 6809;
+      split = 16;
+    };
+  };
+
+  services.caddy.virtualHosts."aria2.tsuba.darksailor.dev".extraConfig = ''
+    import cloudflare
+    root * ${pkgs.ariang}/share/ariang
+    file_server
+  '';
+  services.caddy.virtualHosts."aria2.tsuba.darksailor.dev:6800".extraConfig = ''
+    import cloudflare
+    reverse_proxy localhost:${toString config.services.aria2.settings.rpc-listen-port}
+  '';
+}

nixos/tsuba/services/default.nix

@@ -6,6 +6,7 @@
     ./caddy.nix
     ./servarr.nix
     ./deluge.nix
+    ./aria2.nix
     ./homeassistant.nix
     ./flaresolverr.nix
     ./caddy.nix

overlays.nix

@@ -1,5 +1,7 @@
 {inputs, ...} @ self: let
-  shell-scipts = final: prev: {
+  cratesNix = pkgs: inputs.crates-nix.mkLib {inherit pkgs;};
+  # --- Shell / CLI utilities ---
+  shell-scripts = final: prev: {
     handlr-xdg = final.pkgs.writeShellApplication {
       name = "xdg-open";
       runtimeInputs = [final.pkgs.handlr-regex];
@@ -8,184 +10,9 @@
       '';
     };
   };
-  misc-applications = final: prev: {
-    command-runner = inputs.command-runner.packages.${prev.system}.command-runner;
-    goread = final.pkgs.buildGoModule {
-      pname = "goread";
-      version = "v1.6.4";
-      vendorHash = "sha256-/kxEnw8l9S7WNMcPh1x7xqiQ3L61DSn6DCIvJlyrip0";
-      src = final.pkgs.fetchFromGitHub {
-        owner = "TypicalAM";
-        repo = "goread";
-        rev = "v1.6.4";
-        sha256 = "sha256-m6reRaJNeFhJBUatfPNm66LwTXPdD/gioT8HTv52QOw";
-      };
-      patches = [patches/goread.patch];
-      checkPhase = null;
-    };
-    music-player-git = inputs.music-player.packages.${prev.system}.default;
-    davis = let
-      davis-src = final.pkgs.fetchFromGitHub {
-        owner = "SimonPersson";
-        repo = "davis";
-        rev = "main";
-        sha256 = "sha256-p4l1nF6M28OyIaPorgsyR7NJtmVwpmuws67KvVnJa8s";
-      };
-      cargoToml =
-        builtins.fromTOML (builtins.readFile "${davis-src}/Cargo.toml");
-    in
-      final.rustPlatform.buildRustPackage {
-        pname = cargoToml.package.name;
-        version = cargoToml.package.version;
-        src = davis-src;
-        cargoLock = {lockFile = "${davis-src}/Cargo.lock";};
-        buildPhase = ''
-          runHook cargoBuildHook
-          runHook cargoInstallPostBuildHook
-        '';
-        runtimeInputs = [final.pkgs.picat];
-        buildInputs = [final.pkgs.picat];
-        installPhase = ''
-          mkdir -p $out/bin
-          cp $bins $out/bin
-          cp $src/subcommands/cur/davis-cur-vertical $out/bin
-          cp $src/subcommands/cur/davis-cur-horizontal $out/bin
-          cp $src/subcommands/cover/davis-cover $out/bin
-        '';
-      };
 
-    openapi-tui = let
+  # --- Terminal multiplexers ---
-      cargoToml = builtins.fromTOML (builtins.readFile "${inputs.openapi-tui}/Cargo.toml");
+  terminal = final: prev: {
-    in
-      final.rustPlatform.buildRustPackage {
-        pname = cargoToml.package.name;
-        version = cargoToml.package.version;
-        src = inputs.openapi-tui;
-        cargoLock = {lockFile = "${inputs.openapi-tui}/Cargo.lock";};
-        buildInputs = with final;
-          pkgs.lib.optionals pkgs.stdenv.isDarwin [
-            pkgs.apple-sdk_13
-          ]
-          ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
-            pkgs.openssl
-          ];
-        PKG_CONFIG_PATH = with final; pkgs.lib.makeSearchPath "lib/pkgconfig" [pkgs.openssl.dev];
-        nativeBuildInputs = with final; [pkgs.pkg-config];
-      };
-    picat = let
-      picat-src = final.pkgs.fetchFromGitHub {
-        owner = "SimonPersson";
-        repo = "picat";
-        rev = "main";
-        sha256 = "sha256-HheBinHW4RLjRtiE8Xe5BoEuSCdtZTA9XkRJgtDkXaM";
-      };
-      cargoToml =
-        builtins.fromTOML (builtins.readFile "${picat-src}/Cargo.toml");
-    in
-      final.rustPlatform.buildRustPackage {
-        pname = cargoToml.package.name;
-        version = cargoToml.package.version;
-        src = picat-src;
-        cargoLock = {lockFile = "${picat-src}/Cargo.lock";};
-      };
-    psst =
-      if final.pkgs.stdenv.isLinux
-      then
-        (prev.psst.overrideAttrs (finalAttrs: prevAttrs: {
-          postInstall =
-            (prevAttrs.postInstall or "")
-            + ''
-              patch $out/share/applications/Psst.desktop < ${./patches/psst.patch}
-            '';
-        }))
-      else
-        final.rustPlatform.buildRustPackage rec {
-          pname = "psst";
-          version = "1";
-          src = final.pkgs.fetchFromGitHub {
-            owner = "jpochyla";
-            repo = "psst";
-            rev = "master";
-            sha256 = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk";
-          };
-          buildInputs = with final; [
-            pkgs.apple-sdk_13
-          ];
-          cargoLock = {
-            lockFile = "${src}/Cargo.lock";
-            outputHashes = {
-              "cubeb-0.10.3" = "sha256-gV1KHOhq678E/Rj+u8jX9Fw+TepPwuZdV5y/D+Iby+o";
-              "druid-0.8.3" = "sha256-hTB9PQf2TAhcLr64VjjQIr18mczwcNogDSRSN5dQULA";
-              "druid-enums-0.1.0" = "sha256-KJvAgKxicx/g+4QRZq3iHt6MGVQbfOpyN+EhS6CyDZk";
-            };
-          };
-        };
-    ddcbacklight = inputs.ddcbacklight.packages.${prev.system}.ddcbacklight;
-    # ik_llama = prev.llama-cpp.overrideAttrs (oldAttrs: {
-    #   src = inputs.ik_llama;
-    #   version = "5995";
-    # });
-    # llama-cpp = prev.llama-cpp.overrideAttrs (oldAttrs: {
-    #   src = inputs.llama-cpp;
-    #   version = "6178";
-    #   cmakeFlags = oldAttrs.cmakeFlags;
-    # });
-    python312 = prev.python312.override {
-      packageOverrides = final: prev: {
-        pysaml2 = prev.pysaml2.overridePythonAttrs (orig: {
-          doCheck = false;
-          # disabledTests =
-          #   orig.disabledTests
-          #   ++ [
-          #     "test_encrypted_response_6"
-          #     "test_validate_cert_chains"
-          #     "test_validate_with_root_cert"
-          #   ];
-        });
-      };
-    };
-    zeronsd = let
-      src = inputs.zeronsd;
-    in
-      final.rustPlatform.buildRustPackage {
-        inherit src;
-        pname = "zeronsd";
-        version = "0.6";
-
-        strictDeps = true;
-        buildInputs = [final.pkgs.openssl];
-        nativeBuildInputs = [final.pkgs.pkg-config];
-
-        doCheck = false;
-        RUSTFMT = "${final.pkgs.rustfmt}/bin/rustfmt";
-
-        cargoLock = {lockFile = "${src}/Cargo.lock";};
-      };
-    # alvr-master = inputs.alvr.packages.${prev.system}.default;
-    caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${final.system}.caddy.withPlugins {
-      plugins = ["github.com/caddy-dns/cloudflare@v0.2.2"];
-      hash = "sha256-dnhEjopeA0UiI+XVYHYpsjcEI6Y1Hacbi28hVKYQURg=";
-    };
-    nix-auth = inputs.nix-auth.packages.${prev.system}.nix-auth;
-    kitty = inputs.nixpkgs-stable.legacyPackages.${prev.system}.kitty;
-    yabai = prev.yabai.overrideAttrs (oldAttrs: rec {
-      version = "7.1.16";
-      src = final.fetchzip {
-        url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
-        hash = "sha256-rEO+qcat6heF3qrypJ02Ivd2n0cEmiC/cNUN53oia4w=";
-      };
-    });
-  };
-
-  anyrun-overlay = final: prev: {
-    anyrun =
-      inputs.anyrun.packages.${prev.system}.anyrun.overrideAttrs
-      (finalAttrs: prevAttrs: {patches = [./patches/ctrl-np.patch];});
-    hyprwin = inputs.anyrun-hyprwin.packages.${prev.system}.hyprwin;
-    nixos-options = inputs.anyrun-nixos-options.packages.${prev.system}.default;
-    anyrun-rink = inputs.anyrun-rink.packages.${prev.system}.default;
-  };
-  tmuxPlugins = final: prev: {
     tmuxPlugins =
       prev.tmuxPlugins
       // {
@@ -200,28 +27,18 @@
           };
         };
       };
-    tmux-float = inputs.tmux-float.packages.${prev.system}.default;
+    tmux-float = inputs.tmux-float.packages.${prev.stdenv.hostPlatform.system}.default;
-  };
-  catppuccinThemes = final: prev: {
-    catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
-  };
-  nix-index-db = final: prev: {
-    nix-index-database = final.runCommandLocal "nix-index-database" {} ''
-      mkdir -p $out
-      ln -s ${
-        inputs.nix-index-database.legacyPackages.${prev.system}.database
-      } $out/files
-    '';
-  };
-  zellij = final: prev: {
     zellijPlugins = {
-      zjstatus = inputs.zjstatus.packages.${prev.system}.default;
+      zjstatus = inputs.zjstatus.packages.${prev.stdenv.hostPlatform.system}.default;
     };
   };
-  libfprint = final: prev: {
+
+  # --- System libraries ---
+  system-libs = final: prev: {
+    # Custom libfprint with CS9711 fingerprint reader support
+    # https://github.com/archeYR/libfprint-CS9711/commits/cs9711-rebase/
     libfprint = prev.libfprint.overrideAttrs (oldAttrs: {
       version = "git";
-      # https://github.com/archeYR/libfprint-CS9711/commits/cs9711-rebase/
       src = final.fetchFromGitHub {
         owner = "archeYR";
         repo = "libfprint-CS9711";
@@ -237,66 +54,73 @@
           final.doctest
         ];
     });
-    # fprintd = inputs.nixpkgs-stable.legacyPackages.${prev.system}.fprintd;
-    # fprintd = prev.fprintd.overrideAttrs (oldAttrs: {
-    #   src = inputs.nixpkgs-stable.legacyPackages.${prev.system}.fprintd.src;
-    # });
   };
-  csshacks = final: prev: {
+
-    csshacks = inputs.csshacks;
+  # --- Networking ---
+  networking = final: prev: {
+    caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.caddy.withPlugins {
+      plugins = ["github.com/caddy-dns/cloudflare@v0.2.2"];
+      hash = "sha256-Gb1nC5fZfj7IodQmKmEPGygIHNYhKWV1L0JJiqnVtbs=";
+    };
   };
-  jellyfin = final: prev: {
-    jellyfin-web = prev.jellyfin-web.overrideAttrs (finalAttrs: previousAttrs: {
-      installPhase = ''
-        runHook preInstall
 
-        # this is the important line
+  # --- Media ---
-        sed -i "s#</head>#<script src=\"configurationpage?name=skip-intro-button.js\"></script></head>#" dist/index.html
+  media = final: prev: {
+    ddcbacklight = inputs.ddcbacklight.packages.${prev.stdenv.hostPlatform.system}.ddcbacklight;
+    music-player-git = inputs.music-player.packages.${prev.stdenv.hostPlatform.system}.default;
+  };
 
-        mkdir -p $out/share
+  # --- macOS-specific ---
-        cp -a dist $out/share/jellyfin-web
+  darwin = final: prev: {
-
+    kitty = inputs.nixpkgs-stable.legacyPackages.${prev.stdenv.hostPlatform.system}.kitty;
-        runHook postInstall
+    yabai = prev.yabai.overrideAttrs (oldAttrs: rec {
-      '';
+      version = "7.1.16";
+      src = final.fetchzip {
+        url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
+        hash = "sha256-rEO+qcat6heF3qrypJ02Ivd2n0cEmiC/cNUN53oia4w=";
+      };
     });
   };
-  # immich = final: prev: {
+
-  #   immich-latest = prev.immich.overrideAttrs (oldAttrs: {
+  applications = final: prev: {
-  #     version = "v1.142.0";
+    iamb = inputs.iamb.packages.${prev.stdenv.hostPlatform.system}.default;
-  #     src = inputs.immich;
+    hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland;
-  #   });
+    xdg-desktop-portal-hyprland = prev.enableDebugging inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-  # };
+    xdph = inputs.nixpkgs-master.legacyPackages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-  vr = final: prev: {
+    ironclaw = (cratesNix prev).buildCrate "ironclaw" {
-    # wivrn-nightly = prev.wivrn.overrideAttrs (oldAttrs: {
+      nativeBuildInputs = [prev.pkg-config];
-    #   version = "v25.11.1";
+      buildInputs = [prev.openssl];
-    #   src = inputs.wivrn;
+      doCheck = false;
-    # });
+    };
-    wivrn-nightly = inputs.wivrn.packages.${prev.system}.default;
   };
-  games = final: prev: {
+
-    hytale-launcher = inputs.hytale-launcher.packages.${prev.system}.default;
+  # --- Themes and assets ---
+  themes = final: prev: {
+    catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
+    nix-index-database = final.runCommandLocal "nix-index-database" {} ''
+      mkdir -p $out
+      ln -s ${inputs.nix-index-database.legacyPackages.${prev.stdenv.hostPlatform.system}.database} $out/files
+    '';
   };
 in
   [
-    games
+    # Local overlays
-    vr
+    shell-scripts
-    anyrun-overlay
+    terminal
-    catppuccinThemes
+    system-libs
-    csshacks
+    networking
+    media
+    darwin
+    themes
+    applications
+
+    # External input overlays
     inputs.deploy-rs.overlays.default
-    inputs.nix-minecraft.overlay
+    inputs.eilmeldung.overlays.default
-    inputs.nur.overlays.default
-    inputs.rust-overlay.overlays.default
     inputs.handoff.overlays.default
     inputs.headplane.overlays.default
+    inputs.nix-minecraft.overlay
+    inputs.nur.overlays.default
     inputs.vicinae.overlays.default
-    inputs.eilmeldung.overlays.default
-    jellyfin
-    libfprint
-    misc-applications
-    nix-index-db
-    shell-scipts
-    tmuxPlugins
-    zellij
   ]
   ++ (import ./neovim/overlays.nix {inherit inputs;})