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"
@@ -36,4 +35,5 @@
   "mediahuman-audio-converter"
   "imageoptim"
   "appcleaner"
+  "drawio"
 ]

cli/home.nix

@@ -15,7 +15,10 @@ let
       shellAliases = {
         hm = "nix run home-manager/master -- switch --flake github:cupcakearmy/nix?dir=cli#${name} -b backup";
       };
+      # Lists are not recursively updated, need to do by hand
+      packages = common.home.packages ++ [ ];
     };
   };
+  merged = lib.recursiveUpdate common overwrite;
 in
-lib.recursiveUpdate common overwrite
+merged

common/home.nix

@@ -2,7 +2,6 @@
   pkgs,
   ...
 }:
-
 {
 
   home.stateVersion = "25.11";
@@ -19,12 +18,15 @@
     btop
     rclone
     rename
-    tmux
     tree
     wget
     rsync
     yq
     delta
+    kubectl
+    croc
+    asciinema_3
+    grex
 
     # Rust utils
     bat
@@ -38,15 +40,14 @@
     yazi
     starship
 
-    # Dev
+    # TUI
     lazydocker
+    lazygit
     k9s
-    kubectl
 
     # Editor
     neovim
     fzf
-    lazygit
 
     # Fonts
     nerd-fonts.jetbrains-mono
@@ -68,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";
@@ -78,6 +82,7 @@
   };
 
   programs = {
+    home-manager.enable = true;
     direnv.enable = true;
     zoxide.enable = true;
 

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": 1759853171,
-        "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
+        "lastModified": 1764952935,
+        "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
+        "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758805352,
-        "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
+        "lastModified": 1764161084,
+        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
+        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759826507,
-        "narHash": "sha256-vwXL9H5zDHEQA0oFpww2one0/hkwnPAjc47LRph6d0I=",
+        "lastModified": 1764915887,
+        "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bce5fe2bb998488d8e7e7856315f90496723793c",
+        "rev": "42e29df35be6ef54091d3a3b4e97056ce0a98ce8",
         "type": "github"
       },
       "original": {

home/home.nix

@@ -5,103 +5,47 @@
   config,
   ...
 }:
