diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | files/.config/lazygit/config.yml | 24 | ||||
| -rw-r--r-- | files/.config/youtube-dl/config | 3 | ||||
| -rw-r--r-- | files/.gitconfig | 4 | ||||
| -rw-r--r-- | files/.psqlrc | 5 | ||||
| -rw-r--r-- | files/.ssh/config | 6 |
6 files changed, 35 insertions, 8 deletions
@@ -25,3 +25,4 @@ files/.config/lazygit/development.log files/.config/lazygit/state.yml files/.config/nnn/bookmarks +files/.config/nnn/.selection diff --git a/files/.config/lazygit/config.yml b/files/.config/lazygit/config.yml index 48f6314..9c4b494 100644 --- a/files/.config/lazygit/config.yml +++ b/files/.config/lazygit/config.yml @@ -10,14 +10,36 @@ git: paging: colorArg: always pager: diff-so-fancy + externalDiffCommand: difft --color=always --background=light commitPrefixes: gazprom: pattern: "^(\\d+)-.*" replace: "feat: #$1 " - branchLogCmd: "git lg --color=always --no-merges --graph {{branchName}} --" + # branchLogCmd: "git lg --color=always --no-merges --graph {{branchName}} --" services: 'git.technocom.tech': 'gitea:git.technocom.tech' keybinding: commits: moveDownCommit: '<c-n>' moveUpCommit: '<c-p>' +customCommands: + - key: '<c-d>' + description: 'Show Difftastic for current commit' + context: 'subCommits' + command: 'git dshow "{{.SelectedLocalCommit.Sha}}"' + subprocess: true + - key: '<c-d>' + description: 'Show difft of current commit' + context: 'files' + command: 'git dft -- {{.SelectedFile.Name | quote}}' + subprocess: true + - key: '<c-d>' + description: 'Show difft of current commit' + context: 'commitFiles' + command: 'git dshow "{{.SelectedLocalCommit.Sha}}" -- {{.SelectedCommitFile.Name | quote}}' + subprocess: true + - key: '<c-d>' + description: 'Show difft of current commit' + context: 'commits' + command: 'git dshow "{{.SelectedLocalCommit.Sha}}"' + subprocess: true diff --git a/files/.config/youtube-dl/config b/files/.config/youtube-dl/config index c309026..3a8d1e8 100644 --- a/files/.config/youtube-dl/config +++ b/files/.config/youtube-dl/config @@ -1,10 +1,9 @@ ---format bestvideo[width<=1920]+bestaudio/best[width<=1920]/bestvideo+bestaudio/best +--format bestvideo[width<=3840]+bestaudio/best[width<=3840]/bestvideo+bestaudio/best --live-from-start --sponsorblock-mark all --xff default --no-check-certificate ---force-ipv4 --geo-bypass # python3-secretstorage required diff --git a/files/.gitconfig b/files/.gitconfig index 4bffd82..d153925 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -55,8 +55,8 @@ dc = diff --find-copies-harder --cached di = diff --find-copies-harder dft = difftool --tool=difftastic - dshow = "!f() { GIT_EXTERNAL_DIFF=difft git show --ext-diff $@; }; f" - dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff $@; }; f" + dshow = "!f() { GIT_EXTERNAL_DIFF=difft DFT_BACKGROUND=light git show --ext-diff $@; }; f" + dlog = "!f() { GIT_EXTERNAL_DIFF=difft DFT_BACKGROUND=light git log -p --ext-diff $@; }; f" fix = commit --amend -C HEAD history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')" k = !sh -c 'gitk $1' - diff --git a/files/.psqlrc b/files/.psqlrc index 69304f7..9844bee 100644 --- a/files/.psqlrc +++ b/files/.psqlrc @@ -10,7 +10,7 @@ \pset border 2 \pset linestyle unicode -\set PROMPT1 '%[%033[1m%]%M %n@%/%R%[%033[0m%]%# ' +\set PROMPT1 '%[%033[1m%]%x%M %n@%/%R%[%033[0m%]%# ' \set PROMPT2 '[more] %R > ' -- Show how long each query takes to execute @@ -25,8 +25,6 @@ \set COMP_KEYWORD_CASE upper -\unset QUIET - -- -- Taken from: https://github.com/lbolla/dotfiles/blob/master/psql/.psqlrc -- @@ -83,4 +81,5 @@ \i `echo $HOME/`.psqlrc.local \endif +\unset QUIET -- vim: ft=sql : diff --git a/files/.ssh/config b/files/.ssh/config index b474b06..628271e 100644 --- a/files/.ssh/config +++ b/files/.ssh/config @@ -15,6 +15,12 @@ SendEnv LANG LC_* TZ # Automatically add new host keys to the known_hosts file StrictHostKeyChecking accept-new +# Hardening based on https://www.ssh-audit.com/hardening_guides.html +Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr +KexAlgorithms sntrup761x25519-sha512@openssh.com,gss-curve25519-sha256-,curve25519-sha256,curve25519-sha256@libssh.org,gss-group16-sha512-,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256 +MACs hmac-sha2-256,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,umac-128-etm@openssh.com +HostKeyAlgorithms sk-ssh-ed25519-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,sk-ssh-ed25519@openssh.com,ssh-ed25519,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,rsa-sha2-512,rsa-sha2-256 + Host */* ProxyCommand ssh $(dirname %h) -W $(basename %h):%p ProxyJump "$(dirname %h)" |