From 23e8e7d0a48de5053682fc8e7098391d5e51cc59 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Sat, 12 Aug 2023 10:56:06 +0800 Subject: [PATCH] chaotic commit hellscape Signed-off-by: Andrei Jiroh Halili --- .bashrc | 5 ++++ .byobu/datetime.tmux | 2 +- .byobu/status | 2 +- .config/git/.gitkeep | 0 .config/git/recaptime-dev.include.gitconfig | 11 ++++++++ .config/konsolerc | 26 +++++++++++------- .env | 5 ++-- .gitconfig | 29 +++++++++++++++------ .gnupg/gpg-agent.conf | 2 +- .profile | 4 +++ README.md | 12 ++++++--- bin/handle-pinentry | 0 12 files changed, 72 insertions(+), 26 deletions(-) create mode 100644 .config/git/.gitkeep create mode 100644 .config/git/recaptime-dev.include.gitconfig mode change 100644 => 100755 bin/handle-pinentry diff --git a/.bashrc b/.bashrc index c64a4d1..15e255b 100644 --- a/.bashrc +++ b/.bashrc @@ -58,3 +58,8 @@ done export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +# make sure shell completions are loaded too +. "$HOME/.asdf/asdf.sh" +. "$HOME/.asdf/completions/asdf.bash" +source <(gopass completion bash) diff --git a/.byobu/datetime.tmux b/.byobu/datetime.tmux index 7b888a7..071c1ee 100644 --- a/.byobu/datetime.tmux +++ b/.byobu/datetime.tmux @@ -1,2 +1,2 @@ BYOBU_DATE="%Y-%m-%d " -BYOBU_TIME="%H:%M:%S" +BYOBU_TIME= diff --git a/.byobu/status b/.byobu/status index 1d74388..14349e8 100644 --- a/.byobu/status +++ b/.byobu/status @@ -31,7 +31,7 @@ screen_lower_right="color network #disk_io custom #entropy raid reboot_required # Tmux has one status line, with 2 halves for status tmux_left=" logo #distro release arch session" # You can have as many tmux right lines below here, and cycle through them using Shift-F5 -tmux_right=" #network #disk_io #custom #entropy #raid reboot_required updates_available #apport #services #mail #users uptime #fan_speed #cpu_temp #battery #wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk whoami hostname #ip_address #time_utc date time" +tmux_right=" network #disk_io #custom entropy #raid reboot_required updates_available #apport #services #mail #users uptime #fan_speed #cpu_temp #battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap disk whoami hostname #ip_address time_utc date #time" #tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime fan_speed cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time" #tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time" #tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime fan_speed cpu_temp #battery #wifi_quality #processes #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time" diff --git a/.config/git/.gitkeep b/.config/git/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/git/recaptime-dev.include.gitconfig b/.config/git/recaptime-dev.include.gitconfig new file mode 100644 index 0000000..b907c4b --- /dev/null +++ b/.config/git/recaptime-dev.include.gitconfig @@ -0,0 +1,11 @@ +[user] + name = Andrei Jiroh Halili (RecapTime.dev) + email = ajhalili2006@crew.recaptime.eu.org + signingkey = 52B6B65187A7469A + +[url "ssh://git@git.jetbrains.space/recaptime/"] + pushInsteadOf = "https://git.jetbrains.space/recaptime/" + insteadOf = "https://git.jetbrains.space/recaptime/" +[url "ssh://git@git.jetbrains.space/lorebooksdotwiki/"] + pushInsteadOf = "https://git.jetbrains.space/lorebooksdotwiki/" + insteadOf = "https://git.jetbrains.space/lorebooksdotwiki/" diff --git a/.config/konsolerc b/.config/konsolerc index 93f69e4..0546af3 100644 --- a/.config/konsolerc +++ b/.config/konsolerc @@ -1,30 +1,35 @@ [Desktop Entry] -DefaultProfile= +DefaultProfile=Byobu.profile [General] ConfigVersion=1 +[KFileDialog Settings] +Recent Files[$e]=personal,file:$HOME/.ssh/personal +Recent URLs[$e]=file:$HOME/.ssh/ +detailViewIconSize=16 + [KonsoleWindow] +RememberWindowSize=false ShowWindowTitleOnTitleBar=true [MainWindow] -1366x768 screen: Height=701 -1366x768 screen: Width=1366 -1366x768 screen: Window-Maximized=true -1366x768 screen: XPosition=0 -1366x768 screen: YPosition=67 -2 screens: Height=701 -2 screens: Width=683 +1366x768 screen: Height=554 +1366x768 screen: Width=911 +1366x768 screen: XPosition=227 +1366x768 screen: YPosition=141 +2 screens: Height=699 +2 screens: Width=1366 2 screens: Window-Maximized=true 2 screens: XPosition=0 -2 screens: YPosition=67 +2 screens: YPosition=69 HDMI-1=HDMI-1 HDMI-1 Height 1366x768 HDMI-1=701 HDMI-1 Width 1366x768 HDMI-1=1366 HDMI-1 Window-Maximized 1366x768 HDMI-1=true HDMI-1 XPosition 1366x768 HDMI-1=0 HDMI-1 YPosition 1366x768 HDMI-1=67 -HDMI-1 eDP-1=HDMI-1 +HDMI-1 eDP-1=eDP-1 HDMI-1 eDP-1 Height 1366x768 HDMI-1=701 HDMI-1 eDP-1 Width 1366x768 HDMI-1=1366 HDMI-1 eDP-1 Window-Maximized 1366x768 HDMI-1=true @@ -33,6 +38,7 @@ HDMI-1 eDP-1 XPosition 1366x768 HDMI-1=1366 HDMI-1 eDP-1 YPosition 1366x768 HDMI-1=67 MenuBar=Disabled RestorePositionForNextInstance=false +State=AAAA/wAAAAD9AAAAAQAAAAAAAAD1AAACjfwCAAAAAvsAAAAiAFEAdQBpAGMAawBDAG8AbQBtAGEAbgBkAHMARABvAGMAawAAAAAA/////wAAAXwBAAAD+wAAABwAUwBTAEgATQBhAG4AYQBnAGUAcgBEAG8AYwBrAAAAAC4AAAKNAAABFQEAAAMAAAOPAAAB/AAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAAOj/////AAAAAAAAAAA= ToolBarsMovable=Disabled eDP-1=eDP-1 eDP-1 HDMI-1=eDP-1 diff --git a/.env b/.env index fe99942..1f47cfb 100644 --- a/.env +++ b/.env @@ -8,14 +8,15 @@ # PLEASE DO NOT LEAK ANY SECRETS, INCLUDING DOPPLER CLI TOKENS AND TAILSCALE_AUTHKEYS # IN THIS BLOODY FILE! # + # https://packaging.ubuntu.com/html/getting-set-up.html#configure-your-shell export DEBFULLNAME="Andrei Jiroh Halili" # Temporary Gmail address for devel stuff, even through my longer email one is, well, # on my public GPG key btw, so YOLO it. -export DEBEMAIL="ajhalili2006@gmail.com" +export DEBEMAIL="releases@andreijiroh.eu.org" # Customized PATH + Jetbrains Toolbox -export PATH="$DOTFILES_BIN:$HOME/go/bin:$HOME/.local/bin:$GOPATH/bin:$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" +export PATH="$HOME/go/bin:$HOME/.local/bin:$GOPATH/bin:$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" ########################################################################################## # Code snippets from https://git.sr.ht/~sircmpwn/dotfiles/tree/db5945a4/item/.env diff --git a/.gitconfig b/.gitconfig index b0fb6b7..bd6498e 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,3 +1,4 @@ +# This is the default configuration for Git [user] name = Andrei Jiroh Halili email = ajhalili2006@andreijiroh.eu.org @@ -7,6 +8,7 @@ gpgSign = true [tag] gpgSign = true + forceSignAnnotated = true [format] signOff = true @@ -19,15 +21,17 @@ [receive] fsckObjects = true -# project-specifics -[includeIf "gitdir/i:~/git-projects/sandbox"] - path = ~/.dotfiles/config/global/ajhalili2006-experiments.include.gitconfig +# project-specific configurations +#[includeIf "gitdir/i:~/git-projects/sandbox"] +# path = ~/.config/git/ajhalili2006-experiments.include.gitconfig +#[includeIf "gitdir/i:~/projects/labs.andreijiroh.dev"] +# path = ~/.config/git/ajhalili2006-experiments.include.gitconfig [includeIf "gitdir/i:~/git-projects/recaptime.dev"] - path = ~/.dotfiles/config/global/recaptime-dev.include.gitconfig -[includeIf "gitdir/i:~/projects/labs.andreijiroh.dev"] - path = ~/.dotfiles/config/global/ajhalili2006-experiments.include.gitconfig + path = ~/.config/git/recaptime-dev.include.gitconfig [includeIf "gitdir/i:~/projects/recaptime.dev"] - path = ~/.dotfiles/config/global/recaptime-dev.include.gitconfig + path = ~/.config/git/recaptime-dev.include.gitconfig +#[includeIf "gitdir/i:~projects/"] +# path = ~/.config/git/ajhalili2006.include.gitconfig # authentication hellscape [credential "https://github.com"] @@ -73,7 +77,16 @@ sdiff = !git diff && git submodule foreach 'git diff' spush = push --recurse-submodules=on-demand supdate = submodule update --remote --merge - skip-ci = push -o ci.skip + skip-ci = push -o ci.skip -o skip-ci root = rev-parse --show-toplevel signoff-commit = commit --signoff signoff = signoff-commit +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[core] +# editor = flatpak run re.sonny.Commit + + diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index eb71eb3..8a2cf2d 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -9,4 +9,4 @@ min-passphrase-len 12 min-passphrase-nonalpha 3 # Use our bloody pinentry handler for that. -pinentry-program ~/bin/handle-pinentry \ No newline at end of file +#pinentry-program bash /home/ajhalili2006/bin/handle-pinentry diff --git a/.profile b/.profile index 4cfa7d0..792853e 100644 --- a/.profile +++ b/.profile @@ -23,4 +23,8 @@ fi # Added by Toolbox App export PATH="$PATH:/home/ajhalili2006/.local/share/JetBrains/Toolbox/scripts" +# Import asdf to shell +export ASDF_DIR="$HOME/.asdf" +. "$HOME/.asdf/asdf.sh" + _byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true diff --git a/README.md b/README.md index a4de2c9..c7bf4a6 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,12 @@ This is the redesigned dotfiles repo for ~ajhalili2006, because my first repo became a mess so hard to fix it in, built from scratch and based on . +## Quick deploy + +```bash +curl -fsSL https://scripts.andreijiroh.eu.org/dotfiles/setup.sh | bash - +``` + ## Available Git mirrors This project is hosted on [hosted instance of sourcehut](https://sr.ht) at the @@ -35,7 +41,7 @@ git clone git@git.sr.ht:~ajhalili2006/dotfiles-modern /home/ajhalili2006 # ...create user "ajhalili2006" here chown ajhalili2006:ajhalili2006 -Rv /home/ajhalili2006 -# fetch and force checkout +# fetch and force checkout, RIP any unstashed hellscapes git fetch git checkout -f main @@ -59,8 +65,8 @@ TL;DR before we dive in to legalese: * For contributors who wish to send patches, either an agreement to the DCO (via `--signoff` flag on commits and when sending email patches via `~ajhalili2006/public-inbox@lists.sr.ht`) or through signing the project-specific [Individual CLA][sign-link] alongside this specific [copyright transfer agreement on this project][cta-ajhalili2006-dotfiles] - (requires separate signature, uses FSFe's FLA 2.0) is mostly enough. Doing both is recommended to avoid further legal headaches - down the line. + (requires separate signature, uses FSFe's FLA 2.0) is mostly enough. Doing both is recommended to avoid further legal headaches down the line, atlhough ~sircmpwn recommends + against signing the CLA, especially due to legalities around copyright assignments in OSS. [cta-ajhalili2006-dotfiles]: https://cla.recaptime.eu.org/sign/copyright-assignment?project=ajhalili2006-dotfiles&requireClaSignature=true&claType=FLA-FSFE [sign-link]: https://cla.recaptime.eu.org/sign/per-project-basis?type=individual&project=ajhalili2006-dotfiles&claType=FLA-FSFE diff --git a/bin/handle-pinentry b/bin/handle-pinentry old mode 100644 new mode 100755