summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRaymaekers Luca <luca@spacehb.net>2025-01-09 16:52:07 +0100
committerRaymaekers Luca <luca@spacehb.net>2025-01-09 16:52:07 +0100
commitc8283a1ef06b15ab0b5871655f4bfaefe9518673 (patch)
treeee892a974ed799f708078def24e02f42cb70b5fa /config
parentcc216ca760a6b22c8b8041f525859f4201a52d1f (diff)
parent11137f566712166f593eee3466a0287b8f3fad7b (diff)
Merge branch 'main' of db:dotfiles
Diffstat (limited to 'config')
-rw-r--r--config/essentials/git/config2
-rw-r--r--config/essentials/shell/aliases.sh3
-rw-r--r--config/essentials/shell/functions.sh6
-rw-r--r--config/essentials/zsh/comp.zsh2
l---------config/extra/jftui/input.conf2
l---------config/extra/jftui/mpv.conf2
6 files changed, 14 insertions, 3 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index 605d4b2..d64ae1a 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -16,3 +16,5 @@
gpgsign = true
[gpg]
program = /usr/bin/gpg
+[core]
+ autocrlf = input
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 59b844c..10a72b1 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -296,7 +296,7 @@ alias ytdl='yt-dlp --restrict-filenames --embed-chapters -S "res:1080" -o "%(cha
# emacs aliases
alias emacsd='emacs --daemon'
alias emacsdbg='emacs --debug-init'
-alias e='emacsclient -c -a "emacs"'
+alias emacs='emacsclient -c -a "emacs"'
# docker aliases
alias dcb='docker build'
@@ -321,6 +321,7 @@ alias cfg='edit_git_file ~/proj/dotfiles/'
alias ncfg='edit_git_file ~/.config/nvim'
alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs vi'
alias gclc='git clone "$(clipo)"'
+alias gcan!='git commit --all --amend --no-edit'
# docker
alias dorm='docker container rm $(docker container ls -a | tail -n +2 | fzf -m | awk '\''{print $1}'\'')'
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index ab257fd..f249c14 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -381,3 +381,9 @@ ssh() {
done
/usr/bin/ssh $@
}
+
+ssl_req() {
+ [ "$1" ] || return 1
+ [ "$2" ] || return 2
+ openssl req -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out "$1" -keyout "$2"
+}
diff --git a/config/essentials/zsh/comp.zsh b/config/essentials/zsh/comp.zsh
index 7cded53..538d697 100644
--- a/config/essentials/zsh/comp.zsh
+++ b/config/essentials/zsh/comp.zsh
@@ -42,6 +42,8 @@ zstyle ':completion:*' menu select
fpath=($ZDOTDIR/completions $fpath)
autoload -Uz compinit; compinit
+autoload -U +X bashcompinit && bashcompinit
+complete -C /usr/bin/syncthing syncthing
_dotnet_zsh_complete()
{
diff --git a/config/extra/jftui/input.conf b/config/extra/jftui/input.conf
index dd02820..3dc6aa2 120000
--- a/config/extra/jftui/input.conf
+++ b/config/extra/jftui/input.conf
@@ -1 +1 @@
-/home/aluc/src/dotfiles/config/common/mpv/input.conf \ No newline at end of file
+/home/aluc/.config/mpv/input.conf \ No newline at end of file
diff --git a/config/extra/jftui/mpv.conf b/config/extra/jftui/mpv.conf
index 55c1286..fd59595 120000
--- a/config/extra/jftui/mpv.conf
+++ b/config/extra/jftui/mpv.conf
@@ -1 +1 @@
-/home/aluc/src/dotfiles/config/common/mpv/mpv.conf \ No newline at end of file
+/home/aluc/.config/mpv/mpv.conf \ No newline at end of file