From 4af88f74227cfc1fa7066067f4cd32c19216a57e Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 13 Sep 2024 17:35:03 -0400 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20trying=20chezmoi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .chezmoiroot | 1 + chezmoi/.chezmoiexternal.toml | 30 ++++ chezmoi/dot_config/doom/config.el | 78 ++++++++++ chezmoi/dot_config/doom/init.el | 186 ++++++++++++++++++++++++ chezmoi/dot_config/doom/packages.el | 52 +++++++ chezmoi/dot_config/git/config | 35 +++++ chezmoi/dot_config/starship.toml | 17 +++ chezmoi/dot_config/tmux/tmux.conf | 22 +++ chezmoi/dot_npmrc | 1 + chezmoi/dot_zshenv | 6 + chezmoi/dot_zshrc | 32 ++++ chezmoi/private_dot_ssh/allowed_signers | 1 + 12 files changed, 461 insertions(+) create mode 100644 .chezmoiroot create mode 100644 chezmoi/.chezmoiexternal.toml create mode 100644 chezmoi/dot_config/doom/config.el create mode 100644 chezmoi/dot_config/doom/init.el create mode 100644 chezmoi/dot_config/doom/packages.el create mode 100644 chezmoi/dot_config/git/config create mode 100644 chezmoi/dot_config/starship.toml create mode 100644 chezmoi/dot_config/tmux/tmux.conf create mode 100644 chezmoi/dot_npmrc create mode 100644 chezmoi/dot_zshenv create mode 100644 chezmoi/dot_zshrc create mode 100644 chezmoi/private_dot_ssh/allowed_signers diff --git a/.chezmoiroot b/.chezmoiroot new file mode 100644 index 0000000..73d74c2 --- /dev/null +++ b/.chezmoiroot @@ -0,0 +1 @@ +chezmoi diff --git a/chezmoi/.chezmoiexternal.toml b/chezmoi/.chezmoiexternal.toml new file mode 100644 index 0000000..45f85ff --- /dev/null +++ b/chezmoi/.chezmoiexternal.toml @@ -0,0 +1,30 @@ +[".asdf"] + type = "git-repo" + url = "https://github.com/asdf-vm/asdf.git" + exact = true + stripComponents = 1 + refreshPeriod = "24h" +[".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" diff --git a/chezmoi/dot_config/doom/config.el b/chezmoi/dot_config/doom/config.el new file mode 100644 index 0000000..7ce999a --- /dev/null +++ b/chezmoi/dot_config/doom/config.el @@ -0,0 +1,78 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. +(setq user-full-name "James Walker" + user-mail-address "walkah@walkah.net") + +;; Doom exposes five (optional) variables for controlling fonts in Doom. Here +;; are the three important ones: +;; +;; + `doom-font' +;; + `doom-variable-pitch-font' +;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; +;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd +;; font string. You generally only need these two: +;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) +(setq doom-font (font-spec :family "JetBrains Mono" :size 14)) + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'doom-dracula) + +;; 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" + deft-default-extension "md" + 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'. +(setq display-line-numbers-type t) + + +;; Here are some additional functions/macros that could help you configure Doom: +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. +;; +(global-wakatime-mode) + +;; haskell +(setq lsp-haskell-formatting-provider "stylish-haskell") + +;; nix-mode +(setq nix-nixfmt-bin "nixpkgs-fmt") +(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))) + +;; web-mode +(add-to-list 'auto-mode-alist '("\\.njk" . web-mode)) + +;; TODO: remove when macport updates. +;; see: https://discourse.doomemacs.org/t/how-to-have-tool-bar-mode-0-apply-at-startup-to-avoid-large-title-bar-on-macos-sonoma-when-using-railwaycat-homebrew-emacsmacport/4222/4 +(add-hook 'doom-after-init-hook (lambda () (tool-bar-mode 1) (tool-bar-mode 0))) diff --git a/chezmoi/dot_config/doom/init.el b/chezmoi/dot_config/doom/init.el new file mode 100644 index 0000000..b5ebd44 --- /dev/null +++ b/chezmoi/dot_config/doom/init.el @@ -0,0 +1,186 @@ +;;; 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 +;; a comprehensive list of Doom's modules and 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 +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + 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 + minimap ; show a map of the code on the side + 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 + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + treemacs ; a project drawer, like neotree but cooler + unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere) ; come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + (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 + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;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 + + :checkers + syntax ; tasing you for every semicolon you forget + ;;spell ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;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) + lookup ; navigate your code and its documentation + lsp + 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 + ;;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... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC 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 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + (elixir +lsp +tree-sitter) ; erlang done right + (elm +lsp) ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;faust ; dsp, but you get to keep your soul + ;;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 + ;;idris ; a language you can depend on + json ; At least it ain't XML + ;;(java +meghanada) ; the poster child for carpal tunnel syndrome + (javascript +lsp +tree-sitter) ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean + ;;factor + ;;ledger ; an accounting system in Emacs + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + (nix +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + ;;(org +roam) ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + rest ; Emacs as a REST client + ;;rst ; ReST in peace + (ruby +rails +lsp) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + (rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;scheme ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + (web +lsp +tree-sitter) ; the tubes + yaml ; JSON, but readable + + :email + ;;(mu4e +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/chezmoi/dot_config/doom/packages.el b/chezmoi/dot_config/doom/packages.el new file mode 100644 index 0000000..279b40f --- /dev/null +++ b/chezmoi/dot_config/doom/packages.el @@ -0,0 +1,52 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; 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! 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 +;(package! another-package +; :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 +; :recipe (:host github :repo "username/repo" +; :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) + +;; 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-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) +;(package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;(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) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) diff --git a/chezmoi/dot_config/git/config b/chezmoi/dot_config/git/config new file mode 100644 index 0000000..2c52b2c --- /dev/null +++ b/chezmoi/dot_config/git/config @@ -0,0 +1,35 @@ +[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 --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d" + + +[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] + email = "walkah@walkah.net" + name = "James Walker" + signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl" diff --git a/chezmoi/dot_config/starship.toml b/chezmoi/dot_config/starship.toml new file mode 100644 index 0000000..ebc2a68 --- /dev/null +++ b/chezmoi/dot_config/starship.toml @@ -0,0 +1,17 @@ +[character] +success_symbol = "[ยป](bold green) " +error_symbol = "[โœ—](bold red) " + +[directory] +fish_style_pwd_dir_length = 1 +truncation_length = 1 + +[gcloud] +disabled=true + +[hostname] +ssh_only = false +format = "[$hostname]($style):" + +[username] +format = "[$user]($style)@" diff --git a/chezmoi/dot_config/tmux/tmux.conf b/chezmoi/dot_config/tmux/tmux.conf new file mode 100644 index 0000000..a7e527e --- /dev/null +++ b/chezmoi/dot_config/tmux/tmux.conf @@ -0,0 +1,22 @@ +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)" +set -g status-right "" +set -g default-terminal "screen-256color" + +bind-key X kill-session + +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'dracula/tmux' + +# dracula +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 + +run '~/.config/tmux/plugins/tpm/tpm' diff --git a/chezmoi/dot_npmrc b/chezmoi/dot_npmrc new file mode 100644 index 0000000..bcfd5dc --- /dev/null +++ b/chezmoi/dot_npmrc @@ -0,0 +1 @@ +prefix = ${HOME}/.local diff --git a/chezmoi/dot_zshenv b/chezmoi/dot_zshenv new file mode 100644 index 0000000..ff26ed9 --- /dev/null +++ b/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" + + diff --git a/chezmoi/dot_zshrc b/chezmoi/dot_zshrc new file mode 100644 index 0000000..c483116 --- /dev/null +++ b/chezmoi/dot_zshrc @@ -0,0 +1,32 @@ +# Path to your oh-my-zsh configuration. +export ZSH=$HOME/.oh-my-zsh + +plugins=(asdf direnv aws gcloud extract command-not-found tmux git github ssh-agent docker docker-compose mix zsh-autosuggestions) + +# 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 + +if [ $TERM = "screen" ]; then + export DISABLE_AUTO_TITLE="true" +fi + +eval "$(starship init zsh)" + +# Aliases +if command -v bat &> /dev/null; then + alias -- cat=bat +fi +if command -v eza &> /dev/null; then + alias -- eza='eza --git --header' + alias -- la='eza -a' + alias -- ll='eza -l' + alias -- lla='eza -la' + alias -- ls=eza + alias -- lt='eza --tree' +fi \ No newline at end of file diff --git a/chezmoi/private_dot_ssh/allowed_signers b/chezmoi/private_dot_ssh/allowed_signers new file mode 100644 index 0000000..38d2638 --- /dev/null +++ b/chezmoi/private_dot_ssh/allowed_signers @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ0mE4MyMnfd1b2nlBJT7kpZ6Vov+ILuGNfzdp5ZBNQe \ No newline at end of file