diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml index 0a074b0..f59abad 100644 --- a/alacritty/.config/alacritty/alacritty.toml +++ b/alacritty/.config/alacritty/alacritty.toml @@ -6,7 +6,7 @@ foreground = "#fc28c3" TERM = "xterm" [font] -size = 9 +size = 10 [font.normal] #family = "UbuntuMono" style = "Regular" diff --git a/fish-cyberboobs/.config/fish/device-conf.fish b/fish-cyberboobs/.config/fish/device-conf.fish new file mode 100644 index 0000000..d48c5a7 --- /dev/null +++ b/fish-cyberboobs/.config/fish/device-conf.fish @@ -0,0 +1,4 @@ +if test "$TERM" != dumb + eval (/usr/bin/starship init fish) +end + diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 6b52350..acd3970 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -37,9 +37,14 @@ status --is-interactive; and begin # Interactive shell initialisation set -gx GPG_TTY (tty) - if test "$TERM" != dumb - eval (/usr/local/bin/starship init fish) - - end + source $HOME/.config/fish/device-conf.fish end + +if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ] + exec sway +end + +set -g EDITOR /usr/bin/nvim +set -g VISUAL /usr/bin/nvim +set -g SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket diff --git a/git/.config/git/config b/git/.config/git/config index 47e2917..1d8f04f 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -10,3 +10,5 @@ [user] email = "me@v-tr.org" name = "Violet Truchseß" +[core] + editor = nvim diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 900d161..6b0f73e 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -9,7 +9,6 @@ Host jump Host junk User root HostName junk.v-tr.org - IdentityFile ~/.ssh/id_ed25519 Host nas User vi HostName nas.v-tr.org diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 28f4f3a..6560422 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -118,5 +118,3 @@ exec swayidle -w \ before-sleep 'swaylock -f -c ef5ffc' include ~/.config/sway/device-conf - -exec swaymsg "output * scale 1.5"