diff --git a/.bashrc.d/10_common_aliases.sh b/.bashrc.d/10_common_aliases.sh index bd7f43e..83543ed 100644 --- a/.bashrc.d/10_common_aliases.sh +++ b/.bashrc.d/10_common_aliases.sh @@ -36,18 +36,16 @@ yay() { command yay "$@" } -# Create and cd to temporary directory ~/tmp/tmp.YYYYMMDD.XXXXXX or ~/tmp/tmp.$1.XXXXXX if an argument is given -function cdtmp() { - cd $(mktemp -d -p ~/tmp tmp.${1:-$(date +%Y%m%d)}.XXXXXX) -} +# Create and cd to tmp dir +alias cdtmp='cd $(mktemp -d -p ~/tmp/)' -# Make dir and cd into it (from Mara) +# Make dir and cd to it (from Mara) function mkcd() { mkdir -p "$1" cd "$1" } -# cd into dir + ll (ls -la) +# cd to dir + ll (ls -la) function cdll() { cd "$1" ls -la @@ -104,13 +102,3 @@ function b64dec() { echo -n "$1" | base64 -d echo } - -# Shortcuts for dig with less output -alias digs='dig +short' -alias digrr='dig +noall +answer' - -# Readline macro Ctrl-Alt-L: Append "| less" to current command -bind '"\e\C-l": "\C-e | less"' - -# Readline macro Ctrl-Alt-B: Append ">/dev/null 2>&1 &" to current command -bind '"\e\C-b": "\C-e >/dev/null 2>&1 &"' diff --git a/.gitconfig.inc/common.gitconfig b/.gitconfig.inc/common.gitconfig index 4fdf05e..41d31a0 100644 --- a/.gitconfig.inc/common.gitconfig +++ b/.gitconfig.inc/common.gitconfig @@ -1,6 +1,5 @@ [core] - # Normalize line endings - autocrlf = input + eol = lf [init] defaultBranch = main @@ -37,12 +36,6 @@ [credential] helper = /usr/lib/git-core/git-credential-libsecret -[filter "lfs"] - required = true - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - [pretty] ls = tformat:%C(yellow)%h %Cgreen%ad %Creset%s %Cblue[%an]%C(auto)%d lsd = tformat:%>|(13)%C(yellow)%h %Cgreen%ad %Creset%s %Cblue[%an]%C(auto)%d diff --git a/.inputrc b/.inputrc deleted file mode 100644 index a5bd70f..0000000 --- a/.inputrc +++ /dev/null @@ -1,24 +0,0 @@ -# Include system defaults -$include /etc/inputrc - -# Disable terminal bell -set bell-style none - -# Enable colors for completion listings -set colored-completion-prefix on -set colored-stats on - -# Enable case-insensitive completion -set completion-ignore-case on - -# Show completion listing without double-Tab -set show-all-if-ambiguous on - -# Don't keep changes to history lines -set revert-all-at-newline on - -# Keybinding Alt-W: Like Ctrl-w but allowing slashes as word boundaries -"\ew": unix-filename-rubout - -# Keybinding Alt-Tab: Cycle through completions -"\e\C-i": menu-complete diff --git a/.ssh/config b/.ssh/config index 87af48f..69881bf 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,10 +1,13 @@ -# Include drop-in configurations -Include ~/.ssh/config.d/*.conf - -# Global configuration AddKeysToAgent yes -# Host defaults -Host * - IdentitiesOnly yes - SendEnv LANG LC_* +Host afra-door + HostName 172.23.42.69 + ProxyJump afra.fe80.eu + User pi + +Host toriel-dropbear + HostName 192.168.16.4 + User root + RemoteCommand cryptroot-unlock + RequestTTY yes + diff --git a/.ssh/config.d/50_hosts.conf b/.ssh/config.d/50_hosts.conf deleted file mode 100644 index f683fd2..0000000 --- a/.ssh/config.d/50_hosts.conf +++ /dev/null @@ -1,8 +0,0 @@ -Host toriel - ForwardAgent yes - -Host toriel-dropbear - HostName 192.168.16.4 - User root - RemoteCommand cryptroot-unlock - RequestTTY yes