-{
-  # https://nix-community.github.io/home-manager
-  home.stateVersion = "25.05";
-  programs.home-manager.enable = true;
+let
+  common = (import ../common/home.nix) { inherit pkgs; };
+  overwrite = {
+    home.username = host.username;
+    home.homeDirectory = "/Users/${host.username}";
 
-  home.username = host.username;
-  home.homeDirectory = "/Users/${host.username}";
+    home.packages =
+      common.home.packages
+      ++ (import ./pkgs.nix { inherit pkgs; })
+      ++ ((lib.attrByPath [ "extras" "pkgs" ] (pkgs: [ ]) host) pkgs);
 
-  home.packages =
-    (import ./pkgs.nix { inherit pkgs; })
-    ++ ((lib.attrByPath [ "extras" "pkgs" ] (pkgs: [ ]) host) pkgs);
+    fonts.fontconfig.enable = true;
 
-  fonts.fontconfig.enable = true;
+    home = {
 
-  home = {
-    sessionVariables = {
-      EDITOR = "nvim";
-    };
+      file = {
+        ".config/ghostty/config".source = ../files/ghostty/config;
+        ".gitconfig".source = ../files/git/gitconfig;
+        ".gitignore_global".source = ../files/git/gitignore_global;
+        ".gitconfig.local".source = ../secrets/git/config.${host.hostName};
+        ".config/nvim".source = ../files/nvim;
+        "Library/Application Support/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
 
-    file = {
-      ".config/ghostty/config".source = ../files/ghostty/config;
-      ".gitconfig".source = ../files/git/gitconfig;
-      ".gitignore_global".source = ../files/git/gitignore_global;
-      ".gitconfig.local".source = ../secrets/git/config.${host.hostName};
-      ".config/nvim".source = ../files/nvim;
-      "Library/Application Support/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
+        # Secrets
+        ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] (
+          builtins.readFile ../secrets/ssh/config.template
+        );
+      };
 
-      # Secrets
-      ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] (
-        builtins.readFile ../secrets/ssh/config.template
-      );
-    };
+      shellAliases = {
+        p = "pnpm";
+        px = "pnpm -s dlx";
+        n = "fnm use --install-if-missing";
+        c = "pwd | pbcopy";
 
-    shellAliases = {
-      # Rust re-maps
-      l = "eza -a1lh";
-      ls = "eza";
-      cat = "bat";
-      cd = "z";
-
-      # QOL
-      dc = "docker compose";
-      rsync = "rsync -az --info=progress2";
-      t = "tmux new-session -A -s main";
-      e = "nvim";
-      g = "lazygit";
-      d = "lazydocker";
-      p = "pnpm";
-      px = "pnpm -s dlx";
-      n = "fnm use --install-if-missing";
-      c = "pwd | pbcopy";
-      k = "kubectl";
-
-      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";
+      };
     };
   };
 
-  programs = {
-    direnv.enable = true;
-    zoxide.enable = true;
-
-    fish = {
-      enable = true;
-      interactiveShellInit = ''
-        if type -q starship
-          starship init fish | source
-        end
-        if type -q fnm
-          fnm env --use-on-cd | source
-        end
-        if type -q nvs
-          nvs env --source | source
-        end
-      '';
-    };
-    bash = {
-      enable = true;
-    };
-    tmux = {
-      enable = true;
-      clock24 = true;
-      mouse = true;
-      extraConfig = ''
-        # switch panes using Alt-arrow without prefix
-        bind -n M-Left select-pane -L
-        bind -n M-Right select-pane -R
-        bind -n M-Up select-pane -U
-        bind -n M-Down select-pane -D
-
-        # switch panes using jkhl
-        bind h select-pane -L
-        bind l select-pane -R
-        bind j select-pane -U
-        bind k select-pane -D
-      '';
-      shell = "${pkgs.fish}/bin/fish";
-      terminal = "tmux-256color";
-    };
-  };
-}
+  merged = lib.recursiveUpdate common overwrite;
+in
+merged

home/pkgs.nix

@@ -2,56 +2,20 @@
 with pkgs;
 [
   # Base
-  tmux
-  git
-  git-lfs
-  git-crypt
   gh
   bfg-repo-cleaner
-  gnutar
-  gnupg
-  htop
-  btop
-  rclone
-  rename
-  tmux
-  tree
-  wget
   woff2
-  rsync
-  yq
-  delta
-
-  # Rust utils
-  bat
-  eza
-  fd
-  ripgrep
-  ripgrep-all
-  zoxide
-  uutils-coreutils-noprefix
-  dust
-  yazi
-  starship
 
   # Dev
   devenv
   nixpacks
-  ollama
-  colima
-  lazydocker
-  exercism
   posting
   terraform
-  k9s
-  kubectl
   claude-code
+  opencode
 
   # Editor
   nvs
-  neovim
-  fzf
-  lazygit
   lua
   luajitPackages.luarocks
   ast-grep
@@ -71,6 +35,5 @@ with pkgs;
   go
 
   # Fonts
-  nerd-fonts.jetbrains-mono
   karla
 ]

hosts/1k5.nix

@@ -0,0 +1,15 @@
+{
+  username = "nicco";
+  hostName = "1k5";
+  platform = "aarch64-darwin";
+  sshKey = "1k5";
+
+  extras = {
+    casks = [
+      "notion"
+    ];
+    pkgs =
+      pkgs: with pkgs; [
+      ];
+  };
+}

hosts/default.nix

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

hosts/mac14.nix

@@ -14,14 +14,17 @@
       "blender"
       "bambu-studio"
       "cyberduck"
-      "crossover"
+      "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
-      ];
-  };
-}