diff --git a/flakes/opencode/flake.nix b/flakes/opencode/flake.nix index b9d1a97..44af882 100644 --- a/flakes/opencode/flake.nix +++ b/flakes/opencode/flake.nix @@ -47,29 +47,16 @@ }; }; }; - in { - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ bash glib glib.out uv nodejs_22 opencode ]; - }; - packages.run = pkgs.writeShellScriptBin "run_flake" '' - mkdir -p ~/.config/opencode - cp ${ - self.packages.${system}.config_json - } ~/.config/opencode/opencode.json - ${pkgs.opencode}/bin/opencode - ''; - packages.config_json = pkgs.writeTextFile { + configJson = pkgs.writeTextFile { name = "config.json"; text = builtins.toJSON opencodeConfig; }; - packages.opencodeInstance = pkgs.stdenv.mkDerivation { - name = "opencode"; - buildInputs = [ pkgs.opencode ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${pkgs.opencode}/bin/opencode $out/bin/opencode - mkdir -p $out/config - cp ${self.packages.${system}.config_json} $out/config/opencode.json + in { + packages = rec { + opencode = pkgs.writeShellScriptBin "opencode" '' + mkdir -p ~/.config/opencode + cp ${configJson} ~/.config/opencode/opencode.json + ${pkgs.opencode}/bin/opencode ''; }; }); diff --git a/nix/home-manager/work.home.nix b/nix/home-manager/work.home.nix index d2648fa..13f2b51 100644 --- a/nix/home-manager/work.home.nix +++ b/nix/home-manager/work.home.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - opencodeFlake = import ../../flakes/opencode; + opencodeFlake = builtins.getFlake (toString ../../flakes/opencode); nixgl = import (fetchTarball "https://github.com/nix-community/nixGL/archive/main.tar.gz") { }; @@ -41,8 +41,8 @@ in { jellyfin-tui firefoxpwa bluetui - nixfmt - opencodeFlake.packages.${pkgs.system}.opencodeInstance + nixfmt-classic + opencodeFlake.packages.${system}.opencode ]; programs.firefox = {