diff --git a/.dotter/global.toml b/.dotter/global.toml index dfa8dea..7cbcef8 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -8,3 +8,4 @@ vimrc = "~/.vimrc" halig = "~/.config/halig" k9smocha = "~/.config/k9s/skin.yml" sshconfig = "~/.ssh/config" +gitconfig = "~/.gitconfig" diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index cab4988..d41b3fd 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -12,3 +12,4 @@ alias m 'make' alias future-commit 'git commit --date (echo (date -d +7hours))' alias scp 'rsync' alias rs 'rsync' +alias vihosts 'sudo vim /etc/hosts' diff --git a/fish/conf.d/common.fish b/fish/conf.d/common.fish index 44224a6..befc6ab 100644 --- a/fish/conf.d/common.fish +++ b/fish/conf.d/common.fish @@ -2,5 +2,5 @@ set -gx EDITOR nvim set -gx BAT_THEME "Catppuccin-frappe" set -gx DOCKER_BUILDKIT 1 set -gx COMPOSE_DOCKER_CLI_BUILD 1 -pyenv init - | source +#pyenv/bin/pyenv init - | source fish_vi_key_bindings diff --git a/fish/conf.d/paths.fish b/fish/conf.d/paths.fish index e8381f0..dc36b92 100644 --- a/fish/conf.d/paths.fish +++ b/fish/conf.d/paths.fish @@ -1,5 +1,6 @@ set -gx PATH ~/.local/bin $PATH set -gx PATH ~/.local/bin/dotutils/ $PATH +set -gx PATH $HOME/.krew/bin $PATH set -gx PATH "$HOME/.cargo/bin" $PATH; set -gx PATH $ANDROID_HOME/emulator $PATH set -gx PATH $ANDROID_HOME/tools $PATH diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..d4d4721 --- /dev/null +++ b/gitconfig @@ -0,0 +1,17 @@ +[user] + name = cătălin + email = catalin@roboces.dev +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true + light = false + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default +[commit] + gpgsign = true diff --git a/sshconfig b/sshconfig index b85c54a..f44d559 100644 --- a/sshconfig +++ b/sshconfig @@ -39,12 +39,12 @@ Host fuku.cloud IdentitiesOnly yes Host fuku.pg9 - HostName postgres.fuku + HostName pg9.fuku IdentityFile ~/.ssh/id_ed25519 User root Host fuku.pg15 - HostName postgres15.fuku + HostName pg15.fuku IdentityFile ~/.ssh/id_ed25519 User root @@ -72,3 +72,6 @@ Host fuku.k3s HostName k3s.fuku User catalin +Host fuku.fz + HostName fz.fuku + User catalin