aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--README.md14
-rw-r--r--bashrc8
-rw-r--r--docs/cheatsheet.md2
-rw-r--r--shell/aliases.sh (renamed from sh/aliases.sh)0
-rw-r--r--shell/env.sh (renamed from sh/env.sh)0
-rwxr-xr-xshell/gpg.sh (renamed from sh/gpg.sh)0
-rw-r--r--shell/wsl.sh (renamed from sh/wsl.sh)0
-rw-r--r--zsh/aliases.zsh2
-rw-r--r--zsh/wsl.zsh4
-rw-r--r--zshrc2
10 files changed, 16 insertions, 16 deletions
diff --git a/README.md b/README.md
index 1394999..2844c39 100644
--- a/README.md
+++ b/README.md
@@ -35,20 +35,20 @@ Configs
#### Zsh Configuration
-- [zshrc](zshrc) - Zsh profile (sources [profile.sh](sh/profile.sh) & [zsh/*](zsh))
+- [zshrc](zshrc) - Zsh profile (sources [profile.sh](shell/profile.sh) & [zsh/*](zsh))
- [starship.toml](starship.toml) - [starship](https://starship.rs/) cross-shell theme config
-- [sh/](sh) - Posix compliant cross-shell configs
- - [aliases.sh](sh/aliases.sh) - Alias definitions shared between shells
- - [gpg.sh](sh/gpg.sh) - Sets up the GPG agent bridges between wsl and windows
- - [profile.sh](sh/profile.sh) - Exports and Path additions shared between shells
- - [wsl.sh](sh/wsl.sh) - WSL2 specific config (sources [gpg.sh](sh/gpg.sh))
+- [shell/](sh) - Posix compliant cross-shell configs
+ - [aliases.sh](shell/aliases.sh) - Alias definitions shared between shells
+ - [gpg.sh](shell/gpg.sh) - Sets up the GPG agent bridges between wsl and windows
+ - [profile.sh](shell/profile.sh) - Exports and Path additions shared between shells
+ - [wsl.sh](shell/wsl.sh) - WSL2 specific config (sources [gpg.sh](shell/gpg.sh))
- [zsh/](zsh) - Zsh configs
- [aliases.zsh](zsh/aliases.zsh) - Alias definitions (sources [aliases.sh](zsh/aliases.zsh))
- [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 config (sources [wsl.sh](sh/wsl.sh))
+ - [wsl.zsh](zsh/wsl.zsh) - WSL2 specific config (sources [wsl.sh](shell/wsl.sh))
#### Misc
diff --git a/bashrc b/bashrc
index c40c5e6..b7a2981 100644
--- a/bashrc
+++ b/bashrc
@@ -2,7 +2,7 @@
export DOTFILES="${HOME}/dotfiles"
-source $DOTFILES/sh/env.sh
-source $DOTFILES/sh/aliases.sh
-[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/sh/wsl.sh
-[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/sh/gpg.sh
+source $DOTFILES/shell/env.sh
+source $DOTFILES/shell/aliases.sh
+[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/wsl.sh
+[ -n "${WSL_DISTRO_NAME+1}" ] && source $DOTFILES/shell/gpg.sh
diff --git a/docs/cheatsheet.md b/docs/cheatsheet.md
index 356fcc4..71906a7 100644
--- a/docs/cheatsheet.md
+++ b/docs/cheatsheet.md
@@ -193,6 +193,6 @@ New-ItemProperty -Path $key.PSPath -Name "gpg-bridge" -Value "$cmdl"
### In WSL2
-The only setup needed for getting the YubiKey working in WSL2 is to source/copy-paste [gpg.sh](sh/gpg.sh) in your shell profile.
+The only setup needed for getting the YubiKey working in WSL2 is to source/copy-paste [gpg.sh](shell/gpg.sh) in your shell profile.
Along with the initialization code, I wrote a small function the resets all the related agents/sockets. If you do not attempt to access the Yubikey while it is not inserted, in my experience, gpg works great has no issues once reinserting the Yubikey. It is only (inconsistently) when you try to access a Yubikey that you have removed that puts it in a failed state. \ No newline at end of file
diff --git a/sh/aliases.sh b/shell/aliases.sh
index 77cb68f..77cb68f 100644
--- a/sh/aliases.sh
+++ b/shell/aliases.sh
diff --git a/sh/env.sh b/shell/env.sh
index f802638..f802638 100644
--- a/sh/env.sh
+++ b/shell/env.sh
diff --git a/sh/gpg.sh b/shell/gpg.sh
index 5fa3ec2..5fa3ec2 100755
--- a/sh/gpg.sh
+++ b/shell/gpg.sh
diff --git a/sh/wsl.sh b/shell/wsl.sh
index 5c7b983..5c7b983 100644
--- a/sh/wsl.sh
+++ b/shell/wsl.sh
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index b9e3291..fec40b4 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1,6 +1,6 @@
#!/usr/bin/env zsh
-source "${DOTFILES:-"${HOME}/dotfiles"}/sh/aliases.sh"
+source "${DOTFILES:-"${HOME}/dotfiles"}/shell/aliases.sh"
# Command line head / tail shortcuts
alias -g H='| head'
diff --git a/zsh/wsl.zsh b/zsh/wsl.zsh
index ac0d741..773abe0 100644
--- a/zsh/wsl.zsh
+++ b/zsh/wsl.zsh
@@ -1,7 +1,7 @@
#!/usr/bin/env zsh
-source "${DOTFILES:-"${HOME}/dotfiles"}/sh/wsl.sh"
-source "${DOTFILES:-"${HOME}/dotfiles"}/sh/gpg.sh"
+source "${DOTFILES:-"${HOME}/dotfiles"}/shell/wsl.sh"
+source "${DOTFILES:-"${HOME}/dotfiles"}/shell/gpg.sh"
hash -d w=/mnt/c/Users/$USER
diff --git a/zshrc b/zshrc
index 6e007be..601b2e6 100644
--- a/zshrc
+++ b/zshrc
@@ -4,7 +4,7 @@ export DOTFILES="${HOME}/dotfiles"
# Directory hashtable
hash -d .=${HOME}/dotfiles
-source $DOTFILES/sh/env.sh
+source $DOTFILES/shell/env.sh
source $DOTFILES/antigen/antigen.zsh
source $DOTFILES/zsh/setopt.zsh
source $DOTFILES/zsh/prompt.zsh