diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl index 2a8071d..f2820fa 100644 --- a/home/.chezmoi.toml.tmpl +++ b/home/.chezmoi.toml.tmpl @@ -28,7 +28,7 @@ {{- end -}} {{- /* Detect if running in WSL */ -}} -{{- $wsl := true -}} +{{- $wsl := false -}} {{- if eq .chezmoi.os "linux" -}} {{- $wsl = (.chezmoi.kernel.osrelease | lower | contains "microsoft") -}} {{- end -}} @@ -47,6 +47,7 @@ args = [ wsl = {{ $wsl }} [diff] + pager = "delta" scriptContents = false [data.cpu] @@ -70,7 +71,8 @@ args = [ {{ if eq .chezmoi.os "windows" }} [cd] - command = "nu" + command = "powershell.exe" + args = ["-NoLogo"] {{ else }} [cd] command = "fish" diff --git a/home/.chezmoiignore b/home/.chezmoiignore index 6b9091a..62476c8 100644 --- a/home/.chezmoiignore +++ b/home/.chezmoiignore @@ -1,10 +1,16 @@ hooks tool-versions -{{/* generated files, cached files, anything that might change unnecessarily */}} +{{/* WSL Only Files */}} +{{ if (not .wsl) }} -{{ if eq .chezmoi.os "windows" }} -{{/* Ignore Linux/Unix-only files on Windows */}} +setup-wsl-gpg.sh +.gnupg/** + +{{ end }} + +{{/* Linux/Unix Only Files */}} +{{ if (not (eq .chezmoi.os "linux")) }} # Shell configs (Linux-only) .scripts @@ -16,18 +22,17 @@ key.txt # Linux-only config directories .config/kitty +.config/fish +.config/Code +.config/Cursor +.config/lazygit -{{ else }} -{{/* Ignore Windows-only files on Linux/macOS */}} +{{ end }} -# Windows-only -Documents/PowerShell +{{/* Windows Only Files */}} +{{ if (not (eq .chezmoi.os "windows")) }} + +Documents/ AppData/ -{{/* WSL-specific: .gnupg is symlinked to Windows GPG directory */}} -{{ if not .wsl }} -# On non-WSL Linux, .gnupg is managed separately (not via chezmoi) -.gnupg -{{ end }} - -{{ end }} +{{ end }} \ No newline at end of file diff --git a/home/.config-source/cursor/settings.windows.json b/home/.config-source/cursor/settings.windows.json index f378e0d..dc341b0 100755 --- a/home/.config-source/cursor/settings.windows.json +++ b/home/.config-source/cursor/settings.windows.json @@ -34,9 +34,6 @@ "path": "bash", "icon": "terminal-bash" }, - "zsh": { - "path": "zsh" - }, "fish": { "path": "fish" },