From 286f10a303ee089b27af1a8a45e6c6af0575ed66 Mon Sep 17 00:00:00 2001
From: nicco <niccolo.borgioli@1komma5grad.com>
Date: Thu, 15 Oct 2026 11:18:48 +0200
Subject: [PATCH] cleanup and switched a few utilities

---
 cask.nix      |  4 ++--
 darwin.nix    |  6 ------
 flake.lock    | 38 +++++++++++++++++++++++++++++++++++++-
 flake.nix     |  5 ++++-
 home/home.nix |  3 ++-
 home/pkgs.nix |  3 ---
 6 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/cask.nix b/cask.nix
index 8083552..dbf2601 100644
--- a/cask.nix
+++ b/cask.nix
@@ -6,13 +6,13 @@
 
   # Utility
   "alt-tab"
-  "keka"
+  "macpacker"
   "keycastr"
-  "raycast"
   "abue-ammar/tinycast/tinycast"
   "ghostty"
   "iina"
   "cap"
+  "macusb"
 
   # Dev
   "sloth"
diff --git a/darwin.nix b/darwin.nix
index 60058bb..a7d973d 100644
--- a/darwin.nix
+++ b/darwin.nix
@@ -7,12 +7,6 @@
 }:
 {
   nix.enable = false;
-  nix.settings = {
-    experimental-features = "nix-command flakes";
-    substituters = [ "https://devenv.cachix.org" ];
-    trusted-public-keys = [ "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" ];
-  };
-
   # Set Git commit hash for darwin-version.
   system.configurationRevision = flake.rev or flake.dirtyRev or null;
 
diff --git a/flake.lock b/flake.lock
index 6555c3c..995ba6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,25 @@
         "type": "github"
       }
     },
+    "mole": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1792049451,
+        "narHash": "sha256-600ceEZVAFrwwbek3B+KdPlu+Q+/CM7Xn6XnadnXF6g=",
+        "owner": "tw93",
+        "repo": "mole",
+        "rev": "c5ca9f6900151fb402f9ec3eab4550f82a0e9ea6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tw93",
+        "ref": "main",
+        "repo": "mole",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -41,6 +60,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1791244311,
+        "narHash": "sha256-cy5PsNucfXU5+KtLR+S9/zdkWOUplhL5Xr0LQWhSYbs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2bd3427b41d10b8318383195efe502ed1baca6cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-26.05-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1790390834,
         "narHash": "sha256-StRyS/lFHtIw/UgJk+xo+HA66mtoWeDUbkJdvf2Byn4=",
@@ -59,8 +94,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "mole": "mole",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index ea95ce8..be046c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,8 @@
 
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    mole.url = "github:tw93/mole/main";
   };
 
   outputs =
@@ -17,6 +19,7 @@
       nix-darwin,
       nixpkgs,
       home-manager,
+      mole,
     }:
     let
       hosts = import ./hosts;
@@ -38,7 +41,7 @@
                 home-manager.backupFileExtension = "backup";
                 home-manager.useGlobalPkgs = true;
                 home-manager.useUserPackages = true;
-                home-manager.users.${host.username} = import ./home/home.nix { inherit host; };
+                home-manager.users.${host.username} = import ./home/home.nix { inherit host mole; };
               }
             ];
           };
diff --git a/home/home.nix b/home/home.nix
index 175a392..ec6363c 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,4 +1,4 @@
-{ host }:
+{ host, mole }:
 {
   pkgs,
   lib,
@@ -14,6 +14,7 @@ let
     home.packages =
       common.home.packages
       ++ (import ./pkgs.nix { inherit pkgs; })
+      ++ [ mole.packages.${host.platform}.mole ]
       ++ ((lib.attrByPath [ "extras" "pkgs" ] (pkgs: [ ]) host) pkgs);
 
     fonts.fontconfig.enable = true;
diff --git a/home/pkgs.nix b/home/pkgs.nix
index 0dc7462..bcb44bc 100644
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -7,7 +7,6 @@ with pkgs;
   woff2
 
   # Dev
-  devenv
   nixpacks
   posting
   opencode
@@ -26,8 +25,6 @@ with pkgs;
   nixd # Nix
 
   # Language specific
-  nil
-  nixd
   bun
   zig
   uv