From d1094ae99462cc362e49df08eca22ef4d2c90481 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Thu, 19 Oct 2023 02:20:28 +0200 Subject: [PATCH] Improve yadm and other configs --- .bin/.e | 5 ++--- .bin/autoinstall | 17 ++++++++++++++--- .config/aliasrc | 2 +- .config/env.d/.gitignore | 2 ++ .config/home-manager/common.nix | 1 + ... home.nix##hostname.portable,user.serguzim} | 0 .config/yadm/bootstrap | 2 ++ .local/share/yadm/archive | Bin 990 -> 1039 bytes .npmrc | 2 ++ 9 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 .config/env.d/.gitignore rename .config/home-manager/{portable-tobias.nix => home.nix##hostname.portable,user.serguzim} (100%) create mode 100644 .npmrc diff --git a/.bin/.e b/.bin/.e index a9d4c28..97bffc6 100755 --- a/.bin/.e +++ b/.bin/.e @@ -8,9 +8,8 @@ declare -A mapper=( ["autostart.toml"]="$HOME/.config/autostart.toml" ["bash"]="$HOME/.bashrc" ["bspwm"]="$HOME/.config/bspwm/bspwmrc" - ["environment"]="$HOME/.config/environment" - ["environment.d"]="$HOME/.config/environment.d/" - ["environment.local"]="$HOME/.config/environment.d/99-local" + ["env"]="$HOME/.config/environment" + ["env.d"]="$HOME/.config/env.d/" ["git"]="$HOME/.config/git/config" ["git-ignore"]="$HOME/.config/git/ignore" ["home-manager"]="$HOME/.config/home-manager/home.nix" diff --git a/.bin/autoinstall b/.bin/autoinstall index 9c71b5d..fd6037b 100755 --- a/.bin/autoinstall +++ b/.bin/autoinstall @@ -12,9 +12,16 @@ _autoinstall_base () { [ ! -x "$(command -v starship)" ] \ && curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh - _autoinstall_file \ - "https://raw.githubusercontent.com/qw3rtman/git-fire/master/git-fire" \ - "$HOME/.local/bin/git-fire" + [ ! -x "$(command -v "git-fire")" ] \ + && _autoinstall_exe \ + "https://raw.githubusercontent.com/qw3rtman/git-fire/master/git-fire" \ + "$HOME/.local/bin/git-fire" + + [ ! -x "$(command -v "yadm")" ] \ + && _autoinstall_exe \ + "https://github.com/TheLocehiliosan/yadm/raw/master/yadm" \ + "$HOME/.local/bin/yadm" \ + && yadm alt return 0 } @@ -80,6 +87,10 @@ _autoinstall_file () { return 1 } +_autoinstall_exe () { + _autoinstall_file "$1" "$2" && chmod +x "$2" +} + _autoinstall_archive () { if [ ! -f "$2" ] then diff --git a/.config/aliasrc b/.config/aliasrc index 1421a56..996c64b 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -82,6 +82,6 @@ alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"' [ -x "$(command -v rmtrash)" ] && alias rm='rmtrash -I --one-file-system -v' [ -x "$(command -v rmdirtrash)" ] && alias rmdir='rmdirtrash' -[ -x "$(command -v yadm)" ] || alias yadm='git --git-dir="$HOME/.local/share/yadm/repo.git"' +[ ! -x "$(command -v yadm)" ] && alias yadm='git --git-dir="$HOME/.local/share/yadm/repo.git"' [ -f "$HOME/.config/aliasrc.local" ] && . "$HOME/.config/aliasrc.local" diff --git a/.config/env.d/.gitignore b/.config/env.d/.gitignore new file mode 100644 index 0000000..5978aba --- /dev/null +++ b/.config/env.d/.gitignore @@ -0,0 +1,2 @@ +99-local +99-secrets diff --git a/.config/home-manager/common.nix b/.config/home-manager/common.nix index 3052dea..1f75989 100644 --- a/.config/home-manager/common.nix +++ b/.config/home-manager/common.nix @@ -26,6 +26,7 @@ ripgrep # grep-alternative rmtrash # rm wrapper to use trash shellcheck # tool for shell-syntax + starship # shell prompt tokei # project-language statistics trash-cli # trash utils unzip # unzip diff --git a/.config/home-manager/portable-tobias.nix b/.config/home-manager/home.nix##hostname.portable,user.serguzim similarity index 100% rename from .config/home-manager/portable-tobias.nix rename to .config/home-manager/home.nix##hostname.portable,user.serguzim diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index d2fb0e6..7d82bd9 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -5,3 +5,5 @@ yadm remote set-url --push origin "git@git.serguzim.me:serguzim/.dotfiles.git" echo "Autoinstall base" autoinstall base + +echo "Don't forget to decrypt yadm secrets" diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive index f731296535e9e010b28fd4441129d6fccd7c3679..ebe4edd934165be7793857ccf4a635b33fa40b60 100644 GIT binary patch literal 1039 zcmV+q1n~QX0t^E(rRvszZo8-f5B?=ji+>+m-v#FSH9*|W{KGiS8du12({FW^uA#oK zt0!>nAh;q?4xH9BWA@t_6(8#xyIkBM$ZJf(q#+l37_DfUNwec^LmOdXjRS{y^B-2Mt|vpca}|qI zD->dVqE$)ailw+HRc$0-U#rBjXv3s(HD2R$zhA;Kp7f`~H&RE3i>qK4quy>=md1uH z>UD?opPn0glKm(dVa0hVE0^3l(CT80xiq*qPokt&Ktm__o1FJ}G(c!ut-IDB3*0yd zSZAA5rzbd$If2G)@WSebO}yB%O3)K-8DgloR$tr3v7GKN;!bPksr5==PH@VR8S(cA zoV_)7t9%bs3O!&PEtv(exG3?l^ICM-g-en>>}m;y{`?@20G@(wnde4ae~-_-7~8?p zyN(XjLD2AdJscW>Gg$NsINrLxeI?kPhLf<`*oiua*!UDShcmF!38UQqOHG(XK?mW= z^0Oz~KCfkEA8&62@S!{As4%oauHPJiEcD25-Lbb6d?zSr*bx29i?mUuTS@7VJeHvS zOqiB+Gf77GsyzNi;?q-p@H)z$J#1@@hqMKFNrK?B0QYeb?U)Ali}*Gsx0XJutDs_? zJN{3Vd0Y}GM_+qsd@a(!Jpq}Uvveorx_e=+1bQJtV@_kDsh{{S9RlYbkaANYWqPvN zZzs`lO(NE#^n0}3W5DXl%oW|HcQFcwT=>6ER})IvQuh9^nvx6|vr|w;#H{F%&wy=G zns_FI5?GY@zJoGdeP@!RXUF*UenPN5wtjbn1#&xOsgn}6!EPA$r7Ij#HJHwcGC&Z} z5D<7>+wfQyA~L5i3|!!^J2sCzLRk9+3OID=u-4`LFUwNpx)UG@xWs>V5=H%ha&n5o zDJ-62U5nbZ60@M1w`3P25R!8>xODyw-=FK4WkX@J?mY9XE!rGT83!HFa(%f0N-9w0 zFLMfCdqfam>=}r}I?e%0Y6b+T;08h%)l2Mq(nG`R&>j%|p2tezfJf{*(9bI)p|}L7 zk7`6`_6e#oR2{!TcVb~+Io9lVPu4g*jk1&dlpREc7m&@$k=t{zP&I$97$QS_Sc$U1wvc zGG2GJkrEPXk>S(y!4VI>_OAU|Z!wk=8zIKp%PYmu?>s0vaqbzDwO-oZT2q@a zNs2hMY&0&{D^>z~-NAB37AM#JK(m(_JX^t0ZO8!tpI4#;Csty4^|4%y=mpAyO z?M$r46GcoQSorq?f8W(GMl!EmFsuv=95OMiL%7)jQG7(1ypX*q|UaSm|Js$8b!VRy1}K~G(yD=7lua0(X42f zy9o76oE0=W6Aa~H)A5m?Eea#$5}V0fAnL}rY)ir_VcHcOWsn0zvvNi!9Xv_g%6dq{ zFAFvY9)oEm^i z^a*D|1!DEY4T=7jqX~BAJ1PHJ_R|yEuKgC{xMmLPT*J{P-K9u~v*3Xvb6GbkC$53t z(AX~>)wTarzzU6U87k7j3<1m`#IrLG2y`p>sdBnnMZ4}Yp&YX?VItX(64xg{xi@?0 z^<_qd;jRsf$1!UuDvd-sHd9NNpvj8dBrc2%H`N2cOT3;$uTxo%Mw7eDJZ zsOOGTkQcpq?h4MxjQAI0*ctc<`H8`l7VPSV6nI>SW=H4Q0K0=#tzhxumA9K)K-q1A z-j(>D{A0YqLy|(vIzqTzBCB08x49&reHVw!4q=xXB))yLSSQzag*o;dV%96I=SqUf zi^INT>~trwW)MsPqjM+BXZn$qOuo(y{Q0+?hL2P4NaLZ#AL6J7asBbYB)M2yS=SIn zqs`xnV(DA1A(w^a1A=}p@o^TpT>Q73bcfDz0$@B$0v3I}7TOAT4@TI$|SLD?Piw;r4~dQEYxKAM|ASsBu%Uw{U?()^aiH)EXq zM(c+Y|8}Ncr1i~j;T8CwLcZoVkV&W0Y&oG2$usPhIiOyw$d}f0Eds@sd}&@|ckc`l MAw(2ur^~u6ejb$cN&o-= diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..52d5ff0 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +@fortawesome:registry=https://npm.fontawesome.com/ +//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}