diff --git a/.aliases b/.aliases index 00ee26c..41a256f 100755 --- a/.aliases +++ b/.aliases @@ -8,6 +8,7 @@ alias upnodock='sudo apt-mark hold docker-ce docker-ce-cli && sudo apt update && alias o='xdg-open' alias s='kitty +kitten ssh' +alias ssh='kitty +kitten ssh' alias cat='bat' # alias rg='ripgrep' alias ll='eza -ahlF' @@ -32,6 +33,7 @@ alias act='sudo systemctl -l -t service --state=active' alias fai='sudo systemctl -l -t service --state=failed' # basic docker shortcuts +alias docker='podman' alias dps='docker container ls -a' alias di='docker image ls' alias dv='docker volume ' diff --git a/.bashrc b/.bashrc index 8e1b556..102cca1 100644 --- a/.bashrc +++ b/.bashrc @@ -8,25 +8,31 @@ case $- in *) return;; esac +# Source global definitions +if [ -f /etc/bashrc ]; then + . /etc/bashrc +fi + +# User specific environment +if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]; then + PATH="$HOME/.local/bin:$HOME/bin:$PATH" +fi +export PATH + # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth -# allow docker to use X -# if [ -f /usr/bin/xhost ]; then -# xhost +local:root -# fi - # Load the shell dotfiles, and then some: # * ~/.path can be used to extend `$PATH`. # * ~/.extra can be used for other settings you don’t want to commit. -for file in ~/.{aliases,bash_prompt,functions,path,dockerfunc,extra,exports}; do +for file in ~/.{bash_aliases,exports}; do [[ -r "$file" ]] && [[ -f "$file" ]] && source "$file" done unset file -for file in /usr/share/fzf/{key-bindings.bash,completion.bash}; do +for file in /usr/share/fzf/shell/{key-bindings.bash,completion.bash}; do [[ -r "$file" ]] && [[ -f "$file" ]] && source "$file" done unset file @@ -138,3 +144,10 @@ eval "$(starship init bash)" # BEGIN_KITTY_SHELL_INTEGRATION if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi # END_KITTY_SHELL_INTEGRATION + +# Automatically added by the Guix install script. +if [ -n "$GUIX_ENVIRONMENT" ]; then + if [[ $PS1 =~ (.*)"\\$" ]]; then + PS1="${BASH_REMATCH[1]} [env]\\\$ " + fi +fi diff --git a/.path b/.path deleted file mode 100644 index eeabc45..0000000 --- a/.path +++ /dev/null @@ -1,3 +0,0 @@ -export PATH=${PATH}:/usr/local/go/bin:/home/fschl/go/bin - -. "$HOME/.cargo/env" \ No newline at end of file diff --git a/README.org b/README.org index 7a17b32..181482d 100644 --- a/README.org +++ b/README.org @@ -48,6 +48,11 @@ RSA (NOT ECDSA or DSA). $ ssh-copy-id -i ~/.ssh/.pub -p 22 user@host #+END_SRC +*** SSH-Agent + +automatically start agent, add keys to agent (after using it for the first time) when entering passphrase. +integrates with KeepassXC ([[https://github.com/keepassxreboot/keepassxc/blob/develop/docs/topics/SSHAgent.adoc][GH:KeePass > Docs > SSH-Agent]]) + *** GnuPG - https://wiki.mozilla.org/Security/Key_Management @@ -151,13 +156,16 @@ RSA (NOT ECDSA or DSA). libtool \ network-manager-applet \ notmuch \ + papirus-icon-theme-dark \ + papirus-icon-theme-light \ ripgrep \ rustup \ syncthing \ udiskie \ virt-manager \ wireguard-tools \ - wofi + wofi \ + youtube-dl rustup_init #+end_src @@ -212,6 +220,8 @@ https://realpython.com/dependency-management-python-poetry/ *** Disk partitioning +- https://github.com/david-cortes/snapper-in-debian-guide?tab=readme-ov-file +- https://wiki.archlinux.org/title/Snapper#Suggested_filesystem_layout - https://reckoning.dev/blog/ubuntu-btrfs-guide/ - https://wiki.systemcrafters.net/guix/nonguix-installation-guide/#partition-the-disks - https://cryptsetup-team.pages.debian.net/cryptsetup/encrypted-boot.html