diff --git a/bin/actions/git/pre-commit b/bin/actions/git/pre-commit index c0903d5..6e0a0de 100755 --- a/bin/actions/git/pre-commit +++ b/bin/actions/git/pre-commit @@ -6,17 +6,10 @@ source ~/dotfiles/bin/helpers/functions.sh unencrypted_files=$(find config/ssh/config.d/ -type f ! -name "*.gpg") if [ -n "$unencrypted_files" ]; then - printfe "%s\n" "red" "Unencrypted files found in .ssh/config.d/:" - for file in $(find config/ssh/config.d/ -type f ! -name "*.gpg"); do - printfe "%s\n" "yellow" " - $file" - done - - # Check if these files are staged staged_files=$(git diff --cached --name-only) unencrypted_staged_files="" for file in $unencrypted_files; do - # Use a more robust check to see if the file is in the staged_files list - if echo "$staged_files" | grep -q "^$file$"; then + if [[ $staged_files == *"$file"* ]]; then unencrypted_staged_files="$unencrypted_staged_files $file" fi done @@ -31,4 +24,4 @@ if [ -n "$unencrypted_files" ]; then echo "" printfe "%s\n" "blue" "They are not staged so you're good but be vigilant!" -fi \ No newline at end of file +fi diff --git a/config/ssh/config.d/dev.conf.gpg b/config/ssh/config.d/dev.conf.gpg index 22714b1..1c42aca 100644 --- a/config/ssh/config.d/dev.conf.gpg +++ b/config/ssh/config.d/dev.conf.gpg @@ -1,12 +1,12 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMKA6oZR8wFfAn/0sCTASaJDn+9f16yWMwzztZP5X75JC35rdx+jsjlbNcR -yvKwS5qxQRx/4hLgbxVataBsXeM1uz8jZJB3MDA1iwl+uM/CXJ8CgChcUvlM6KOj -Yf/1H5JHEKSbR6p44+DuFvVs4aoQpVzoMvPzaflITthYVThrDZcqT41e5RT3aLcM -QxV1J2ttvQVaaqSYivOomDLpJT6myDs8ZpyvSIMrw72K5twZYxqmMKBIyK1FAe3h -FZmPuG2SEZFQtY2qM1aZ93oQ9o9vo052gS6GUuJI3wgtHaubZezo783+rXltSNfm -M4hgFxztTcFCSfUTIngccLFqmfVhdM8lsBXzdnrn1eiKdyrus3zH2xR8scl2ALXz -5ltB3bw4kVRHqlJ9eCWql9zTgEqddhsy20jAP+0uR+mu9wDKtm+mNgmXFtIXGblG -ImvMDWuIvNbX1L3Tq4RrKVep45se -=m2uc +jA0ECQMKxk8SkSYOUYP/0sCSAfR4DlCAIf591iIUABK8dGsVuOfromBUgjNIn+7q +wDH2poPnUS1FMQlbehu/m7Q5vTgnCGnNlott6DGmCQfjmmA4lcekp+RLl5rG87wu +2n7VqMJFEyfNp7xBRzofsL/fIaBiYHqZmo52MMH5T876HKmeLtiFFpFKnPyFjTV0 +nBKZBj68bf6uhPvexzxfYY6IpIsRH1GwkL4ZCd0AgfmykbiphOZWsieBIXE/EE82 +JsLOKAgfOVnmgqRVmg7ed5zryc+zWv1LB8EupVjEvoBvYufBzK1MhUGbi9t8Vh2Y +q5GNVwW7qs2iBEFgrIYffqP8vqPil5QeG+sCpagTid1ZysAYKgm28Eq70yq58Sqv +iFgY9fk9STzOWDmrTGOvbj24VKihmgRhCz5sojmvNJRR0RbNa2PMgLeYdpLG5SYG +7RUxVA6ImFmDMd5S3WKCuBHgDG4= +=yWXK -----END PGP MESSAGE----- diff --git a/config/ssh/config.d/personal.conf.gpg b/config/ssh/config.d/personal.conf.gpg index dd8c4b5..d13b7ff 100644 --- a/config/ssh/config.d/personal.conf.gpg +++ b/config/ssh/config.d/personal.conf.gpg @@ -1,7 +1,7 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMKWoSaf1+qda3/0msBfLXdoFYONx4gHpM0ulwA/7Qrt2r9TI3ZYv8uPTPl -ijwQ606pnTJMZP7g98QS0HL+yhVdGd+1HZxu+NGaMu53MbdQb0usMiJZfHMpUKcI -uZOAtIrH70GR3Nof/BAmI6bDbc55VNjZ9gTxrg== -=jKrc +jA0ECQMKs1ivC8K7ZgD/0msB/7WM3LbosmKfL0sfh4++mLcJMmjbiHAlYEin/i8n +JoeN6wd3O1WWyzhKTzn2Juyx9ix0T/ld4qSn9UuPfNkE//ImxQ+6A1HSLwZDOxXE +V5zDADgkN/wfxUpXhfusI1plRwZWG1WadXQ2bg== +=UIj7 -----END PGP MESSAGE----- diff --git a/config/ssh/config.d/prod.conf.gpg b/config/ssh/config.d/prod.conf.gpg index 7d8adef..8c1b538 100644 --- a/config/ssh/config.d/prod.conf.gpg +++ b/config/ssh/config.d/prod.conf.gpg @@ -1,11 +1,12 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMKs/aJyGSIZ+j/0sB+ATD4kpnz9J1teF06mS4R98I7GkOfcwQ7DMj2gNB4 -LhlsH7XwiXBENL3+sZltgJimyMDSPOetGn1p5cECAK3ntsIyIEGclNFeIzIu7c57 -RXociF7VbzV/N6us58sPddnx17YnnfA7L77LAYPCHuNt7IBraL7pTY84urgD7R+X -mo9TNtiZpD6y+OHhX4RetcrxTN3iqroEwFbBgBQTciRt6jiCjxG/Os3hibwofuOu -BTjaAjlxhWwq/1WsNB5SzXl+73MPLUx8G594yGAAB3IoA/CVMtcfGE1HCwbX4oJk -lb+afYOh80tlSwQYVnVSuop2sZ5XTftCUh2UFXw6HNogVEa0qgpO6SkNRH1/cXu2 -SGjCvudR+aWKLm3T5v5zAW9yZC8IwMMn+BrC9Yt81DlnfQq8Y17bVFIn2eTRfwl0 -=6iwS +jA0ECQMKnyS8b4A3LKj/0sB/ATXNRScUB1C7VF6gGFuIfgWS2aGXhDdNS2zG540P +b7CgoaWH0XLIYBY0RAXd6CbCXglgyIlF3Rz2e2T1Vtag/ME5VJzEZwtv0XYwvBka +BcJ5DQw11xkGp81VV5i1qAOIVFqV81sTrOhku+49DmY8h4KLJC43rAN1sysQyVvs +hgD39xKSgn9FyqvPtKHB7qH1heb/l5tjUWObOJ5pLT/y1onQMp8zaKK1tElvo34v +fMNZ6W3v7eNLEQFYJVD+W975CyR036O6TGUeKGINPQSgQWDcNYtjqE0be+BN/5Ps +C+dj4mWhN3Fdlgl7h55BPwVRNfRBP4bctV6OvqaDvMLR+dSPiuxUxQWNG3z6mNjZ +6EplPSApB2X1MVn72T7ob6R/NAWFL5V6fuekNsGvgyaju4gRuIfrfNjVN7EtKKR+ +tg== +=/+Ic -----END PGP MESSAGE----- diff --git a/config/wezterm.lua b/config/wezterm.lua index b2cb447..843e83d 100644 --- a/config/wezterm.lua +++ b/config/wezterm.lua @@ -61,7 +61,7 @@ config.keys = { -- Ctrl+K for to clear the terminal -- Use default titlebar instead of the one provided by wezterm config.window_frame = { - inactive_titlebar_bg = '#353535', + inactive_titlebar_bg = '#2b2042', active_titlebar_bg = '#2b2042', inactive_titlebar_fg = '#cccccc', active_titlebar_fg = '#ffffff', @@ -81,5 +81,7 @@ config.default_cursor_style = "BlinkingUnderline" config.initial_rows = 30 config.initial_cols = 120 +config.color_scheme = 'Galizur' + -- and finally, return the configuration to wezterm return config