feat(opencode): add opencode configuration

2026-06-07 18:07:03 +02:00
17 changed files with 87 additions and 217 deletions
@@ -35,11 +35,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1787985728,
-        "narHash": "sha256-qKYq/NmpxLKn2ZcxNUGx7PgVlmxW833xKZ3Hngvvnro=",
+        "lastModified": 1780375472,
+        "narHash": "sha256-Q8RAJoYlakA6B2I5DVcuxzNbhCNU1nnIjqQZYP1KGrM=",
        "owner": "caelestia-dots",
        "repo": "cli",
-        "rev": "56f404c61dff30d698961780aefcf48bd4dd7b86",
+        "rev": "d1c8c8fc09738d1b40576e97c274b4a11a2e0ac7",
        "type": "github"
      },
      "original": {
@@ -58,11 +58,11 @@
        "quickshell": "quickshell"
      },
      "locked": {
-        "lastModified": 1788247772,
-        "narHash": "sha256-KJtxaK9Ws9DimBKdrZFs3iHjUHF/V1WviJx5A2zk86c=",
+        "lastModified": 1780839367,
+        "narHash": "sha256-KAENT4Od2wwWtJzWFtR/qKzqoR673r91KLcyv4pPcNQ=",
        "owner": "caelestia-dots",
        "repo": "shell",
-        "rev": "065dac2957a1f31bd2d2f029cabb96f69921f72b",
+        "rev": "3bc2bd2a5c5c886f75363211d838b749ab95137e",
        "type": "github"
      },
      "original": {
@@ -79,11 +79,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788281219,
-        "narHash": "sha256-UpYGQw2PZhZPCDKeFGKYA9vbBbwdXwhfyifUqwRw4lM=",
+        "lastModified": 1779822991,
+        "narHash": "sha256-r6e4eHEyQJEDhT6gkW3B9+OgB0pZebw2+du4bvN3vww=",
        "owner": "9001",
        "repo": "copyparty",
-        "rev": "704af697c78efd189cc56359f5a9aa17d2d74944",
+        "rev": "6e75faa62349a59f4df328a4939ba8626d89ee1a",
        "type": "github"
      },
      "original": {
@@ -207,11 +207,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788229478,
-        "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=",
+        "lastModified": 1780679734,
+        "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1",
+        "rev": "b2b7db486e06e098711dc291bb25db82850e1d16",
        "type": "github"
      },
      "original": {
@@ -230,11 +230,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1781867614,
-        "narHash": "sha256-GHy8hEZtToo7FLxEZm0x/pn/fjg1w9sx7ZP9hRd1fcM=",
+        "lastModified": 1780841807,
+        "narHash": "sha256-7N3iYAUmNjt0wgfpb1ZMVP5xRcXSrihQqOxZPM5N0Tc=",
        "ref": "develop",
-        "rev": "d2c48605aac4ca9580d8a34aad4c65371c5a7cc1",
-        "revCount": 52,
+        "rev": "0e6b559d002cc7a9bcb758384623de0e8e034bbe",
+        "revCount": 45,
        "type": "git",
        "url": "https://labs.phundrak.com/phundrak/jj-cz"
      },
@@ -245,24 +245,19 @@
      }
    },
    "m3shapes": {
-      "inputs": {
-        "nixpkgs": [
-          "caelestia-shell",
-          "nixpkgs"
-        ]
-      },
+      "flake": false,
      "locked": {
-        "lastModified": 1787906858,
-        "narHash": "sha256-YZelgEZflFNwGutX4/tIzBdbOeghJgE2oDw0uWYGxns=",
+        "lastModified": 1777812556,
+        "narHash": "sha256-E5nqOucRQBWKuT31AMekmfgMywRdHgSbU86R7t4BKKA=",
        "owner": "soramanew",
        "repo": "m3shapes",
-        "rev": "32ad9ce328bb77ed349b40a3be10ee9ea610b8ab",
+        "rev": "356825d31f16052a782735cce264331cba0cb71b",
        "type": "github"
      },
      "original": {
        "owner": "soramanew",
        "repo": "m3shapes",
-        "rev": "32ad9ce328bb77ed349b40a3be10ee9ea610b8ab",
+        "rev": "356825d31f16052a782735cce264331cba0cb71b",
        "type": "github"
      }
    },
