add docker shortcuts

README.md

@@ -13,15 +13,14 @@
 ## Installation
 
 ```bash
-# Install nix [without the --determinate flag]
-# ⚠️ When asked if install the determinate version say no
-curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+# Install nix
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --determinate
 
 # Install brew [for casks]
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
 # Get repo
-git clone https://github.com/cupcakearmy/nix-macos ~/.config/nix-macos
+git clone https://github.com/cupcakearmy/nix-macos ~/.config/dotfiles
 
 # Unlock (Given that the base64 key is in your clipboard)
 nix shell nixpkgs#git nixpkgs#git-crypt nixpkgs#coreutils
@@ -30,7 +29,7 @@ git-crypt unlock .key
 
 # Installation
 # Available hosts can be found in the ./hosts directory
-sudo nix run nix-darwin -- switch --flake ~/.config/nix-macos#<host>
+sudo nix run nix-darwin -- switch --flake ~/.config/dotfiles#<host>
 
 # After installation simply use the provided alias to rebuild
 vai

cask.nix

@@ -15,7 +15,6 @@
   "lihaoyun6/tap/quickrecorder"
 
   # Dev
-  "docker-desktop"
   "sloth"
   "vscodium"
   "visual-studio-code"

common/home.nix

@@ -24,6 +24,9 @@
     yq
     delta
     kubectl
+    croc
+    asciinema_3
+    grex
 
     # Rust utils
     bat
@@ -66,6 +69,9 @@
 
       # QOL
       dc = "docker compose";
+      dcl = "dc logs -f";
+      dclt = "dcl --tail 100";
+      dcln = "dcl --since 1m";
       rsync = "rsync -az --info=progress2";
       t = "tmux new-session -A -s main";
       e = "nvim";

darwin.nix

@@ -6,6 +6,7 @@
   ...
 }:
 {
+  nix.enable = false;
   nix.settings = {
     experimental-features = "nix-command flakes";
     substituters = [ "https://devenv.cachix.org" ];

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761584077,
-        "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
+        "lastModified": 1764952935,
+        "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
+        "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761339987,
-        "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=",
+        "lastModified": 1764161084,
+        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de",
+        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761440988,
-        "narHash": "sha256-2qsow3cQIgZB2g8Cy8cW+L9eXDHP6a1PsvOschk5y+E=",
+        "lastModified": 1764915887,
+        "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "de69d2ba6c70e747320df9c096523b623d3a4c35",
+        "rev": "42e29df35be6ef54091d3a3b4e97056ce0a98ce8",
         "type": "github"
       },
       "original": {

home/home.nix

@@ -40,7 +40,7 @@ let
         n = "fnm use --install-if-missing";
         c = "pwd | pbcopy";
 
-        vai = "sudo darwin-rebuild switch --flake ~/.config/nix-macos#${host.hostName}";
+        vai = "sudo darwin-rebuild switch --flake ~/.config/dotfiles#${host.hostName}";
         clean = "nix-collect-garbage -d";
       };
     };

hosts/default.nix

@@ -1,5 +1,4 @@
 [
   (import ./mac14.nix)
-  (import ./ordio.nix)
   (import ./1k5.nix)
 ]

hosts/mac14.nix

@@ -14,13 +14,17 @@
       "blender"
       "bambu-studio"
       "cyberduck"
+      "kicad"
     ];
     pkgs =
       pkgs: with pkgs; [
+        docker-client
+        colima
+        docker-buildx
         biome
         infisical
         ffmpeg
-        pulumi
+        mkcert
       ];
   };
 }

hosts/ordio.nix

@@ -1,33 +0,0 @@
-{
-  username = "nicco";
-  hostName = "ordio";
-  platform = "aarch64-darwin";
-  sshKey = "ordio";
-
-  extras = {
-    casks = [
-      "tableplus"
-      "http-toolkit"
-      "phpstorm"
-      "notion"
-    ];
-    pkgs =
-      pkgs: with pkgs; [
-        mkcert
-        dnsmasq
-        awscli2
-        mysql84
-        cocoapods
-        xcodes
-
-        # For projects
-        pixman
-        pkg-config
-        pango
-        libpng
-        giflib
-        librsvg
-        python313Packages.setuptools
-      ];
-  };
-}