diff --git a/.gitignore b/.gitignore index 56d94a5..41f67e0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,6 @@ Thumbs.db *.sublime-* *.log .zsh/lib/30-extra.zsh -.gitsecret/keys/random_seed -!*.secret .config/espanso/user/email.yml .config/espanso/user/misc.yml .config/espanso/user/people.yml diff --git a/.gitsecret/keys/pubring.kbx b/.gitsecret/keys/pubring.kbx deleted file mode 100644 index 18c22ef..0000000 Binary files a/.gitsecret/keys/pubring.kbx and /dev/null differ diff --git a/.gitsecret/keys/pubring.kbx~ b/.gitsecret/keys/pubring.kbx~ deleted file mode 100644 index 7751c31..0000000 Binary files a/.gitsecret/keys/pubring.kbx~ and /dev/null differ diff --git a/.gitsecret/keys/trustdb.gpg b/.gitsecret/keys/trustdb.gpg deleted file mode 100644 index dc63388..0000000 Binary files a/.gitsecret/keys/trustdb.gpg and /dev/null differ diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg deleted file mode 100644 index 6a33fcb..0000000 --- a/.gitsecret/paths/mapping.cfg +++ /dev/null @@ -1,6 +0,0 @@ -.config/espanso/user/email.yml:ac89cab929dc42d24287c7ee1e88c6d10a1ef2df37ad3158c17c7db2538b857c -.config/espanso/user/misc.yml:88886c9af9155c2394592367f219dd9720e773be8f0f6bf1ec3f7e59fcaed662 -.config/espanso/user/people.yml:f4dd3b40a0c53978bd96f66c79d9fbc1668ec57c4e46d6fce0e7b30d8d8358c2 -.config/espanso/user/personal.yml:5852be346f3f23f067e1c5e2e44a3632d4a7ca36ffe425c20bc8753793bd8df6 -.config/zsh/lib/30-extras.zsh:7e5f2d74e2477cb8cb1035a88e9e1ede0f3657a94ac5b957db5acf3e6142d388 -.ssh/conf.d/hosts.conf:763ca28ef20475b3954c2371cc253147b5019763225e42366255e2f15b4669e7 diff --git a/.ssh/conf.d/hosts.conf.secret b/.ssh/conf.d/hosts.conf.secret deleted file mode 100644 index 10cdd7c..0000000 Binary files a/.ssh/conf.d/hosts.conf.secret and /dev/null differ diff --git a/Makefile b/Makefile index f79cd5a..ddff514 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ HOMEDIR = ${HOME} help: ## This help @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[1;1;36m%-30s\033[1;0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) -all: git-fetch git-secrets-reveal deploy-macos ## Update repo, decrypt secrets and run deploy-macos +all: git-fetch deploy-macos ## Update repo and run deploy-macos install: git-fetch deploy-base ## Update repor and run deploy-base @@ -26,18 +26,6 @@ gen-vscodium-plugin-list: ## Update the list of VSCodium plugins @echo "\033[1;32m>>>\033[1;0m Updating the list of VSCodium plugins at .config/VSCodium/UserUser/extensions.list" @code --list-extensions > .config/VSCodium/UserUser/extensions.list -git-secrets-hide: ## Hide secrets with git-secret - @echo "\033[1;32m>>>\033[1;0m Encrypting secrets." - @git secret hide - @echo "\033[1;32m>>>\033[1;0m Creating commit." - @git add -A && git commit -m "Updated secrets." - -git-secrets-reveal: ## Reveal secrets with git-secret - @echo "\033[1;32m>>>\033[1;0m Decrypting secrets." - @git secret reveal - @echo "\033[1;32m>>>\033[1;0m Remove encrypted files." - @git secret clean - git-fetch: ## Fetch changes from origin @echo "\033[1;32m>>>\033[1;0m Fetching changes from origin." @git fetch origin main diff --git a/README.md b/README.md index 9a7969e..674a1cd 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,12 @@ The repo ships with a Makefile that you can use to deploy and update the dotfile ```shell # make help help This help -all Update repo, decrypt secrets and run deploy-macos +all Update repo and run deploy-macos install Update repor and run deploy-base deploy-base Only deploy basic conf files for shell usage deploy-workstation Deploy workstation specific config files (inherits deploy-shell) deploy-macos Deploy macOS specific config files (inherits deploy-workstation) gen-vscodium-plugin-list Update the list of VSCodium plugins -git-secrets-hide Hide secrets with git-secret -git-secrets-reveal Reveal secrets with git-secret git-fetch Fetch changes from origin git-push Push changes to origin git-update-submodules Update all submodules @@ -47,8 +45,6 @@ deploy-hushlogin Deploy .hushlogin The dotfiles will be copied to your **~**. -The repo is initialized for beeing used with git-secret. My own personal secrets are pushed to the repo as well and can be decrypted with my GPG key. - ## ZSH with bells and whistles The ZSH config doesn’t use any frameworks and is tuned for speed. @@ -69,6 +65,16 @@ It also supports nested sessions with a modified color scheme. That’s nice whe ![Alacritty window using the dotfiles by chrisb86 in a tmix session](https://raw.githubusercontent.com/chrisb86/dotfiles/main/screenshot-tmix.png) +## Karabiner Elements + +- Map Capslock to CTRl+OPT+CMD +- Map Capslock+Shift to CTRl+OPT+CMD+Shift +- Display start of Music on Play/Pause button and toggle playpause only in Spotify when it's running + +# Aerospace + +Shortcuts + ## Installation ## ### Getting the dotfiles. @@ -80,15 +86,19 @@ git clone https://github.com/chrisb86/dotfiles.git ### Deploying the dotfiles For installing the base set for shell usage run + ```shell make install ``` + For the fullfl edged setup with decrypting of the secrets use + ```shell make install ``` To list all avaliable commands run: + ```shell make help ```