diff options
| -rw-r--r-- | README.md | 66 | ||||
| -rw-r--r-- | gitconfig | 2 | ||||
| -rwxr-xr-x | gnupg/gpg.conf | 63 | ||||
| -rw-r--r-- | install.conf.yaml | 2 | ||||
| -rw-r--r-- | ssh/ssh.sh | 10 | ||||
| -rw-r--r-- | zsh/antigen.zsh | 12 | ||||
| -rw-r--r-- | zshrc | 14 |
7 files changed, 134 insertions, 35 deletions
@@ -1,18 +1,64 @@ -# tobyvin's dotfiles +tobyvin's dotfiles +================== -### Installation + +Install +------- + +Clone the repo and its submodules, then install links. ```sh git clone https://github.com/tobyvin/dotfiles.git ~/dotfiles && ~/dotfiles/install ``` -## Configs +The install **will override** the following configs by default: +- ~/.zshrc +- ~/.p10k.zsh +- ~/.gitconfig +- ~/.ssh/config +- ~/.gnupg/gpg.conf + + +To disable overwriting existing configs, set `defaults.link.force` in [install.conf.yaml](install.conf.yaml) to `false`: + +```yaml +# file: install.conf.yaml +- defaults: + link: + create: true + relink: true + force: false <-- +``` -- **gitconfig** -- **ssh/config** -- **zshrc**: sources various config scripts and calls antigen to load plugins -- **zsh/***: various zsh configuration scripts -- **p10k.zsh**: zsh theme config -- **antigen**: plugin manager that installs/updates zsh plugins -- **fzf**: fuzzy finder that integrates with zsh history/autocompletion +Configs +------- + +#### Zsh Configuration +- [zshrc](zshrc) - Zsh profile (sources [zsh/*](zsh)) +- [p10k.zsh](p10k.zsh) - p10k theme config +- [zsh/](zsh) - Zsh configuration scripts + - [aliases.zsh](zsh/aliases.zsh) - Alias definitions and related functions + - [antigen.zsh](zsh/antigen.zsh) - Loads Antigen plugins and theme + - [keybindings.zsh](zsh/keybindings.zsh) - Keybindings and related functions + - [prompt.zsh](zsh/prompt.zsh) - Prompt configuration and prompt theme settings + - [setopt.zsh](zsh/setopt.zsh) - Zsh configuration settings + - [wsl.zsh](zsh/wsl.zsh) - WSL2 specific Zsh configuration + +#### Misc + +- [gitconfig](gitconfig) - Git configuration +- [ssh/](ssh) - SSH related files + - [config](ssh/config) - SSH configuration + - [wsl2-ssh-pageant](ssh/wsl2-ssh-pageant.exe) - connects SSH/GPG sockets between WSL2 and Windows +- [gnupg/](gnupg) - GnuPG (GPG) related files + - [gpg.conf](gnupg/gpg.conf) - GPG configuration +Submodules +---------- + +- ### [Dotbot](https://github.com/anishathalye/dotbot) - A tool that bootstraps your dotfiles ⚡️ + +#### Zsh: +- [antigen](https://github.com/zsh-users/antigen) - The plugin manager for zsh. +- [fzf](https://github.com/junegunn/fzf) - 🌸 A command-line fuzzy finder +- [p10k](https://github.com/romkatv/powerlevel10k) - A Zsh theme
\ No newline at end of file @@ -2,7 +2,7 @@ email = tobyv13@gmail.com name = Toby Vincent username = tobyvin - signingkey = C8F6E06F5C8E2634 + signingkey = 0xC8F6E06F5C8E2634 [url "git@github.com:"] insteadOf = gh: pushInsteadOf = "https://github.com/" diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf new file mode 100755 index 0000000..3635afb --- /dev/null +++ b/gnupg/gpg.conf @@ -0,0 +1,63 @@ +# https://github.com/drduh/config/blob/master/gpg.conf +# https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html +# https://www.gnupg.org/documentation/manuals/gnupg/GPG-Esoteric-Options.html +# Use AES256, 192, or 128 as cipher +personal-cipher-preferences AES256 AES192 AES +# Use SHA512, 384, or 256 as digest +personal-digest-preferences SHA512 SHA384 SHA256 +# Use ZLIB, BZIP2, ZIP, or no compression +personal-compress-preferences ZLIB BZIP2 ZIP Uncompressed +# Default preferences for new keys +default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed +# SHA512 as digest to sign keys +cert-digest-algo SHA512 +# SHA512 as digest for symmetric ops +s2k-digest-algo SHA512 +# AES256 as cipher for symmetric ops +s2k-cipher-algo AES256 +# UTF-8 support for compatibility +charset utf-8 +# Show Unix timestamps +fixed-list-mode +# No comments in signature +no-comments +# No version in output +no-emit-version +# Disable banner +no-greeting +# Long hexidecimal key format +keyid-format 0xlong +# Display UID validity +list-options show-uid-validity +verify-options show-uid-validity +# Display all keys and their fingerprints +with-fingerprint +# Display key origins and updates +#with-key-origin +# Cross-certify subkeys are present and valid +require-cross-certification +# Disable caching of passphrase for symmetrical ops +no-symkey-cache +# Enable smartcard +use-agent +# Disable recipient key ID in messages +throw-keyids +# Default/trusted key ID to use (helpful with throw-keyids) +default-key 0xC8F6E06F5C8E2634 +trusted-key 0xC8F6E06F5C8E2634 +# Use the default key as default recipient +default-recipient-self +# Group recipient keys (preferred ID last) +#group keygroup = 0xFF00000000000001 0xFF00000000000002 0xFF3E7D88647EBCDB +# Keyserver URL +keyserver hkps://keys.openpgp.org +#keyserver hkps://keyserver.ubuntu.com:443 +#keyserver hkps://hkps.pool.sks-keyservers.net +#keyserver hkps://pgp.ocf.berkeley.edu +# Proxy to use for keyservers +#keyserver-options http-proxy=http://127.0.0.1:8118 +#keyserver-options http-proxy=socks5-hostname://127.0.0.1:9050 +# Verbose output +#verbose +# Show expired subkeys +#list-options show-unusable-subkeys
\ No newline at end of file diff --git a/install.conf.yaml b/install.conf.yaml index b9fcd06..7473225 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -12,7 +12,7 @@ - link: ~/.zshrc: - ~/.zprofile: ~/.p10k.zsh: ~/.gitconfig: ~/.ssh/config: "ssh/config" + ~/.gnupg/gpg.conf: "gnupg/gpg.conf"
\ No newline at end of file diff --git a/ssh/ssh.sh b/ssh/ssh.sh deleted file mode 100644 index 9abfbdb..0000000 --- a/ssh/ssh.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ -z "$SSH_AUTH_SOCK" ]; then - # Check for a currently running instance of the agent - RUNNING_AGENT="`ps -ax | grep 'ssh-agent -s' | grep -v grep | wc -l | tr -d '[:space:]'`" - if [ "$RUNNING_AGENT" = "0" ]; then - # Launch a new instance of the agent - ssh-agent -s &> $HOME/.ssh/ssh-agent - fi - eval `cat $HOME/.ssh/ssh-agent` > /dev/null - ssh-add &> /dev/null -fi diff --git a/zsh/antigen.zsh b/zsh/antigen.zsh new file mode 100644 index 0000000..569ee28 --- /dev/null +++ b/zsh/antigen.zsh @@ -0,0 +1,12 @@ +antigen use oh-my-zsh +antigen bundle git +antigen bundle fzf +antigen bundle dotnet +antigen bundle docker +antigen bundle docker-compose +antigen bundle command-not-found +antigen bundle zsh-users/zsh-syntax-highlighting +antigen bundle zsh-users/zsh-autosuggestions +antigen bundle memark/zsh-dotnet-completion +antigen theme romkatv/powerlevel10k.git +antigen apply
\ No newline at end of file @@ -18,16 +18,4 @@ source $ZSH_BASE/zsh/prompt.zsh source $ZSH_BASE/zsh/aliases.zsh source $ZSH_BASE/zsh/keybindings.zsh [ -n "${WSL_DISTRO_NAME+1}" ] && source $ZSH_BASE/zsh/wsl.zsh - -antigen use oh-my-zsh -antigen bundle git -antigen bundle fzf -antigen bundle dotnet -antigen bundle docker -antigen bundle docker-compose -antigen bundle command-not-found -antigen bundle zsh-users/zsh-syntax-highlighting -antigen bundle zsh-users/zsh-autosuggestions -antigen bundle memark/zsh-dotnet-completion -antigen theme romkatv/powerlevel10k.git -antigen apply
\ No newline at end of file +source $ZSH_BASE/zsh/antigen.zsh |