@@ -273,11 +268,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788080100,
-        "narHash": "sha256-n14luQo3F/ZLfCEHk1QieiI1nGnW92ZQZeZ0UIb0UMQ=",
+        "lastModified": 1780816331,
+        "narHash": "sha256-0BYqs8yKWkOz2Q7+SP18N5E5gmDKSo6LSxIVIa0wWes=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "dbb978fa87faf13398e90ccbc52c343d21c7dd6d",
+        "rev": "1a2ea89c917781e88508d9fd2b507f2d2a0e173c",
        "type": "github"
      },
      "original": {
@@ -288,11 +283,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1788179007,
-        "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
        "type": "github"
      },
      "original": {
@@ -304,11 +299,11 @@
    },
    "nixpkgsStable": {
      "locked": {
-        "lastModified": 1782847189,
-        "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
+        "lastModified": 1780511130,
+        "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
+        "rev": "535f3e6942cb1cead3929c604320d3db54b542b9",
        "type": "github"
      },
      "original": {
@@ -347,11 +342,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1787994703,
-        "narHash": "sha256-6SUZyyALo19heYPa/Xmu2H4zV+wvdfVX4fTcqbgHRnI=",
+        "lastModified": 1780303737,
+        "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=",
        "ref": "refs/heads/master",
-        "rev": "2d3b3e9c70ef380dff751b61d334dc88df016c29",
-        "revCount": 856,
+        "rev": "b66495fcc5022681b56b61f928c7acbe910e722c",
+        "revCount": 821,
        "type": "git",
        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
      },
@@ -471,11 +466,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1786629091,
-        "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=",
+        "lastModified": 1780547341,
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
        "type": "github"
      },
      "original": {
@@ -492,11 +487,11 @@
        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1788263070,
-        "narHash": "sha256-Mw163zYcjr59hB2JMC1iKU1Y69SNKZ2r/haXZ07UWQY=",
+        "lastModified": 1780422259,
+        "narHash": "sha256-dWGk4SEdI189kQW5cE4Uo1Mc+P+kQEdgMcyMgTtmQOA=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "27ff19b00338052e8a504e1d1a34efad82c4bb26",
+        "rev": "8414bbf2fcc7bc0a22c675e498e3c7365c1aec0a",
        "type": "github"
      },
      "original": {
@@ -512,11 +507,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788143273,
-        "narHash": "sha256-YXleehtVHiLcH2+V0lSrl5Nmo2c+J11tI3+l4l9q3AQ=",
+        "lastModified": 1780545143,
+        "narHash": "sha256-y9aFcK8A3pctkW9G9LdppzPDsuBa3VzToADnacjir/A=",
        "owner": "nix-community",
        "repo": "srvos",
-        "rev": "e4d3f8fe5f1d4246d32177315edf8d9104f1c32b",
+        "rev": "bc0ca7b0f7c8ca9dc55166438fec4dc2dd74f8a4",
        "type": "github"
      },
      "original": {
@@ -592,11 +587,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1788083005,
-        "narHash": "sha256-e6U3sXUlu/QzZyJp/+ymW8s57Jbdb7bwT9+WaTAhHfQ=",
+        "lastModified": 1780637620,
+        "narHash": "sha256-ngPdHinPyF0AMxRr32qt+TZCv0sagmooBW14u6DfjSU=",
        "owner": "youwen5",
        "repo": "zen-browser-flake",
-        "rev": "afbbbef7c3c00f160f4a9dfdd8c6c6b8b089a33f",
+        "rev": "8c62bc6a72ac5a5b8d1b41b2b88dfed9d9932c48",
        "type": "github"
      },
      "original": {
@@ -96,8 +96,7 @@
    flake-utils.lib.eachDefaultSystem (
      system: let
        inherit (self) outputs;
-
-        pkgs = import nixpkgs {inherit system;};
+        pkgs = nixpkgs.legacyPackages.${system};
      in {
        formatter = pkgs.alejandra;
        devShells.default = pkgs.mkShell {
@@ -105,14 +104,13 @@
            pkgs.nh
            pkgs.jujutsu
            pkgs.git
-            inputs.jj-cz.packages.${system}.default
          ];
        };

        packages = {
          homeConfigurations = let
            extraSpecialArgs = {inherit inputs outputs system;};
-            pkgs = import nixpkgs {inherit system;};
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
            defaultUserModules = [
              inputs.sops-nix.homeManagerModules.sops
              inputs.spicetify.homeManagerModules.default
@@ -188,7 +186,7 @@
                srvos.nixosModules.server
                srvos.nixosModules.hardware-hetzner-cloud
                srvos.nixosModules.mixins-terminfo
-                ./hosts/naromk3
+                ./hosts/naromk3/configuration.nix
              ];
            };
            pinetab2 = pinetabConfig "x86_64-linux" ./hosts/pinetab2/gnome.nix;
@@ -24,11 +24,8 @@
      firewall = {
        openPorts = [
          22 # Gitea SSH
-          25 # SMTP
          80 # HTTP
          443 # HTTPS
-          465 # SMTPS
-          993 # IMAPS
        ];
      };
    };
@@ -1,70 +0,0 @@
-# Baseline variant of Bun for x86_64-linux CPUs without AVX2 support.
-# The regular `bun` from nixpkgs requires AVX2 and crashes with SIGILL on older hardware.
-#
-# Version is typically kept in sync with nixpkgs's `bun` (passed via `callPackage`).
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  autoPatchelfHook,
-  unzip,
-  makeBinaryWrapper,
-  glibc,
-  stdenv,
-  version ? "1.3.13",
-}: let
-  # When updating `version`, compute the new hash with:
-  #   nix store prefetch-file  "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip"
-  hash = {
-    "1.3.13" = "sha256-nYokKSpwaAkCBdqsCloiP19pc29Sh+N7+I07QDHtx1A=";
-  };
-in
-  stdenvNoCC.mkDerivation {
-    pname = "bun-baseline";
-    inherit version;
-
-    src = fetchurl {
-      url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64-baseline.zip";
-      hash = hash.${version};
-    };
-
-    nativeBuildInputs =
-      [unzip]
-      ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
-        autoPatchelfHook
-        makeBinaryWrapper
-      ];
-
-    buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
-      glibc
-      (lib.getLib stdenv.cc.cc)
-    ];
-
-    dontConfigure = true;
-    dontBuild = true;
-
-    unpackPhase = ''
-      runHook preUnpack
-      mkdir -p source
-      cd source
-      ${lib.getExe unzip} -q $src
-      runHook postUnpack
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/bin
-      find . -type f -name "bun" -not -path "./__MACOSX/*" -exec cp {} $out/bin/bun \;
-      chmod +x $out/bin/bun
-      ln -s $out/bin/bun $out/bin/bunx
-      runHook postInstall
-    '';
-
-    meta = {
-      description = "Bun JavaScript runtime (baseline variant, works without AVX2)";
-      homepage = "https://bun.sh";
-      license = lib.licenses.mit;
-      platforms = ["x86_64-linux"];
-      mainProgram = "bun";
-    };
-  }
@@ -7,14 +7,7 @@
 with lib; let
  cfg = config.home.desktop.caelestia;
 in {
-  options.home.desktop.caelestia = {
-    enable = mkEnableOption "Enables Caelestia Shell";
-    idleTimeout = mkOption {
-      description = "Idle duration in seconds before locking the session";
-      default = 60 * 60; # an hour
-      type = types.int;
-    };
-  };
+  options.home.desktop.caelestia.enable = mkEnableOption "Enables Caelestia Shell";
  config.programs.caelestia = mkIf cfg.enable {
    inherit (cfg) enable;
    systemd = {
@@ -35,7 +28,7 @@ in {
          inhibitWhenAudio = true;
          timeouts = [
            {
-              timeout = cfg.idleTimeout;
+              timeout = 3600;
              idleAction = "lock";
            }
          ];
@@ -51,7 +44,7 @@ in {
      };
      launcher = {
        enabled = true;
-        showOnHover = false;
+        showOnHover = true;
        useFuzzy = {
          apps = true;
          schemes = true;
@@ -106,7 +106,10 @@ in {
            "workspaces, 1, 6, default"
          ];
        };
-        dwindle.preserve_split = true;
+        dwindle = {
+          pseudotile = true;
+          preserve_split = true;
+        };
        exec-once =
          [
            "pactl load-module module-switch-on-connect"
@@ -16,11 +16,6 @@ in {

  options.home.dev.ai = {
    enable = mkEnableOption "Enables AI features";
-    lmStudio = mkOption {
-      default = cfg.enable;
-      example = true;
-      description = "Enables LM Studio. Enabled by default when AI is enabled.";
-    };
    mcpServers = mkOption {
      inherit (jsonFormat) type;
      default = {};
@@ -36,7 +31,7 @@ in {
        ollama.enable = mkDefault cfg.enable;
        opencode.enable = mkDefault cfg.enable;
      };
-      packages = lists.optional cfg.lmStudio pkgs.lmstudio;
+      packages = [pkgs.lmstudio];
    };
    programs.mcp = mkIf (cfg.mcpServers != {}) {
      enable = true;
@@ -1,31 +1,34 @@
 {
  config,
  lib,
+  inputs,
  pkgs,
  ...
 }:
 with lib; let
+  inherit (pkgs.stdenv.hostPlatform) system;
  cfg = config.home.dev.ai.opencode;
-
-  # On x86_64-linux CPUs without AVX2, use the baseline bun variant
-  # when building opencode - the regular `bun` from nixpkgs requires
-  # AVX2 and crashes on older hardware, such as my Thinkpad x220’s
-  # Intel Core i5 2640M.
-  needsBaselineBun =
-    pkgs.stdenv.hostPlatform.isx86_64 && !pkgs.stdenv.hostPlatform.avx2Support;
-  bunBaseline = pkgs.callPackage ../../../../packages/bun-baseline.nix {};
-
-  defaultPackageCli =
-    if needsBaselineBun
-    then pkgs.opencode.override {bun = bunBaseline;}
-    else pkgs.opencode;
-
-  defaultPackageDesktop =
-    if needsBaselineBun
-    then pkgs.opencode-desktop.override {bun = bunBaseline;}
-    else pkgs.opencode-desktop;
-
+  defaultPackageCli = inputs.opencode.packages.${system}.opencode;
+  defaultPackageDesktop = inputs.opencode.packages.${system}.desktop;
+  corsString = cors:
+    {
+      null = "";
+      string = v: trim v;
+      path = v: trim (readFile v);
+    }
+    .${
+      if cors == null
+      then "null"
+      else typeOf cors
+    };
  corsList = domains: lists.remove "" (lists.forEach (strings.splitString "," domains) trim);
+  corsDomains = domains:
+    lists.flatten (
+      lists.forEach (lists.remove "" (lists.forEach (strings.splitString "," domains) trim)) (domain: [
+        "--cors"
+        domain
+      ])
+    );
 in {
  options.home.dev.ai.opencode = {
    enable = mkEnableOption "Enables OpenCode";
@@ -81,10 +84,12 @@ in {
    };
  };
  config.programs.opencode = mkIf cfg.enable {
-    inherit (cfg) enable tui package;
+    inherit (cfg) enable tui;
    enableMcpIntegration = true;
-    extraPackages = with pkgs; [uv] ++ lists.optional cfg.desktop.enable cfg.desktop.package;
-    settings =
+    extraPackages = with pkgs; [uv];
+    settings = let
+      cors = corsString cfg.web.cors;
+    in
      {
        server = mkIf cfg.web.mdns.enable {
          mdns = true;
@@ -57,15 +57,12 @@ in {
          inherit (cfg) name email;
        };
        ui = {
-          inherit (cfg) editor;
          default-command = "st";
          pager = ":builtin";
          show-cryptographic-signatures = true;
          diff-editor = ":builtin";
          merge-editort = ":builtin";
-          # These are for vc-jj.el in Emacs
-          diff-formatter = ":git";
-          conflict-marker-style = "git";
+          inherit (cfg) editor;
        };
        signing = mkIf cfg.signing.enable {
          behavior = "own";
@@ -12,7 +12,6 @@ in {
    ./mpd-mpris.nix
    ./mpv.nix
    ./ncmpcpp.nix
-    ./streamlink.nix
  ];

  options.home.media.fullDesktop = mkEnableOption "Enables everything";
@@ -21,6 +20,5 @@ in {
    mpd.enable = mkDefault (cfg.fullDesktop or cfg.mpd-mpris.enable);
    mpv.enable = mkDefault cfg.fullDesktop;
    ncmpcpp.enable = mkDefault config.home.media.mpd.enable;
-    streamlink.enable = mkDefault config.home.media.mpv.enable;
  };
 }
@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.home.media.streamlink;
-in {
-  options.home.media.streamlink.enable = mkEnableOption "Enable Streamlink";
-  config.programs.streamlink = mkIf cfg.enable {
-    enable = true;
-    settings = {
-      player = "${pkgs.mpv}/bin/mpv";
-    };
-  };
-}
@@ -30,18 +30,12 @@
        };
        permission = {
          "*" = "ask";
-          glob = "allow";
-          grep = "allow";
          read = {
            "*" = "allow";
            "*.env" = "deny";
            "*.env.*" = "deny";
            "*.env.example" = "allow";
          };
-          skill = "allow";
-          question = "allow";
-          task = "allow";
-          todowrite = "allow";
        };
        formatter.nixfmt = {
          command = ["nix" "fmt" "$FILE"];
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
  config.home.desktop.firefox = {
    enable = true;
    useZen = true;
@@ -13,16 +13,6 @@
        smothscroll = "true";
      };
      extraConfig = ''
-        command openTwitchInMpv js -d@\
-          const url = new URL(document.location.href);\
-          const cleanUrl = url.hostname + url.pathname;\
-          const token = document.cookie.split("; ")\
-                                .find(item => item.startsWith("auth-token="))?.split("=")[1];\
-          const auth = "--twitch-api-header=Authorization=OAuth " + token;\
-          const cmd = `${pkgs.streamlink}/bin/streamlink "''${auth}" "''${cleanUrl}" best`;\
-          tri.native.run(cmd)\
-        @
-
        unbind h
        unbind j
        unbind k
@@ -79,7 +69,6 @@

        bind < urlincrement -1
        bind > urlincrement 1
-        bind ypt openTwitchInMpv
        bind ypv js tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${document.location.href}"`)
        bind ypm hint -JF e => tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${e.href}"`)
      '';
@@ -106,7 +106,6 @@
          );
        };
      };
-      media.mopidy.enable = false;
    };

    manual = {
@@ -2,7 +2,6 @@
  imports = [../home.nix];
  home = {
    cli.nh.flake = "${config.home.homeDirectory}/.dotfiles";
-    dev.ai.lmStudio = false;
    desktop.hyprland.host = "gampo";
    phundrak.sshKey.content = builtins.readFile ../keys/id_gampo.pub;
  };
@@ -7,10 +7,7 @@
      enable = true;
      ollama.gpu = "rocm";
    };
-    desktop = {
-      hyprland.host = "marpa";
-      caelestia.idleTimeout = 60 * 60 * 24; # a day
-    };
+    desktop.hyprland.host = "marpa";
    phundrak.sshKey.content = builtins.readFile ../keys/id_marpa.pub;
  };
  programs.caelestia.settings.bar.status = {
@@ -49,7 +49,6 @@ in {
    scrcpy
    syncthing
    watchmate
-    chatterino7

    # Games
    atlauncher
@@ -75,7 +74,6 @@ in {
    tectonic # better LaTeX engine
    wakatime-cli
    zeal
-    pandoc

    ## LSP servers
    bash-language-server