🔥 gcloud config removed

via https://blog.gitbutler.com/how-git-core-devs-configure-git/

.chezmoiroot

@@ -0,0 +1 @@
+chezmoi

chezmoi/.chezmoiexternal.toml

@@ -0,0 +1,24 @@
+[".config/emacs"]
+type = "git-repo"
+url = "https://github.com/doomemacs/doomemacs"
+exact = true
+stripComponents = 1
+refreshPeriod = "24h"
+[".config/tmux/plugins/tpm"]
+type = "git-repo"
+url = "https://github.com/tmux-plugins/tpm.git"
+exact = true
+stripComponents = 1
+refreshPeriod = "24h"
+[".oh-my-zsh"]
+type = "git-repo"
+url = "https://github.com/ohmyzsh/ohmyzsh.git"
+exact = true
+stripComponents = 1
+refreshPeriod = "24h"
+[".oh-my-zsh/custom/plugins/zsh-autosuggestions"]
+type = "git-repo"
+url = "https://github.com/zsh-users/zsh-autosuggestions.git"
+exact = true
+stripComponents = 1
+refreshPeriod = "24h"

chezmoi/dot_asdfrc

@@ -0,0 +1 @@
+legacy_version_file = yes

chezmoi/dot_config/bat/config

@@ -0,0 +1,26 @@
+# This is `bat`s configuration file. Each line either contains a comment or
+# a command-line option that you want to pass to `bat` by default. You can
+# run `bat --help` to get a list of all possible configuration options.
+
+# Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes`
+# for a list of all available themes
+#--theme="TwoDark"
+--theme="Dracula"
+
+# Enable this to use italic text on the terminal. This is not supported on all
+# terminal emulators (like tmux, by default):
+#--italic-text=always
+
+# Uncomment the following line to disable automatic paging:
+#--paging=never
+
+# Uncomment the following line if you are using less version >= 551 and want to
+# enable mouse scrolling support in `bat` when running inside tmux. This might
+# disable text selection, unless you press shift.
+#--pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse"
+
+# Syntax mappings: map a certain filename pattern to a language.
+#   Example 1: use the C++ syntax for Arduino .ino files
+#   Example 2: Use ".gitignore"-style highlighting for ".ignore" files
+#--map-syntax "*.ino:C++"
+#--map-syntax ".ignore:Git Ignore"

chezmoi/dot_config/doom/config.el

@@ -30,9 +30,9 @@
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
-(setq deft-directory "~/Sync/Notes"
+;; (setq deft-directory "~/Sync/Notes"
-      deft-default-extension "md"
+;; deft-default-extension "md"
-      deft-recursive t)
+;; deft-recursive t)
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
@@ -58,6 +58,30 @@
 ;;
 (global-wakatime-mode)
 
-(add-to-list 'auto-mode-alist '("\\.njk" . web-mode))
+;; haskell
 (setq lsp-haskell-formatting-provider "stylish-haskell")
