feat: Update dependencies with homerow fix

sudosubin · Jun 10, 2024 · b590cb9 · b590cb9
1 parent 0281e36
commit b590cb9
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 41 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,6 +6,11 @@
     nixos-hardware.url = "github:nixos/nixos-hardware";
     flake-utils.url = "github:numtide/flake-utils?rev=13faa43c34c0c943585532dacbb457007416d50b";
 
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+
     darwin = {
       url = "github:lnl7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -34,6 +39,7 @@
       url = "github:nix-community/nix-vscode-extensions";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
+      inputs.flake-compat.follows = "flake-compat";
     };
 
     nixos-config-private-daangn = {

diff --git a/libraries/nixpkgs/default.nix b/libraries/nixpkgs/default.nix
@@ -1,5 +1,9 @@
-{ inputs, lib, ... }:
+{ inputs, lib, pkgs, ... }:
 
+let
+  inherit (pkgs.stdenvNoCC.hostPlatform) isDarwin;
+
+in
 {
   nixpkgs.overlays = [
     inputs.nix-vscode-extensions.overlays.default

diff --git a/libraries/nixpkgs/programs/homerow/default.nix b/libraries/nixpkgs/programs/homerow/default.nix
@@ -1,49 +1,50 @@
-{ lib, stdenvNoCC, curl, jq, unzip, runCommand }:
+{ lib, stdenvNoCC, fetchzip, curl, jq, runCommand }:
 
 let
   fetchFromAppCenter = { owner, app, group, version }:
     runCommand "fetchFromAppCenter" { buildInputs = [ curl jq ]; } ''
       RELEASE_ID=$(
         curl -k "https://install.appcenter.ms/api/v0.1/apps/${owner}/${app}/distribution_groups/${group}/public_releases" \
-          -H "user-agent: Chrome/118.0.0.0" \
-          | jq -r ".[] | select(.short_version == \"0.21\") | .id"
+          -H "user-agent: Chrome/0.0.0.0" \
+          | jq -r ".[] | select(.short_version == \"${version}\") | .id"
       )
       DOWNLOAD_URL=$(
         curl -k "https://install.appcenter.ms/api/v0.1/apps/${owner}/${app}/distribution_groups/${group}/releases/$RELEASE_ID" \
-          -H "user-agent: Chrome/118.0.0.0" \
+          -H "user-agent: Chrome/0.0.0.0" \
           | jq -r ".download_url"
       )
-      curl -kL "$DOWNLOAD_URL" -o "$out"
+      echo "$DOWNLOAD_URL" > "$out"
     '';
 
 in
 stdenvNoCC.mkDerivation rec {
   pname = "homerow";
   version = "0.21";
 
-  src = fetchFromAppCenter {
-    inherit version;
-    owner = "dexterleng";
-    app = "homerow-redux";
-    group = "production";
+  src = fetchzip {
+    url = builtins.readFile (fetchFromAppCenter {
+      inherit version;
+      owner = "dexterleng";
+      app = "homerow-redux";
+      group = "production";
+    });
+    name = "Homerow.app";
+    extension = "zip";
+    sha256 = "0g7p82l49gi8cbrk16dzkfrh2gq9hda351rq9mz8szyg169gz32g";
   };
 
   sourceRoot = "Homerow.app";
 
-  nativeBuildInputs = [ unzip ];
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
   installPhase = ''
+    runHook preInstall
     mkdir -p "$out/Applications/${sourceRoot}"
     cp -R . "$out/Applications/${sourceRoot}"
+    runHook postInstall
   '';
 
   meta = with lib; {
-    homepage = "https://www.homerow.app/";
-    description = "Spotlight for the macOS user interface";
+    homepage = "https://homerow.app";
+    description = "Keyboard shortcuts for every button in macOS";
     license = licenses.unfree;
     platforms = platforms.darwin;
     maintainers = [ maintainers.sudosubin ];

diff --git a/modules/shared/programs/vscode/default.nix b/modules/shared/programs/vscode/default.nix
@@ -77,7 +77,7 @@ in
       casualjim.gotemplate
       charliermarsh.ruff
       davidanson.vscode-markdownlint
-      dbaeumer.vscode-eslint
+      pkgs.vscode-extensions.dbaeumer.vscode-eslint # TODO
       denoland.vscode-deno
       dorzey.vscode-sqlfluff
       eamodio.gitlens
@@ -94,7 +94,7 @@ in
       ms-kubernetes-tools.vscode-kubernetes-tools
       ms-pyright.pyright
       ms-python.debugpy
-      pkgs.vscode-extensions.ms-python.python
+      pkgs.vscode-extensions.ms-python.python # TODO
       overlays.pkief.material-icon-theme # TODO
       pkief.material-product-icons
       prisma.prisma

diff --git a/scripts/auto-update-modules.yaml b/scripts/auto-update-modules.yaml
@@ -16,17 +16,33 @@ modules:
     methods:
       get_version: |-
         curl -s "https://api.github.com/repos/Hammerspoon/hammerspoon/releases/latest" | jq -r ".name"
-
   - path: ./libraries/nixpkgs/programs/homerow/default.nix
     args:
       read_from_file: []
-      read_from_method: ["version"]
-      write: ["version"]
+      read_from_method: ["version", "sha256"]
+      write: ["version", "sha256"]
     methods:
       get_version: |-
         curl -s "https://install.appcenter.ms/api/v0.1/apps/dexterleng/homerow-redux/distribution_groups/production/public_releases" \
-          -H "user-agent: Chrome/118.0.0.0" \
+          -H "user-agent: Chrome/0.0.0.0" \
           | jq -r "first | .short_version"
+      get_sha256: |-
+        VERSION=$(
+          curl -s "https://install.appcenter.ms/api/v0.1/apps/dexterleng/homerow-redux/distribution_groups/production/public_releases" \
+            -H "user-agent: Chrome/0.0.0.0" \
+            | jq -r "first | .short_version"
+        )
+        RELEASE_ID=$(
+          curl -k "https://install.appcenter.ms/api/v0.1/apps/dexterleng/homerow-redux/distribution_groups/production/public_releases" \
+            -H "user-agent: Chrome/0.0.0.0" \
+            | jq -r ".[] | select(.short_version == \"$VERSION\") | .id"
+        )
+        DOWNLOAD_URL=$(
+          curl -k "https://install.appcenter.ms/api/v0.1/apps/dexterleng/homerow-redux/distribution_groups/production/releases/$RELEASE_ID" \
+            -H "user-agent: Chrome/0.0.0.0" \
+            | jq -r ".download_url"
+        )
+        nix-prefetch-url "$DOWNLOAD_URL" --name "Homerow.app" --unpack
 
   - path: ./libraries/nixpkgs/programs/ijhttp/default.nix
     args: