From 47f846cc9a561ce12486ac81f0f4a187536abb27 Mon Sep 17 00:00:00 2001 From: Christian Busch Date: Thu, 12 Feb 2026 20:59:36 +0100 Subject: [PATCH] SSH: Removed secret management --- .gitignore | 2 -- .gitsecret/keys/pubring.kbx | Bin 1976 -> 0 bytes .gitsecret/keys/pubring.kbx~ | Bin 32 -> 0 bytes .gitsecret/keys/trustdb.gpg | Bin 1200 -> 0 bytes .gitsecret/paths/mapping.cfg | 6 ------ .ssh/conf.d/hosts.conf.secret | Bin 754 -> 0 bytes Makefile | 14 +------------- README.md | 20 +++++++++++++++----- 8 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 .gitsecret/keys/pubring.kbx delete mode 100644 .gitsecret/keys/pubring.kbx~ delete mode 100644 .gitsecret/keys/trustdb.gpg delete mode 100644 .gitsecret/paths/mapping.cfg delete mode 100644 .ssh/conf.d/hosts.conf.secret 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 18c22ef7d3a6266fe45eabba0136b24e59acec07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1976 zcmaiz2{hDeAIJYQ#@J&rNG8UXB}|s=yF2zJlx^mYohveiL`t@hy(|-#P$AK^%QBYB zkS&^s5XzE0WJ!%>F7|l&pE&E2LJ#h2n2vlbnQHVqi|w= znt!~G_0M3)1cQF4+W^1-1;7B}z29u@5^0sNr*C?7Ea0i=ebdggqYmV8*XEzzoheW2 z`Plq54v?=}{)XAAv>sinAJ>io1h4`CnEyx#{m8)pCxf1ZpC{3Nf{| zY==@L59PUM2L&k!E|dpJCXt>KA8xEJmBW9hce_AYLHQJse6?rH@4*}L^i-0dWlR#= zcVS)NyX7qY3!#BZuWJ;OUJ@hD$-gtg@R?@VGXGLHidbVlI z*$d`7?Q?Q&_Y6dr$;Y^qBgAK~bvGACX;+@E^OCD$zBHR`+4f;KUkln@Z`}uP?`__g zFS+FFcS@Y2;b29o}U~PHB+ZXx zji}@p`4nqmJ@=)buAtVnF-;>qwZCSrZiJUmk^ygybV^;Yeh^a(j+t|@?H8l(6__kB zYQuA7t)jcVT4Af~Ql||P*4CTC97s6bd{1-`{>4K#s%mXPSLU#OMn1H$>|-U;+us4zYn=v^;*FOj`GA$Jv+;^7cOIkBDIl@ zNQY8(QFHt`p815yW}5{}mX)!OK(&&q^4*DGu7T-|3*%sfZkY(b{ne@OgSx8^`3rW5 zXTeu|sW+4B&>+be`=qY4Mcu=ycI2wY1>VNithksWv+T0G2ga|=Hld5n>gyXp+on4? zuS3%^r)ga5SC)O>E@-$GYQmCRqTB}u1&;Rx5{uoA<6PPcE&|^ zQq1s<`&Q{b(Jo54N;lHey6;au@oLxVndO)MPI&9d8x4b^4(Dl~b8n|`RzLx|BU=Cs z|Hie3V5(D3Wc*ettTP*Rh>Q0X#aZclvXvWc%6srT+m^gS^ZH?U_Z3fFLLYXV7K$9O zNQixiP~lOkNs+gJRjRM!4&HPvCc>YguiRsL#a&A(OOAi5XFTDBb?N!5?6btDp|Nae zLG&r>ENM(KMsi{nghD8Y?D4<|@vb2~k0>%bmdi$CzWV+8!%;@}nNHWZsOc_o9sH#% zn-UEsz7gjmsqM-o+?#3PISVymC1nlFie>KF!n>sKJOL_T-0=5tbN}wAY!z_p(R0P! zG>H^7iYkthj(hIVOp_8(9B`@;e!E|t1uHlqJ$gfxKwYs^YN~|grO)QxE<77*zp^F! zdp3F>*LrgN$>Ys@jz7rD&Q25Fp+X$8#hPsea)etFYl;f)ogBxwe$zBaiAv1sUzIZ{vX^}f8zF^SdBbk1@1=c3u#G* zHVHN;WVXpL2I_yzMic4|)euCZC6RW~5a{FWT*>>fr@y3=zxQ_X2upuBd4^@*l8FX) z^4Hj2D&8LjzNTAPE*6JalIaZVA+@M!H*0L0u=oh3P{Q#RmINch6q1L%g&rM z>4cw!Fx&n(tuyH|`8-3imArbr42;_j;?O2(Tc6>!8aT%FOqEh7j=Ao0-Sg>1%tmIb zYHvPuz)^lQwP;x<#j8uqM|n=s>M-MGgI-6IOP7HCI5#hK@JXD5!#<*FIJshr@4cda z#^0d#oY&+&ikN8FIBiEL6(PQb$*{AJvARjT>neo#q!n@1gV#E+PDOO=ULD#jzSt@CWI}0}cWaa- z#vp|OA;HlKt=)5ET49_*OTmT8Q3 n=lU>o`f{I%7zwrl|AkdN5=9MRr;%a#C9IZbeXtc;njZfEf9G?{ diff --git a/.gitsecret/keys/pubring.kbx~ b/.gitsecret/keys/pubring.kbx~ deleted file mode 100644 index 7751c3181364be1cb1b0cf7024db1c25c309231d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ecmZQzU{GLWWMJ}kib!Jsf&{MR3qTme1_1y``2^Ac diff --git a/.gitsecret/keys/trustdb.gpg b/.gitsecret/keys/trustdb.gpg deleted file mode 100644 index dc63388b13d6b42883702d511dabbda12a20186e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1200 zcmZQfFGy!*W@Ke#Vqi$%TE2h*J7DC(E{-8OstzMazyhP;G8!(R5ExAdl%)dzqRRv$ 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 10cdd7c1867e89d1e43d1222543733b2a713110d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 754 zcmV)r3V(EB(0s?S0PLpuH4ubhL#nHopUrU zR&>YNePSXRT?aew6N`WePQM7I6fBN@L1kcLGQ*GZPji5WimU5)(4dN#jxY%d~k4Xz_`hatI}Ll zrgT{u=5aubr4HA99atUnh{gF*$4LH>0eV*%FowboY~9!AlO_PLmJ47Ed}Lw&50|QK|Ua@|5E%s2z)h(^ShCZR4*7t}VQswq1Fu zyKbRyy06Tlteo@a@oF-*2U@i?=P3;Li;nMy%4yA`E7yln$6xc`NQ2VApaF*ov~4j( z_*}+{yb9F|p=(@~*uiuwu-r+XJw(%7nC|0DhB-=r9FYsEZ=q)U8qjf2WWZl>j$SoC zD=udvf`8USb&RIf-gqs($_y&8Mz>qFW8n$K979t|DPMYer`V`AuylYlPwe}^F-$hk zWkv3DV^jvc3)`wUa8IHarDY)^?`~-}aEJ4)VSo*~uCvC%2o|gAmF8LTbhZYy)%#%F zdPVN0UiMp5TuXYoD!Y3|8o9%<{ms4-FShq&8pxK_#;8(EY)f)mh}nm-opB?aG%Hkn z;NQ`Ricp>_9(oB!L;&z6OCtFsuc|a@?s?wy!;+ZiZShO`Mt1e%jV}W_Y!L@1{K?WJ zDrlh25-1x>>\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 ```