-(setq nix-nixfmt-bin "nixpkgs-fmt")
+
+;; llm
+(gptel-make-ollama "Ollama"
+  :host "localhost:11434"
+  :stream t
+  :models '(mistral:latest))
+
+;; nix-mode
+(with-eval-after-load 'lsp-mode
+  (lsp-register-client
+   (make-lsp-client :new-connection (lsp-stdio-connection "nixd")
+                    :major-modes '(nix-mode)
+                    :priority 0
+                    :server-id 'nixd)))
+
+;; obsidian
+(use-package obsidian
+  :config
+  (global-obsidian-mode t)
+  :custom
+  (obsidian-directory "~/Documents/Notes")
+  (markdown-enable-wiki-links t))
+
+;; web-mode
+(add-to-list 'auto-mode-alist '("\\.njk" . web-mode))

chezmoi/dot_config/doom/init.el

@@ -1,12 +1,11 @@
 ;;; init.el -*- lexical-binding: t; -*-
-;;;
 
 ;; This file controls what Doom modules are enabled and what order they load
 ;; in. Remember to run 'doom sync' after modifying it!
 
 ;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;;      documentation. There you'll find a "Module Index" link where you'll find
+;;      documentation. There you'll find a link to Doom's Module Index where all
-;;      a comprehensive list of Doom's modules and what flags they support.
+;;      of our modules are listed, including what flags they support.
 
 ;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
 ;;      'C-c c k' for non-vim users) to view its documentation. This works on
@@ -16,59 +15,62 @@
 ;;      directory (for easy access to its source code).
 
 (doom! :input
+       ;;bidi              ; (tfel ot) thgir etirw uoy gnipleh
        ;;chinese
        ;;japanese
        ;;layout            ; auie,ctsrnm is the superior home row
 
        :completion
-       company             ; the ultimate code completion backend
+       ;; company           ; the ultimate code completion backend
+       (corfu +orderless)  ; complete with cap(f), cape and a flying feather!
        ;;helm              ; the *other* search engine for love and life
        ;;ido               ; the other *other* search engine...
-       ivy                 ; a search engine for love and life
+       ;;ivy               ; a search engine for love and life
+       vertico           ; the search engine of the future
 
        :ui
-       deft              ; notational velocity for Emacs
+       ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
        (emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-       ;;hydra
        ;;indent-guides     ; highlighted indent columns
-       ligatures           ; ligatures and symbols to make your code pretty again
+       ligatures         ; ligatures and symbols to make your code pretty again
-       minimap             ; show a map of the code on the side
+       minimap           ; show a map of the code on the side
-       modeline            ; snazzy, Atom-inspired modeline, plus API
+       modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim
-       ophints             ; highlight the region an operation acts on
+       ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;tabs              ; a tab bar for Emacs
-       treemacs            ; a project drawer, like neotree but cooler
+       treemacs          ; a project drawer, like neotree but cooler
-       unicode             ; extended unicode support for various languages
+       unicode           ; extended unicode support for various languages
-       vc-gutter           ; vcs diff in the fringe
+       (vc-gutter +pretty) ; vcs diff in the fringe
-       vi-tilde-fringe     ; fringe tildes to mark beyond EOB
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        ;;window-select     ; visually switch windows
-       workspaces          ; tab emulation, persistence & separate workspaces
+       workspaces        ; tab emulation, persistence & separate workspaces
        ;;zen               ; distraction-free coding or writing
 
        :editor
-       (evil +everywhere)  ; come to the dark side, we have cookies
+       (evil +everywhere); come to the dark side, we have cookies
-       file-templates      ; auto-snippets for empty files
+       file-templates    ; auto-snippets for empty files
-       fold                ; (nigh) universal code folding
+       fold              ; (nigh) universal code folding
-       (format +onsave)    ; automated prettiness
+       (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
        ;;objed             ; text object editing for the innocent
        ;;parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
-       snippets            ; my elves. They type so I don't have to
+       snippets          ; my elves. They type so I don't have to
        ;;word-wrap         ; soft wrapping with language-aware indent
 
        :emacs
        dired             ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
-       ;;ibuffer         ; interactive buffer management
+       ;;eww               ; the internet is gross
+       ;;ibuffer           ; interactive buffer management
        undo              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
 
@@ -76,43 +78,44 @@
        ;;eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
-       vterm               ; the best terminal emulation in Emacs
+       vterm             ; the best terminal emulation in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
-       ;;spell             ; tasing you for misspelling mispelling
+       ;;(spell +flyspell) ; tasing you for misspelling mispelling
        ;;grammar           ; tasing grammar mistake every you make
 
        :tools
        ;;ansible
+       ;;biblio            ; Writes a PhD for you (citation needed)
+       ;;collab            ; buffers with friends
        ;;debugger          ; FIXME stepping through code, to help you add bugs
        direnv
        docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
-       gist                ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       lsp
+       llm               ; when I said you needed friends, I didn't mean...
-       magit               ; a git porcelain for Emacs
+       lsp               ; M-x vscode
-       make                ; run make tasks from Emacs
+       magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
        ;;pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
-       ;;rgb               ; creating color strings
+       terraform         ; infrastructure as code
-       ;;taskrunner        ; taskrunner for all your projects
-       terraform           ; infrastructure as code
        ;;tmux              ; an API for interacting with tmux
-       tree-sitter         ; syntax and parsing, sitting in a tree...
+       tree-sitter       ; syntax and parsing, sitting in a tree...
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
-       (:if IS-MAC macos)  ; improve compatibility with macOS
+       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
        ;;tty               ; improve the terminal Emacs experience
 
        :lang
        ;;agda              ; types of types of types of types...
-       ;;cc                ; C/C++/Obj-C madness
+       ;;beancount         ; mind the GAAP
+       ;;(cc +lsp)         ; C > C++ == 1
        ;;clojure           ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
@@ -129,6 +132,7 @@
        ;;fsharp            ; ML stands for Microsoft's Language
        ;;fstar             ; (dependent) types and (monadic) effects and Z3
        ;;gdscript          ; the language you waited for
+       (graphql +lsp)      ; Give queries a REST
        (go +lsp +tree-sitter)  ; the hipster dialect
        (haskell +lsp)      ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
@@ -183,3 +187,6 @@
        :config
        ;;literate
        (default +bindings +smartparens))
+
+(after! doom-cli-env
+  (add-to-list 'doom-env-allow "^SSH_"))

chezmoi/dot_config/doom/packages.el

@@ -3,50 +3,50 @@
 
 ;; To install a package with Doom you must declare them here and run 'doom sync'
 ;; on the command line, then restart Emacs for the changes to take effect -- or
-;; use 'M-x doom/reload'.
 
 
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
-;(package! some-package)
+;; (package! some-package)
 
+(package! obsidian)
 (package! wakatime-mode)
 
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
-;; https://github.com/raxod502/straight.el#the-recipe-format
+;; https://github.com/radian-software/straight.el#the-recipe-format
-;(package! another-package
+;; (package! another-package
-;  :recipe (:host github :repo "username/repo"))
+;;   :recipe (:host github :repo "username/repo"))
 
 ;; If the package you are trying to install does not contain a PACKAGENAME.el
 ;; file, or is located in a subdirectory of the repo, you'll need to specify
 ;; `:files' in the `:recipe':
-;(package! this-package
+;; (package! this-package
-;  :recipe (:host github :repo "username/repo"
+;;   :recipe (:host github :repo "username/repo"
-;           :files ("some-file.el" "src/lisp/*.el")))
+;;            :files ("some-file.el" "src/lisp/*.el")))
 
 ;; If you'd like to disable a package included with Doom, you can do so here
 ;; with the `:disable' property:
-;(package! builtin-package :disable t)
+;; (package! builtin-package :disable t)
 
 ;; You can override the recipe of a built in package without having to specify
 ;; all the properties for `:recipe'. These will inherit the rest of its recipe
 ;; from Doom or MELPA/ELPA/Emacsmirror:
-;(package! builtin-package :recipe (:nonrecursive t))
+;; (package! builtin-package :recipe (:nonrecursive t))
-;(package! builtin-package-2 :recipe (:repo "myfork/package"))
+;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
 
 ;; Specify a `:branch' to install a package from a particular branch or tag.
 ;; This is required for some packages whose default branch isn't 'master' (which
-;; our package manager can't deal with; see raxod502/straight.el#279)
+;; our package manager can't deal with; see radian-software/straight.el#279)
-;(package! builtin-package :recipe (:branch "develop"))
+;; (package! builtin-package :recipe (:branch "develop"))
 
 ;; Use `:pin' to specify a particular commit to install.
-;(package! builtin-package :pin "1a2b3c4d5e")
+;; (package! builtin-package :pin "1a2b3c4d5e")
 
 
 ;; Doom's packages are pinned to a specific commit and updated from release to
 ;; release. The `unpin!' macro allows you to unpin single packages...
-;(unpin! pinned-package)
+;; (unpin! pinned-package)
 ;; ...or multiple packages
-;(unpin! pinned-package another-pinned-package)
+;; (unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;(unpin! t)
+;; (unpin! t)

chezmoi/dot_config/ghostty/config

@@ -0,0 +1,29 @@
+font-family = "JetBrainsMono Nerd Font Mono"
+font-size = 14
+
+background-opacity = 1.0
+
+palette = 0=#21222c
+palette = 1=#ff5555
+palette = 2=#50fa7b
+palette = 3=#f1fa8c
+palette = 4=#bd93f9
+palette = 5=#ff79c6
+palette = 6=#8be9fd
+palette = 7=#f8f8f2
+palette = 8=#6272a4
+palette = 9=#ff6e6e
+palette = 10=#69ff94
+palette = 11=#ffffa5
+palette = 12=#d6acff
+palette = 13=#ff92df
+palette = 14=#a4ffff
+palette = 15=#ffffff
+
+background = 282a36
+foreground = f8f8f2
+cursor-color = f8f8f2
+selection-background = 44475a
+selection-foreground = f8f8f2
+
+keybind = global:ctrl+escape=toggle_quick_terminal

chezmoi/dot_config/git/config

@@ -0,0 +1,50 @@
+[alias]
+	lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
+	st = "status -s"
+	undo = "reset HEAD~1 --mixed"
+	smu = "submodule update --init --recursive"
+	ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
+	up = "pull --rebase --autostash"
+	cleanup = "!git branch -vv|grep ': gone]'|awk '{print $1}'|xargs git branch -D"
+
+[commit]
+	gpgsign = true
+
+[diff]
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+
+[fetch]
+	prune = true
+	pruneTags = true
+	all = true
+
+[github]
+	user = "walkah"
+
+[gpg]
+	format = "ssh"
+
+[gpg "ssh"]
+	allowedSignersFile = "~/.ssh/allowed_signers"
+
+[init]
+	defaultBranch = "main"
+
+[pull]
+	rebase = true
+
+[push]
+	default = simple
+	autoSetupRemote = true
+	followTags = true
+
+[rebase]
+	autoStash = true
+
+[user]
+	email = "walkah@walkah.net"
+	name = "James Walker"
+	signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl"

chezmoi/dot_config/starship.toml

@@ -13,5 +13,8 @@ disabled=true
 ssh_only = false
 format = "[$hostname]($style):"
 
+[kubernetes]
+disabled = false
+
 [username]
 format = "[$user]($style)@"

chezmoi/dot_config/tmux/tmux.conf

@@ -0,0 +1,19 @@
+unbind C-b
+set -g prefix C-o
+
+set -g mouse on
+set -g set-titles on
+set -g set-titles-string "[#S] #W@#h (#I)"
+
+bind-key X kill-session
+
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'dracula/tmux'
+
+# dracula: https://draculatheme.com/tmux
+set -g @dracula-plugins "network battery ssh-session"
+set -g @dracula-show-left-icon session
+set -g @dracula-show-powerline true
+
+run '~/.config/tmux/plugins/tpm/tpm'

chezmoi/dot_config/zed/private_settings.json

@@ -0,0 +1,37 @@
+// Zed settings
+//
+// For information on how to configure Zed, see the Zed
+// documentation: https://zed.dev/docs/configuring-zed
+//
+// To see all of Zed's default settings without changing your
+// custom settings, run the `open default settings` command
+// from the command palette or from `Zed` application menu.
+{
+  "features": {
+    "edit_prediction_provider": "zed"
+  },
+  "agent": {
+    "default_model": {
+      "provider": "copilot_chat",
+      "model": "claude-3.7-sonnet"
+    },
+    "version": "2"
+  },
+  "auto_install_extensions": {
+    "dockerfile": true,
+    "docker-compose": true,
+    "dracula": true,
+    "html": true,
+    "nix": true,
+    "terraform": true
+  },
+  "theme": "Dracula",
+  "buffer_font_family": "JetBrainsMono Nerd Font",
+  "buffer_font_size": 14,
+  "format_on_save": "on",
+  "languages": {
+    "Nix": {
+      "language_servers": ["nixd", "!nil"]
+    }
+  }
+}

chezmoi/dot_npmrc

@@ -0,0 +1 @@
+prefix = ${HOME}/.local

chezmoi/dot_zshenv

@@ -0,0 +1,6 @@
+export EDITOR="vim"
+export GOPATH="$HOME/.go"
+
+export PATH="$PATH${PATH:+:}$HOME/.cargo/bin:$HOME/.deno/bin:$HOME/.config/emacs/bin:$HOME/.go/bin:$HOME/.local/bin"
+
+

chezmoi/dot_zshrc

@@ -0,0 +1,53 @@
+# Path to your oh-my-zsh configuration.
+export ZSH=$HOME/.oh-my-zsh
+
+plugins=(
+  asdf
+  aws
+  bgnotify
+  command-not-found
+  direnv
+  docker
+  docker-compose
+  eza
+  extract
+  gcloud
+  git
+  github
+  mix
+  python
+  tmux
+  zsh-autosuggestions
+)
+
+# asdf config
+export ASDF_GOLANG_MOD_VERSION_ENABLED=true
+export ASDF_NODEJS_LEGACY_FILE_DYNAMIC_STRATEGY=latest_installed
+
+# eza plugin config
+zstyle ':omz:plugins:eza' 'git-status' yes
+zstyle ':omz:plugins:eza' 'header' yes
+
+# python plugin config
+export PYTHON_AUTO_VRUN=true
+
+# OH MY ZSH!
+source $ZSH/oh-my-zsh.sh
+
+# Load starship
+eval "$(starship init zsh)"
+
+# Aliases
+if command -v bat &> /dev/null; then
+ alias -- cat=bat
+fi
+
+if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then
+  source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration
+fi
+
+# The next line updates PATH for the Google Cloud SDK.
+if [ -f '/opt/homebrew/share/google-cloud-sdk/path.zsh.inc' ]; then . '/opt/homebrew/share/google-cloud-sdk/path.zsh.inc'; fi
+
+# The next line enables shell command completion for gcloud.
+if [ -f '/opt/homebrew/share/google-cloud-sdk/completion.zsh.inc' ]; then . '/opt/homebrew/share/google-cloud-sdk/completion.zsh.inc'; fi

chezmoi/private_dot_ssh/allowed_signers

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ0mE4MyMnfd1b2nlBJT7kpZ6Vov+ILuGNfzdp5ZBNQe

config/.Brewfile

@@ -1,45 +0,0 @@
-# ~/.Brewfile
-
-# taps
-tap 'homebrew/cask-drivers'
-tap 'homebrew/cask-fonts'
-
-# brews
-brew 'coreutils'
-brew 'mas'
-
-# casks
-cask '1password'
-cask 'alfred'
-cask 'brave-browser'
-cask 'dash'
-cask 'discord'
-cask 'docker'
-cask 'fantastical'
-cask 'figma'
-cask 'firefox'
-cask 'font-jetbrains-mono'
-cask 'google-chrome'
-cask 'hazel'
-cask 'iterm2'
-cask 'keybase'
-cask 'microsoft-edge'
-cask 'slack'
-cask 'sonos'
-cask 'spotify'
-cask 'stats'
-cask 'syncthing'
-cask 'synology-drive'
-cask 'visual-studio-code'
-cask 'zoomus'
-
-# mac app store
-mas 'Bumpr', id: 1166066070
-mas 'Day One', id: 1055511498
-mas 'Drafts', id: 1435957248
-mas 'Magnet', id: 441258766
-mas 'Parcel', id: 639968404
-mas 'Reeder', id: 1529448980
-mas 'Todoist', id: 585829637
-mas 'UlyssesMac', id: 1225570693
-mas 'Xcode', id: 497799835

config/.gitconfig

@@ -1,31 +0,0 @@
-[user]
-	name = James Walker
-	email = walkah@walkah.net
-	signingkey = 4D47A81C
-[color]
-	diff = auto
-	status = auto
-	branch = auto
-	ui = auto
-[alias]
-	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
-  st = status -s
-	smu = submodule update --init --recursive
-	ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
-	up = pull --rebase --autostash
-  cleanup = "!git branch --merged | grep  -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
-[github]
-	user = walkah
-[git-up "bundler"]
-	check = true
-	autoinstall = true
-[filter "lfs"]
-	clean = git lfs clean %f
-	smudge = git lfs smudge %f
-	required = true
-[commit]
-	gpgsign = true
-[pull]
-	rebase = false
-[init]
-	defaultBranch = main

config/.tmux.conf

@@ -1,16 +0,0 @@
-unbind C-b
-set -g prefix C-o
-
-set -g set-titles on
-set -g set-titles-string "[#S] #W@#h (#I)"
-set -g status-right ""
-set -g default-terminal "screen-256color"
-
-set-option -g status-left-length 60
-
-set -g status-bg black
-set -g status-fg white
-
-bind-key X kill-session
-
-#set-option -g default-command "reattach-to-user-namespace -l zsh"

config/.vimrc

@@ -1,45 +0,0 @@
-"
-" walkah's vimrc (vim 6)
-"
-" $Id: .vimrc,v 1.2 2005-11-08 20:17:32 walkah Exp $
-
-" no compatible
-set nocp
-
-" don't wrap lines
-set nowrap
-
-" don't keep backups
-set nobackup
-
-" visual bell
-set visualbell
-
-set laststatus=2
-
-" indenting stuff
-set expandtab
-set tabstop=2
-set shiftwidth=2
-set smarttab
-set autoindent
-set smartindent
-
-set title
-
-" folding
-set foldmethod=marker
-
-" search
-set nohlsearch
-set incsearch
-set ignorecase
-
-set showmatch
-
-" syntax hilighting
-syntax on
-
-" mappings
-map <PageUp> <C-B>
-map <PageDown> <C-F>

config/.zshenv

@@ -1,25 +0,0 @@
-# ignore system zsh
-IGNORE_SYSTEM_ZSH=1
-
-
-# unique path... and put my stuff first
-typeset -U path
-path=(~/bin ~/local/bin ~/local/sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/X11R6/bin /bin /usr/sbin /sbin /usr/games)
-
-### environment
-export PAGER=less
-export RSYNC_RSH=ssh
-export CVS_RSH=ssh
-#export CVSROOT=/home/cvs
-
-[ -f $HOME/.environment ] && . $HOME/.environment
-
-# Load asdf
-if command -v brew &> /dev/null; then
-  . $(brew --prefix asdf)/asdf.sh
-else 
-  . ~/.asdf/asdf.sh
-fi
-
-[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh
-

config/.zshrc

@@ -1,69 +0,0 @@
-# Path to your oh-my-zsh configuration.
-export ZSH=$HOME/.oh-my-zsh
-
-# Set to the name theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# export ZSH_THEME="walkah"
-
-# My custom directory
-export ZSH_CUSTOM=$HOME/.zsh/custom
-
-# Set to this to use case-sensitive completion
-# export CASE_SENSITIVE="true"
-
-# Comment this out to disable weekly auto-update checks
-# export DISABLE_AUTO_UPDATE="true"
-
-# Uncomment following line if you want to disable colors in ls
-# export DISABLE_LS_COLORS="true"
-
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(asdf direnv aws gcloud extract command-not-found tmux git github ssh-agent docker docker-compose mix)
-
-# ruby
-if [ -x ruby ]; then
-	plugins=($plugins ruby gem rails bundler heroku)
-fi
-
-# node
-plugins=($plugins npm yarn react-native)
-
-# python
-plugins=($plugins pip pipenv)
-
-# Platform specific settings
-case "$OSTYPE" in
-  darwin*)
-    plugins=($plugins osx)
-    ;;
-  linux*)
-    plugins=($plugins debian)
-    export PATH=/snap/bin:$PATH
-    ;;
-esac
-
-# OH MY ZSH!
-source $ZSH/oh-my-zsh.sh
-
-# Android Studio
-if [ -d ~/Library/Android/sdk ]; then
-  export ANDROID_SDK=~/Library/Android/sdk
-  export PATH=~/Library/Android/sdk/platform-tools:$PATH
-fi
-
-# zsh autosuggestions
-if command -v brew &> /dev/null; then
-  zsh_autosuggestions=$(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-  if [ -f $zsh_autosuggestions ]; then
-    source $zsh_autosuggestions
-  fi
-fi
-
-if [ $TERM = "screen" ]; then
-  export DISABLE_AUTO_TITLE="true"
-fi
-export EDITOR="vim"
-export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
-
-eval "$(starship init zsh)"

config/bin/goodmorning.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-function install_latest() {
-  version=$(asdf list-all $1 | grep -v '[a-z]' | tail -1)
-  asdf install $1 $version 
-  asdf global $1 $version
-}
-
-echo "* Updating homesick..."
-homesick pull
-homesick symlink
-
-case "$OSTYPE" in 
-  darwin*)
-    echo "* Restoring mackup..."
-    mackup restore
-    
-    echo "* Homebrew updates..."
-    brew bundle --global --no-lock
-    brew upgrade
-    
-    echo "* Upgrading mac app store apps..."
-    mas upgrade
-    ;;
-  linux*)
-    sudo apt update && sudo apt upgrade
-    sudo snap refresh
-  
-    ;;
-esac
-
-
-
-echo "* asdf update..."
-export R_CONFIGURE_OPTIONS="--with-x=no"
-for plugin in $(cat ~/.tool-versions | awk '{print $1}'); do asdf plugin-add $plugin; done
-asdf update
-asdf plugin-update --all
-asdf install
-for plugin in $(cat ~/.tool-versions | awk '{print $1}'); do install_latest $plugin; done
-
-echo "* Syncing repositories..."
-mr -j 5 update
-
-echo "* Upgrading oh-my-zsh..."
-cd ~/.oh-my-zsh
-git pull --rebase --stat origin master

config/bin/goodnight.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-echo "* Shutdown vagrant..."
-for box in $(vagrant global-status|grep running|awk '{ print $1 }'); do vagrant halt $box; done
-
-echo "* Shutdown docker..."
-# for machine in $(docker-machine ls -q); do docker-machine stop $machine; done
-for container in $(docker ps -a -q); do docker stop $container; done
-docker system prune -f
-
-echo "* Stop running services..."
-brew services stop --all
-
-echo "* Kill tmux sessions..."
-tmux kill-server
-
-echo "* Uncommitted projects..."
-mr -m status
-
-echo "* Homesick status..."
-homesick status

config/bin/macos.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-# Inspired by https://github.com/mathiasbynens/dotfiles/blob/master/.macos
-
-# Dock settings
-defaults write com.apple.dock 'orientation' -string 'left'
-defaults write com.apple.dock autohide -bool true
-killall Dock
-
-# Finder settings
-# TODO: turn on stacks? 
-defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -bool true
-defaults write com.apple.finder ShowHardDrivesOnDesktop -bool true
-defaults write com.apple.finder ShowMountedServersOnDesktop -bool true
-defaults write com.apple.finder ShowRemovableMediaOnDesktop -bool true
-killall Finder
-
-# Safari
-
-# Enable the Develop menu
-defaults write -app Safari IncludeDevelopMenu -bool true
-defaults write -app Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true
-defaults write -app Safari WebKitPreferences.developerExtrasEnabled -bool true 
-# Disable AutoFill
-defaults write -app Safari AutoFillFromAddressBook -bool false
-defaults write -app Safari AutoFillPasswords -bool false
-defaults write -app Safari AutoFillCreditCardData -bool false
-defaults write -app Safari AutoFillMiscellaneousForms -bool false
-
-# Mail
-# TODO: notifications for contacts only 
-# TODO: disable sounds
-
-# Sharing 
-# Turn on SSH
-sudo launchctl load -w /System/Library/LaunchDaemons/ssh.plist
-# TODO: turn on VNC? 
-
-# iTerm 2
-# Specify the preferences directory
-defaults write com.googlecode.iterm2.plist PrefsCustomFolder -string "~/SynologyDrive/Config/iTerm/"
-# Tell iTerm2 to use the custom preferences in the directory
-defaults write com.googlecode.iterm2.plist LoadPrefsFromCustomFolder -bool true

darwin/README.md

@@ -1,3 +0,0 @@
-# Darwin Configuration (deprecated)
-
-I'm not using this repo for `nix-darwin` configuration anymore. If you're curious how I have my machine configured, check out [this repo](https://github.com/walkah/athens).

flake.lock

@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1747046372,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -21,29 +21,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
+        "lastModified": 1731533236,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -60,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660459072,
+        "lastModified": 1709087332,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -80,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696940889,
+        "lastModified": 1756842514,
-        "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
+        "narHash": "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
+        "rev": "30fc1b532645a21e157b6e33e3f8b4c154f86382",
         "type": "github"
       },
       "original": {
@@ -95,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697009197,
+        "lastModified": 1756819007,
-        "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=",
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -109,38 +91,20 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1685801374,
-        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1696846637,
+        "lastModified": 1755960406,
-        "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=",
+        "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca",
+        "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
         "type": "github"
       },
       "original": {
@@ -171,21 +135,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

home.nix

@@ -1,29 +1,30 @@
-{ pkgs, ... }: {
+{ lib, pkgs, ... }: {
-  # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
   home = {
     username = "walkah";
     homeDirectory = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah";
+    packages = with pkgs; [
+      chezmoi
+      bat
+      direnv
+      eza
+      fd
+      fzf
+      git
+      htop
+      jq
+      starship
+      tmux
+    ];
+
+    activation.chezmoi = lib.hm.dag.entryAfter [ "installPackages" ] ''
+      export PATH="${pkgs.git}/bin:$PATH"
+      if [ ! -d $HOME/.local/share/chezmoi ]; then
+        $DRY_RUN_CMD ${pkgs.chezmoi}/bin/chezmoi init --apply walkah/dotfiles
+      fi
+    '';
+
+    stateVersion = "24.05";
   };
-
-  imports = [
-    ./modules
-  ];
-
-  programs = {
-    vim = { enable = true; };
-  };
-
-  # This value determines the Home Manager release that your
-  # configuration is compatible with. This helps avoid breakage
-  # when a new Home Manager release introduces backwards
-  # incompatible changes.
-  #
-  # You can update Home Manager without changing this value. See
-  # the Home Manager release notes for a list of state version
-  # changes in each release.
-  home.stateVersion = "23.05";
 }

modules/default.nix

@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./dev.nix
-    ./emacs.nix
-    ./git.nix
-    ./tmux.nix
-    ./zsh.nix
-  ];
-}

modules/dev.nix

@@ -1,15 +0,0 @@
-_:
-
-{
-  home.file.".ghci".text = ''
-    :set prompt "λ> "
-  '';
-
-  home.sessionPath = [
-    "$HOME/.cargo/bin"
-    "$HOME/.deno/bin"
-    "$HOME/.config/emacs/bin"
-    "$HOME/.go/bin"
-    "$HOME/.local/bin"
-  ];
-}

modules/emacs.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    # Doom requirements
-    fd
-    ripgrep
-    wakatime
-  ];
-
-  home.file.".config/doom" = {
-    source = ../config/.doom.d;
-    recursive = true;
-  };
-
-  programs = {
-    emacs = {
-      enable = true;
-      package = pkgs.emacs29-nox;
-      extraPackages = epkgs: [ epkgs.vterm ];
-    };
-  };
-}

modules/git.nix

@@ -1,39 +0,0 @@
-_:
-
-{
-  # Allowed signers for git commit signing (referenced below).
-  home.file.".ssh/allowed_signers".text = "walkah@walkah.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl";
-
-  programs = {
-    gh = {
-      enable = true;
-      settings = {
-        git_protocol = "ssh";
-      };
-    };
-
-    git = {
-      enable = true;
-      userName = "James Walker";
-      userEmail = "walkah@walkah.net";
-
-      aliases = {
-        lg =
-          "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-        st = "status -s";
-        undo = "reset HEAD~1 --mixed";
-      };
-
-      extraConfig = {
-        commit.gpgsign = true;
-        github.user = "walkah";
-        gpg.format = "ssh";
-        gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
-        init.defaultBranch = "main";
-        pull.rebase = true;
-        rebase.autoStash = true;
-        user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl";
-      };
-    };
-  };
-}

modules/tmux.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs = {
-    tmux = {
-      enable = true;
-      clock24 = true;
-      plugins = with pkgs.tmuxPlugins; [
-        sensible
-        yank
-        {
-          plugin = dracula;
-          extraConfig = ''
-            set -g @dracula-show-battery true
-            set -g @dracula-show-fahrenheit false
-            set -g @dracula-show-left-icon session
-            set -g @dracula-show-powerline true
-            set -g @dracula-refresh-rate 10
-          '';
-        }
-      ];
-      extraConfig = ''
-        set -g set-titles on
-        set -g set-titles-string "[#S] #W@#h (#I)"
-      '';
-      shortcut = "o";
-    };
-  };
-}

modules/zsh.nix

@@ -1,82 +0,0 @@
-_:
-
-{
-  programs = {
-    bat = {
-      enable = true;
-      config = {
-        theme = "Dracula";
-      };
-    };
-    btop.enable = true;
-    direnv.enable = true;
-    eza = {
-      enable = true;
-      enableAliases = true;
-      extraOptions = [ "--header" ];
-      git = true;
-    };
-    fzf = {
-      enable = true;
-      fileWidgetOptions = [ "--preview 'bat --color always {}'" ];
-    };
-
-    zsh = {
-      enable = true;
-      enableAutosuggestions = true;
-      enableCompletion = true;
-      oh-my-zsh = {
-        enable = true;
-        plugins = [
-          "1password"
-          "bundler"
-          "direnv"
-          "docker"
-          "docker-compose"
-          "git"
-          "golang"
-          "mix"
-          "rails"
-          "ssh-agent"
-          "tmux"
-        ];
-      };
-      sessionVariables = {
-        EDITOR = "vim";
-        GOPATH = "$HOME/.go";
-      };
-    };
-
-    starship = {
-      enable = true;
-      enableZshIntegration = true;
-      settings = {
-        # TODO re-enable after https://github.com/starship/starship/issues/5350
-        battery = {
-          disabled = true;
-        };
-        character = {
-          success_symbol = "[»](bold green) ";
-          error_symbol = "[✗](bold red) ";
-        };
-        directory = {
-          fish_style_pwd_dir_length = 1;
-          truncation_length = 1;
-        };
-        hostname = {
-          ssh_only = false;
-          format = "[$hostname]($style):";
-        };
-        gcloud = { disabled = true; };
-        kubernetes = { disabled = false; };
-        username = { format = "[$user]($style)@"; };
-      };
-    };
-  };
-
-  home = {
-    shellAliases = {
-      cat = "bat";
-    };
-  };
-}