Merge branch 'master' into cliamp

Reviewed-on: #11

.gitea/workflows/publish-attic.yaml

@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - master
+  workflow_run:
+    workflows:
+      - Update flake lock
+    types:
+      - completed
   workflow_dispatch:
 
 jobs:
@@ -63,11 +68,14 @@ jobs:
           system="$(nix eval --impure --raw --expr builtins.currentSystem)"
 
           NIXPKGS_ALLOW_UNFREE=1 nix build --impure --accept-flake-config --no-link --print-out-paths -L \
+            ".#packages.${system}.atuinLatest" \
+            ".#packages.${system}.cliampLatest" \
             ".#packages.${system}.musicpresence" \
             ".#packages.${system}.vintage-story" \
             ".#packages.${system}.swaytreesave" \
             ".#packages.${system}.archon" \
             ".#packages.${system}.ani-cli-rs" \
+            ".#packages.${system}.opengoal" \
             | tee built-paths.txt
 
       - name: Push packages to Attic

flake.lock

@@ -3,15 +3,17 @@
     "caitsith": {
       "inputs": {
         "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1787710235,
+        "lastModified": 1787797120,
-        "narHash": "sha256-uWDHHB5Z9m3cXQNjfdWWqp2S/SwosukkJv57ORljCvQ=",
+        "narHash": "sha256-88Di5b78X0LI0BkGehewOIbA9wrnNf6PD1VTz+gv910=",
         "ref": "refs/heads/master",
-        "rev": "4afabd4956611ec9213dd8392755dece81688b67",
+        "rev": "707867341ac6f89193da112b42f05534016aa325",
-        "revCount": 20,
+        "revCount": 21,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
       },
@@ -71,7 +73,9 @@
     "hildibrand": {
       "inputs": {
         "flake-schemas": "flake-schemas_2",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
@@ -90,14 +94,16 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1787750582,
+        "lastModified": 1787797243,
-        "narHash": "sha256-FfIAV44k33i+IjC1+new2KyjyVGUzGtV89VHVP4eK1U=",
+        "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0a364342a66bcecfc8a00d2fc38c6c29eee7bc5e",
+        "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
         "type": "github"
       },
       "original": {
@@ -108,55 +114,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771574726,
+        "lastModified": 1787962033,
-        "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=",
+        "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=",
-        "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d",
-        "revCount": 908154,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.908154%2Brev-c217913993d6c6f6805c3b1a3bda5e639adfde6d/019c7ebe-d61d-7168-89bc-a2b6e142b1cd/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1784280462,
-        "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
-        "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
-        "revCount": 1009740,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1787209939,
-        "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb",
+        "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1787640266,
-        "narHash": "sha256-MrkfE5hF5xx4L/0h5NyJ3xQkKVftwSuKSkFSrvlTxGY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f4f698677b11021a8f84f452e23ae9ef2427bec3",
         "type": "github"
       },
       "original": {
@@ -172,7 +134,8 @@
         "darwin": "darwin",
         "hildibrand": "hildibrand",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay_3"
       }
     },
     "rust-overlay": {
@@ -216,6 +179,26 @@
         "repo": "rust-overlay",
         "type": "github"
       }
+    },
+    "rust-overlay_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788077403,
+        "narHash": "sha256-c20YZQKzQ27qC6Wh729fWRTpI7oV4+7Ur4icKssD4Wc=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "89e26eeaafa88a2ede4778734acc794ff0299beb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -4,13 +4,21 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     darwin.url = "github:LnL7/nix-darwin";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
-    hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git";
+    rust-overlay = {
-    caitsith.url = "git+https://scm.wyattjmiller.com/wymiller/caitsith.git";
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-  outputs = inputs@{ self, nixpkgs, home-manager, darwin, ... }:
+    hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git";
+    hildibrand.inputs.nixpkgs.follows = "nixpkgs";
+    caitsith.url = "git+https://scm.wyattjmiller.com/wymiller/caitsith.git";
+    caitsith.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs@{ self, nixpkgs, home-manager, darwin, rust-overlay, ... }:
     let
       supportedSystems = [
         "x86_64-linux"
@@ -20,7 +28,8 @@
       forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems f;
     in
     {
-      packages = forAllSystems (system:
+      packages = forAllSystems (
+        system:
         let
           pkgs = import nixpkgs {
             inherit system;
@@ -36,8 +45,11 @@
         }
       );
 
-      devShells = forAllSystems (system:
+      devShells = forAllSystems (
-        let pkgs = import nixpkgs { inherit system; }; in
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
         {
           default = pkgs.mkShell {
             packages = with pkgs; [
@@ -47,7 +59,10 @@
         }
       );
 
-      overlays.default = import ./overlays;
+      overlays.default = nixpkgs.lib.composeManyExtensions [
+        rust-overlay.overlays.default
+        (import ./overlays)
+      ];
       homeManagerModules = import ./modules/home-manager self;
       nixosModules.default = import ./modules/nixos;
       darwinModules.default = import ./modules/darwin;

overlays/atuin.nix

@@ -0,0 +1,43 @@
+final: prev:
+let
+  rustLatest = prev.rust-bin.stable.latest.default;
+  rustPlatform = prev.makeRustPlatform {
+    cargo = rustLatest;
+    rustc = rustLatest;
+  };
+in
+{
+  atuinLatest = (prev.atuin.override { inherit rustPlatform; }).overrideAttrs (oldAttrs: rec {
+    version = "18.19.0";
+
+    src = prev.fetchFromGitHub {
+      owner = "atuinsh";
+      repo = "atuin";
+      rev = "v${version}";
+      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
+    };
+
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      inherit src;
+      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
+    };
+
+    cargoBuildFeatures = [
+      "ai"
+      "client"
+      "clipboard"
+      "daemon"
+      "hex"
+      "sync"
+    ];
+    cargoCheckFeatures = cargoBuildFeatures;
+
+    preCheck = (oldAttrs.preCheck or "") + ''
+      export HOME="$TMPDIR"
+      export XDG_CONFIG_HOME="$TMPDIR/.config"
+      export XDG_DATA_HOME="$TMPDIR/.local/share"
+      export XDG_STATE_HOME="$TMPDIR/.local/state"
+      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
+    '';
+  });
+}

overlays/cliamp.nix

@@ -0,0 +1,24 @@
+final: prev: {
+  cliampLatest = prev.cliamp.overrideAttrs (oldAttrs: rec {
+    version = "2.0.1";
+
+    src = prev.fetchFromGitHub {
+      owner = "bjarneo";
+      repo = "cliamp";
+      tag = "v${version}";
+      sha256 = "sha256-r7MrrcVt+/f+iPozn9jaczJmpPv431wAoW8LvHKBtB8=";
+    };
+
+    vendorHash = "sha256-rtwUWbft5XGEbuBCn0OMCn4TS5Ul+UXJNIqNOzXfU+M=";
+
+  buildInputs = with prev; [
+    libogg
+    libvorbis
+    flac
+    mpg123
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
+  });
+}

overlays/container.nix

@@ -0,0 +1,10 @@
+final: prev: {
+  containerLatest = prev.container.overrideAttrs (oldAttrs: rec {
+    version = "1.3.1";
+
+    src = prev.fetchurl {
+      url = "https://github.com/apple/container/releases/download/${version}/container-${version}-installer-signed.pkg";
+      hash = "sha256-p8G515J9MIdfL2x70dDLBsLapspXzp6QpRROiY/fVKg=";
+    };
+  });
+}

overlays/default.nix

@@ -1 +1,6 @@
-final: prev: { }
+final: prev:
+prev.lib.composeManyExtensions [
+  (import ./atuin.nix)
+  (import ./container.nix)
+  (import ./cliamp.nix)
+] final prev

pkgs/default.nix

@@ -1,19 +1,25 @@
 {
   pkgs,
   hildibrand ? null,
-  caitsith ? null
+  caitsith ? null,
 }:
 {
+  # any overlays we define here
+  atuinLatest = pkgs.atuinLatest;
+  containerLatest = pkgs.containerLatest;
+  cliampLatest = pkgs.cliampLatest;
+
   # any packages that are added to pkgs and are inputs, we inherit them here
   inherit hildibrand;
   inherit caitsith;
 
   # any packages that build instructions are in this repo, they go here
   # sable-web = pkgs.callPackage ./common/sable.nix {};
-  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix {};
+  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
-  musicpresence = pkgs.callPackage ./linux/musicpresence.nix {};
+  musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
-  vintage-story = pkgs.callPackage ./linux/vintage-story.nix {};
+  vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };
-  archon = pkgs.callPackage ./linux/archon.nix {};
+  archon = pkgs.callPackage ./linux/archon.nix { };
   yubilock = pkgs.callPackage ./linux/yubilock/default.nix { };
   ani-cli-rs = pkgs.callPackage ./linux/ani-cli-rs.nix { };
+  opengoal = pkgs.callPackage ./linux/opengoal.nix { };
 }

pkgs/linux/ani-cli-rs.nix

@@ -7,7 +7,7 @@ let
     owner = "vorlie";
     repo = "ani-cli-rs";
     rev = "${version}";
-    sha256 = "sha256-4JjCe9dCggLtETmH8yWYyn1tkHimPYtTp0BLQML3NKY=";
+    sha256 = "sha256-19U/p583B5d/Kd0O1raYhREz6zYMeudyTH7dh9bi/jU=";
   };
 in pkgs.rustPlatform.buildRustPackage {
   inherit pname version src;

pkgs/linux/opengoal.nix

@@ -0,0 +1,49 @@
+{ pkgs }:
+let
+  pname = "OpenGOAL-Launcher";
+  version = "2.10.4";
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/open-goal/launcher/releases/download/v${version}/${pname}_${version}_amd64.AppImage";
+    hash = "sha256-eikzjdOYNdJM9FM3O/HuCFDzf97Fm1nhbRedDyKZ1/s=";
+  };
+in
+pkgs.stdenvNoCC.mkDerivation {
+  inherit pname version src;
+
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  dontUnpack = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    cp "$src" "${pname}.AppImage"
+    chmod +x "${pname}.AppImage"
+    ./"${pname}.AppImage" --appimage-extract
+
+    mkdir -p "$out/opt"
+    cp -a AppDir "$out/opt/opengoal-launcher"
+    rm -f "$out/opt/opengoal-launcher/share/icons/hicolor/scalable/apps/byobu.svg"
+
+    makeWrapper "$out/opt/opengoal-launcher/AppRun" "$out/bin/${pname}"
+    install -Dm444 "AppDir/${pname}.desktop" \
+      "$out/share/applications/${pname}.desktop"
+    install -Dm444 "AppDir/${pname}.png" \
+      "$out/share/icons/hicolor/256x256/apps/${pname}.png"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = pkgs.nix-update-script { };
+
+  meta = with pkgs.lib; {
+    description = "Launcher for the OpenGOAL project";
+    homepage = "https://github.com/open-goal/launcher";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = pname;
+  };
+}