update and keymap

cask.nix

@@ -5,25 +5,24 @@
   "oversight"
 
   # Utility
-  "aldente"
   "alt-tab"
   "keka"
-  "jordanbaird-ice"
   "keycastr"
   "raycast"
   "ghostty"
   "lihaoyun6/tap/quickrecorder"
+  "iina"
+  "shutter-encoder"
 
   # Dev
   "sloth"
   "vscodium"
   "visual-studio-code"
   "utm"
-  "balenaetcher"
+  "bruno"
-  "outerbase-studio"
-  "hoppscotch"
   "zed"
 
+
   # Base
   "obsidian"
   "figma"
@@ -31,10 +30,8 @@
   "ungoogled-chromium"
   "bitwarden"
   "spotify"
-  "slack"
   "yubico-authenticator"
   "mediahuman-audio-converter"
   "imageoptim"
   "appcleaner"
-  "drawio"
 ]

cli/pkgs.nix

@@ -1,46 +0,0 @@
-{ pkgs }:
-with pkgs;
-[
-  # Base
-  tmux
-  git
-  git-lfs
-  git-crypt
-  gnutar
-  gnupg
-  htop
-  btop
-  rclone
-  rename
-  tmux
-  tree
-  wget
-  rsync
-  yq
-
-  # Rust utils
-  bat
-  eza
-  fd
-  ripgrep
-  ripgrep-all
-  zoxide
-  uutils-coreutils-noprefix
-  dust
-  yazi
-  starship
-  difftastic
-
-  # Dev
-  lazydocker
-  k9s
-  kubectl
-
-  # Editor
-  neovim
-  fzf
-  lazygit
-
-  # Fonts
-  nerd-fonts.jetbrains-mono
-]

common/home.nix

@@ -21,7 +21,9 @@
     tree
     wget
     rsync
-    yq
+    moreutils
+    jq
+    yq-go
     kubectl
     croc
     asciinema_3
@@ -68,6 +70,7 @@
       ls = "eza";
       cat = "bat";
       cd = "z";
+      cdi = "zi";
 
       # QOL
       dc = "docker compose";

darwin.nix

@@ -41,9 +41,8 @@
       persistent-apps = [
         "/Applications/Zen.app"
         "/Applications/Ghostty.app"
-        "/Applications/Visual Studio Code.app"
+        "/Applications/Zed.app"
         "/Applications/Spotify.app"
-        "/System/Applications/System Settings.app"
       ];
       persistent-others = [ ];
     };

files/lazydocker/config.yml

@@ -1,2 +1,14 @@
 gui:
   returnImmediately: true
+
+customCommands:
+  containers:
+    - name: "spawn sh"
+      attach: true
+      command: 'docker run -it --rm {{ .Container.ID }} sh'
+    - name: "spawn ash"
+      attach: true
+      command: 'docker run -it --rm {{ .Container.ID }} ash'
+    - name: "spawn bash"
+      attach: true
+      command: 'docker run -it --rm {{ .Container.ID }} bash'

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775360939,
+        "lastModified": 1779678629,
-        "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=",
+        "narHash": "sha256-gHcIFg0mm+KFsg7iZQt67kni3+qR5U3PhEC9P7vKlZ4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2097a5c82bdc099c6135eae4b111b78124604554",
+        "rev": "612bbe3b405ad5f71d7bf9edecc04b678a061652",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775037210,
+        "lastModified": 1779036909,
-        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
+        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
+        "rev": "56c666e108467d87d13508936aade6d567f2a501",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775126147,
+        "lastModified": 1779536132,
-        "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=",
+        "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef",
+        "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
         "type": "github"
       },
       "original": {

home/pkgs.nix

@@ -10,7 +10,6 @@ with pkgs;
   devenv
   nixpacks
   posting
-  terraform
   opencode
 
   # Editor
@@ -21,9 +20,10 @@ with pkgs;
 
   # Language specific
   nixfmt-rfc-style
+  nil
+  nixd
   fnm
   bun
-  deno
   zig
   uv
   ruff

hosts/mac14.nix

@@ -7,18 +7,16 @@
   extras = {
     casks = [
       "surfshark"
-      "visual-studio-code"
       "signal"
       "discord"
       "daisydisk"
       "bambu-studio"
       "cyberduck"
+      "balenaetcher"
       "datagrip"
-      "bruno"
       "transmission"
-      "iina"
       "steam"
-      # "nikitabobko/tap/aerospace"
+      "android-studio"
     ];
     pkgs =
       pkgs: with pkgs; [

scripts/misc.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Set Chromium on exit
+FILE="$HOME/Library/Application Support/Chromium/Local State"
+jq '.browser.enabled_labs_experiments //= [] | .browser.enabled_labs_experiments |= map(select(startswith("clear-data-on-exit") | not)) + ["clear-data-on-exit@1"]' "$FILE" | sponge "$FILE"