diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 3ec58c5..71506fa 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -103,6 +103,7 @@ # graphviz # ksnip msty + msty-sidecar nwg-look # pamixer # pavucontrol diff --git a/hosts/common/extraServices/ollama.nix b/hosts/common/extraServices/ollama.nix index 32bfaad..436cf5f 100644 --- a/hosts/common/extraServices/ollama.nix +++ b/hosts/common/extraServices/ollama.nix @@ -24,6 +24,9 @@ in { else null; host = "[::]"; openFirewall = true; + environmentVariables = { + OLLAMA_ORIGINS = "https://msty.studio"; + }; }; nixpkgs.config = { rocmSupport = config.services.xserver.videoDrivers == ["amdgpu"]; diff --git a/pkgs/default.nix b/pkgs/default.nix index e795ec3..b79dd07 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { # Define your custom packages here msty = pkgs.callPackage ./msty {}; + msty-sidecar = pkgs.callPackage ./msty-sidecar {}; zellij-ps = pkgs.callPackage ./zellij-ps {}; aider-chat-env = pkgs.callPackage ./aider-chat-env {}; code2prompt = pkgs.callPackage ./code2prompt {}; diff --git a/pkgs/msty-sidecar/default.nix b/pkgs/msty-sidecar/default.nix new file mode 100644 index 0000000..305036a --- /dev/null +++ b/pkgs/msty-sidecar/default.nix @@ -0,0 +1,38 @@ +{ + appimageTools, + fetchurl, + nodejs, # Add Node.js + nodePackages, # For npx + uv, # For uv/uvx + python3, # For Python 3 + makeWrapper, # For wrapping the binary with the correct PATH +}: let + pname = "msty-sidecar"; + version = "1.9.2"; + src = fetchurl { + url = "https://sidecar-assets.msty.studio/prod/latest/linux/amd64/MstySidecar_x86_64_amd64.AppImage"; + sha256 = "sha256-UhsokCG0NPqn5nhn//AaIuY6sWlZkejNlqMEyN4Opqg="; + }; + appimageContents = appimageTools.extractType2 {inherit pname version src;}; +in + appimageTools.wrapType2 { + inherit pname version src; + nativeBuildInputs = [makeWrapper]; + + extraPkgs = pkgs: [ + nodejs + nodePackages.npm + uv + python3 + ]; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/mstysidecar.desktop -t $out/share/applications + substituteInPlace $out/share/applications/mstysidecar.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/mstysidecar.png \ + $out/share/icons/hicolor/256x256/apps/mstysidecar.png + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${nodejs}/bin:${nodePackages.npm}/bin:${uv}/bin:${python3}/bin + ''; + }