diff options
| -rw-r--r-- | INSTALL.md | 14 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | modules/darwin/homebrew.nix | 7 | ||||
| -rw-r--r-- | modules/home/default.nix | 1 | ||||
| -rw-r--r-- | modules/home/git.nix | 2 | ||||
| -rw-r--r-- | modules/home/zsh.nix | 5 |
7 files changed, 23 insertions, 16 deletions
@@ -47,18 +47,18 @@ eval "$(/opt/homebrew/bin/brew shellenv)" ### 4. Clone the repository The clone path is not arbitrary — the `rebuild` and `update` aliases in -`modules/home/zsh.nix` point at `~/ghq/github.com/simenandre/dotfiles`, so -clone it there. +`modules/home/zsh.nix` point at `~/ghq/simenandre.no/dotfiles`, so clone it +there. ```shell -mkdir -p ~/ghq/github.com/simenandre -git clone https://github.com/simenandre/dotfiles.git ~/ghq/github.com/simenandre/dotfiles -cd ~/ghq/github.com/simenandre/dotfiles +mkdir -p ~/ghq/simenandre.no +git clone https://simenandre.no/dotfiles.git ~/ghq/simenandre.no/dotfiles +cd ~/ghq/simenandre.no/dotfiles ``` HTTPS on purpose: SSH access depends on 1Password's SSH agent, which is not -installed yet. After the first switch, git rewrites GitHub HTTPS remotes to SSH -(`url."ssh://git@github.com/".insteadOf`), so this remote keeps working. +installed yet. After the first switch, git rewrites the HTTPS remote to SSH +(`url."git@simenandre.no:".insteadOf`), so this remote keeps working. ### 5. First switch (bootstrap nix-darwin) @@ -17,8 +17,8 @@ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix ### 2. Clone the repository ```shell -git clone https://github.com/simenandre/dotfiles.git ~/ghq/github.com/simenandre/dotfiles -cd ~/ghq/github.com/simenandre/dotfiles +git clone https://simenandre.no/dotfiles.git ~/ghq/simenandre.no/dotfiles +cd ~/ghq/simenandre.no/dotfiles ``` ### 3. Apply the configuration @@ -3,11 +3,11 @@ "config-nvim": { "flake": false, "locked": { - "lastModified": 1774097143, - "narHash": "sha256-NTNEkaZa5CdMrsycC+tqqFBUqa2J9r0GTwFWeU3gWog=", + "lastModified": 1784488620, + "narHash": "sha256-iG9EDNmKDkMRD25deAghsSw8efFta0Vl6Mxib++rE1I=", "owner": "simenandre", "repo": "config.nvim", - "rev": "83cd13c60ba2b8de7b5a50affa0e110c2a608cd6", + "rev": "b6dda087fc86e78e589785a65c61fca23dc383f0", "type": "github" }, "original": { diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index 9c279ef..e906e53 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -22,14 +22,18 @@ # Shell completions "bash-completion" + # Git history rewriting (filter-branch/BFG replacement) + "git-filter-repo" + # System ssh "openssh" # Container tools (kept in brew for reliable macOS runtime) + # The docker formula ships its own completions; the separate + # docker-completion formula collides with it and blocks `brew link`. "docker" "docker-buildx" "docker-compose" - "docker-completion" "colima" "podman" "podman-compose" @@ -70,6 +74,7 @@ masApps = { "Tailscale" = 1475387142; + "Xcode" = 497799835; "Jojo" = 1659864300; "Adobe Lightroom" = 1451544217; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index 495a962..7f3e820 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -26,6 +26,7 @@ claude-code dina.packages.${pkgs.stdenv.hostPlatform.system}.default delta + forgejo-cli fzf gh ghq diff --git a/modules/home/git.nix b/modules/home/git.nix index bfd0b40..20cb197 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -51,6 +51,8 @@ "gpg \"ssh\"".program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; "url \"ssh://git@github.com/\"".insteadOf = "https://github.com/"; "url \"ssh://git@codeberg.org/\"".insteadOf = "https://codeberg.org/"; + # scp-style, not ssh://: the server rejects the absolute-path form + "url \"git@simenandre.no:\"".insteadOf = "https://simenandre.no/"; commit.gpgsign = true; } else {}); }; diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index a3b35cd..ab6489d 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -114,8 +114,8 @@ in alias ls='ls --color' '' + (if pkgs.stdenv.isDarwin then '' alias tailscale='/Applications/Tailscale.app/Contents/MacOS/Tailscale' - alias rebuild='sudo darwin-rebuild switch --flake ~/ghq/github.com/simenandre/dotfiles#default' - alias update='nix flake update --flake ~/ghq/github.com/simenandre/dotfiles && sudo darwin-rebuild switch --flake ~/ghq/github.com/simenandre/dotfiles#default' + alias rebuild='sudo darwin-rebuild switch --flake ~/ghq/simenandre.no/dotfiles#default' + alias update='nix flake update --flake ~/ghq/simenandre.no/dotfiles && sudo darwin-rebuild switch --flake ~/ghq/simenandre.no/dotfiles#default' alias nix-gc='sudo nix-collect-garbage --delete-older-than 14d && nix-collect-garbage --delete-older-than 14d && nix store gc' '' else "") + '' @@ -221,7 +221,6 @@ in generate kubectl kubectl completion zsh generate helm helm completion zsh generate pulumi pulumi gen-completion zsh - generate bun bun completions zsh generate pnpm pnpm completion zsh generate deno deno completions zsh generate flyctl flyctl completion zsh |