feat: Replace CleanShot with Shottr

libraries/home-manager/default.nix

@@ -13,14 +13,14 @@ in
     ./programs/1password
     ./programs/act
     ./programs/caffeinate
-    ./programs/cleanshot
     ./programs/clop
     ./programs/defaults
     ./programs/hammerspoon
     ./programs/homerow
     ./programs/jq
     ./programs/kube
     ./programs/lsd
+    ./programs/shottr
     ./programs/skhd
     ./programs/yabai
 

libraries/home-manager/programs/cleanshot/default.nix → libraries/home-manager/programs/shottr/default.nix

@@ -3,37 +3,37 @@ with lib;
 
 let
   inherit (pkgs.stdenvNoCC.hostPlatform) isDarwin;
-  cfg = config.services.cleanshot;
+  cfg = config.services.shottr;
 
 in
 {
-  options.services.cleanshot = {
-    enable = mkEnableOption "cleanshot";
+  options.services.shottr = {
+    enable = mkEnableOption "shottr";
 
-    package = mkPackageOption pkgs "cleanshot" { };
+    package = mkPackageOption pkgs "shottr" { };
   };
 
   config = mkMerge [
     {
       assertions = [
         {
           assertion = cfg.enable -> isDarwin;
-          message = "Nix cleanshot only supports darwin.";
+          message = "Nix shottr only supports darwin.";
         }
       ];
     }
 
     (mkIf cfg.enable {
       home.packages = [ cfg.package ];
 
-      launchd.agents.cleanshot = {
+      launchd.agents.shottr = {
         enable = true;
         config = {
-          ProgramArguments = [ "${config.home.homeDirectory}/Applications/Home Manager Apps/${cfg.package.sourceRoot}/Contents/MacOS/CleanShot X" ];
+          ProgramArguments = [ "${config.home.homeDirectory}/Applications/Home Manager Apps/${cfg.package.sourceRoot}/Contents/MacOS/Shottr" ];
           KeepAlive = true;
           ProcessType = "Interactive";
-          StandardOutPath = "${config.xdg.cacheHome}/cleanshot.log";
-          StandardErrorPath = "${config.xdg.cacheHome}/cleanshot.log";
+          StandardOutPath = "${config.xdg.cacheHome}/shottr.log";
+          StandardErrorPath = "${config.xdg.cacheHome}/shottr.log";
         };
       };
     })

libraries/nixpkgs/default.nix

@@ -8,7 +8,6 @@
 
     (final: prev: {
       apple-cursor-theme = final.callPackage ./programs/apple-cursor-theme { };
-      cleanshot = final.callPackage ./programs/cleanshot { };
       clop = final.callPackage ./programs/clop { };
       git-spr = final.callPackage ./programs/git-spr { };
       hammerspoon = final.callPackage ./programs/hammerspoon { };
@@ -17,21 +16,22 @@
       orbstack = final.callPackage ./programs/orbstack { };
       pragmatapro = final.callPackage ./programs/pragmatapro { };
       redisinsight = final.callPackage ./programs/redisinsight { };
+      shottr = final.callPackage ./programs/shottr { };
       zpl-open = final.callPackage ./programs/zpl-open { };
     })
   ];
 
   nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (lib.getName pkg) [
     "1password"
     "1password-cli"
-    "cleanshot"
     "datagrip"
     "google-chrome"
     "homerow"
     "ijhttp"
     "ngrok"
     "orbstack"
     "redisinsight"
+    "shottr"
     "slack"
     "zoom"
   ]);

libraries/nixpkgs/programs/orbstack/default.nix

@@ -1,17 +1,17 @@
 { lib, fetchurl, fetchFromGitHub, stdenvNoCC, docker, docker-compose_1, installShellFiles }:
 
 let
-  version = "1.6.0_16999";
+  version = "1.6.1_17010";
   hdiutil = "/usr/bin/hdiutil";
 
   sources = {
     "aarch64-darwin" = {
       url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${version}_arm64.dmg";
-      sha256 = "1qnj25lr0p571nsrgmwdj7lp2vbaznp1763jnh01cjzd6sgm4mi0";
+      sha256 = "0nhq98r1nmbvyh9pkk56qlhjkakn3h3fbip51ad17w1y83a4z66i";
     };
     "x86_64-darwin" = {
       url = "https://cdn-updates.orbstack.dev/amd64/OrbStack_v${version}_amd64.dmg";
-      sha256 = "1fba1zgkz6a0ysbz3sa2sxcds7sdmanp85b4hmw00zxidhl6pyk7";
+      sha256 = "1fmx2xblzyxf2k20bzg0s80990rf8dg4ghrvb82waqw0vlm651l0";
     };
   };
 

libraries/nixpkgs/programs/cleanshot/default.nix → libraries/nixpkgs/programs/shottr/default.nix

@@ -5,15 +5,15 @@ let
 
 in
 stdenvNoCC.mkDerivation rec {
-  pname = "cleanshot";
-  version = "4.6.2";
+  pname = "shottr";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "https://updates.getcleanshot.com/v3/CleanShot-X-${version}.dmg";
-    sha256 = "04qf45v7x54729i5zpbq1f60811db6jvy15rax6184zpsdd13fxv";
+    url = "https://shottr.cc/dl/Shottr-${version}.dmg";
+    sha256 = "0k1fz4fff62njr6niq3r5vlddbyi9729richczwj53kmhv6di8zh";
   };
 
-  sourceRoot = "CleanShot X.app";
+  sourceRoot = "Shottr.app";
 
   unpackPhase = ''
     mkdir -p ./Applications
@@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://cleanshot.com/";
-    description = "Screen capturing tool";
+    homepage = "https://shottr.cc/";
+    description = "Screenshot measurement and annotation tool";
     license = licenses.unfree;
     platforms = platforms.darwin;
     maintainers = [ maintainers.sudosubin ];

modules/darwin/home.nix

@@ -21,6 +21,7 @@
       ngrok
       redisinsight
       ripgrep
+      shottr
       slack
       unzip
       zoom-us
@@ -63,11 +64,11 @@
       ../shared/programs/xdg
 
       ../darwin/programs/caffeinate
-      ../darwin/programs/cleanshot
       ../darwin/programs/clop
       ../darwin/programs/desktop
       ../darwin/programs/hammerspoon
       ../darwin/programs/homerow
+      ../darwin/programs/shottr
       ../darwin/programs/skhd
       ../darwin/programs/yabai
     ];

modules/darwin/programs/cleanshot/default.nix → modules/darwin/programs/shottr/default.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  services.cleanshot = {
+  services.shottr = {
     enable = true;
   };
 }

modules/darwin/programs/yabai/default.nix

@@ -23,7 +23,6 @@
       yabai -m rule --add app="^System Preferences$" manage="off"
 
       # Third-party
-      yabai -m rule --add app="^CleanShot X$" manage="off"
       yabai -m rule --add app="^Homerow$" manage="off"
     '';
   };

scripts/auto-update-modules.yaml

@@ -1,13 +1,4 @@
 modules:
-  - path: ./libraries/nixpkgs/programs/cleanshot/default.nix
-    args:
-      read_from_file: ["url"]
-      read_from_method: ["version"]
-      write: ["version", "sha256"]
-    methods:
-      get_version: |-
-        curl -sL "https://formulae.brew.sh/api/cask/cleanshot.json" | jq -r ".version"
-
   - path: ./libraries/nixpkgs/programs/clop/default.nix
     args:
       read_from_file: ["url"]
@@ -67,3 +58,12 @@ modules:
     methods:
       get_version: |-
         curl -s "https://formulae.brew.sh/api/cask/redisinsight.json" | jq -r ".version"
+
+  - path: ./libraries/nixpkgs/programs/shottr/default.nix
+    args:
+      read_from_file: ["url"]
+      read_from_method: ["version"]
+      write: ["version", "sha256"]
+    methods:
+      get_version: |-
+        curl -sL "https://formulae.brew.sh/api/cask/shottr.json" | jq -r ".version"