From 0e36a3a145c55c61260b36c7cc698c3fddab1db6 Mon Sep 17 00:00:00 2001 From: LailaTheElf Date: Fri, 22 Aug 2025 21:51:04 +0200 Subject: [PATCH] update separate env vars form bash and add to fish; add gl command; update known_hosts --- shell/dot-bashrc | 50 +------------------------------ shell/dot-config/env | 50 +++++++++++++++++++++++++++++++ shell/dot-config/fish/config.fish | 9 +++--- shell/dot-local/bin/gl | 3 ++ ssh/dot-ssh/known_hosts | 2 ++ 5 files changed, 61 insertions(+), 53 deletions(-) create mode 100644 shell/dot-config/env create mode 100755 shell/dot-local/bin/gl diff --git a/shell/dot-bashrc b/shell/dot-bashrc index 24498e8..b9d5718 100644 --- a/shell/dot-bashrc +++ b/shell/dot-bashrc @@ -2,55 +2,7 @@ # ~/.bashrc # -export PATH="$PATH:$HOME/.local/bin" - -export XDG_CACHE_HOME="$HOME/.cache" -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_BIN_HOME="$HOME/.local/bin" -export XDG_MUSIC_DIR="$HOME/Music" -export XDG_DOCUMENTS_DIR="$HOME/Documents" -# export XDG_PICTURES_DIR="$HOME/Media/images" -# export XDG_VIDEOS_DIR="$HOME/Media/videos" - -# fix ansible dirs -export ANSIBLE_HOME="${XDG_CONFIG_HOME}/ansible/home" -export ANSIBLE_CONFIG="${XDG_CONFIG_HOME}/ansible/ansible.cfg" -export ANSIBLE_GALAXY_CACHE_DIR="${XDG_CACHE_HOME}/ansible/galaxy_cache" -#NOTE: for the tmp dir on remotes sould be configuard in ansible.cfg - -# fix rust dirs -export RUSTUP_HOME="$HOME/.local/rust/rustup" -export CARGO_HOME="$HOME/.local/rust/cargo" - -# fix discord dirs -# export DISCORD_USER_DATA_DIR="${XDG_DATA_HOME}" - -# fix docker dirs -export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker" - -# fix screen dirs -export SCREENRC="${XDG_CONFIG_HOME}/screen/screenrc" -export SCREENDIR="${XDG_RUNTIME_DIR}/screen" - -# fix texlive dirs -export TEXMFHOME="${XDG_DATA_HOME}/texmf" -export TEXMFVAR="${XDG_CACHE_HOME}/texlive/texmf-var" -export TEXMFCONFIG="${XDG_CONFIG_HOME}/texlive/texmf-config" - -# fix wget dirs -export WGETRC="${XDG_CONFIG_HOME}/wgetrc" -alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"' - -# fix npm dirs -export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc" - -# fix gnupg dirs -#TODO: test this -# export GNUPGHOME="${XDG_DATA_HOME}/gnupg" - -# fix java dirs -export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java" +. "$HOME/.config/env" # If not running interactively, don't do anything [[ $- != *i* ]] && return diff --git a/shell/dot-config/env b/shell/dot-config/env new file mode 100644 index 0000000..67d93f9 --- /dev/null +++ b/shell/dot-config/env @@ -0,0 +1,50 @@ + +export PATH="$PATH:$HOME/.local/bin" + +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_BIN_HOME="$HOME/.local/bin" +export XDG_MUSIC_DIR="$HOME/Music" +export XDG_DOCUMENTS_DIR="$HOME/Documents" +# export XDG_PICTURES_DIR="$HOME/Media/images" +# export XDG_VIDEOS_DIR="$HOME/Media/videos" + +# fix ansible dirs +export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible/home" +export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg" +export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache" +#NOTE: for the tmp dir on remotes sould be configuard in ansible.cfg + +# fix rust dirs +export RUSTUP_HOME="$HOME/.local/rust/rustup" +export CARGO_HOME="$HOME/.local/rust/cargo" + +# fix discord dirs +# export DISCORD_USER_DATA_DIR="$XDG_DATA_HOME" + +# fix docker dirs +export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker" + +# fix screen dirs +export SCREENRC="$XDG_CONFIG_HOME/screen/screenrc" +export SCREENDIR="$XDG_RUNTIME_DIR/screen" + +# fix texlive dirs +export TEXMFHOME="$XDG_DATA_HOME/texmf" +export TEXMFVAR="$XDG_CACHE_HOME/texlive/texmf-var" +export TEXMFCONFIG="$XDG_CONFIG_HOME/texlive/texmf-config" + +# fix wget dirs +export WGETRC="$XDG_CONFIG_HOME/wgetrc" +alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"' + +# fix npm dirs +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" + +# fix gnupg dirs +#TODO: test this +# export GNUPGHOME="$XDG_DATA_HOME/gnupg" + +# fix java dirs +export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" diff --git a/shell/dot-config/fish/config.fish b/shell/dot-config/fish/config.fish index ebbdf26..ae0fef8 100644 --- a/shell/dot-config/fish/config.fish +++ b/shell/dot-config/fish/config.fish @@ -1,3 +1,5 @@ +source "$HOME/.config/env" + if status is-interactive alias ls='ls --color=auto' @@ -5,12 +7,8 @@ if status is-interactive alias grep='grep --color=auto' alias prusa-slicer='flatpak run com.prusa3d.PrusaSlicer' - export PATH="$PATH:$HOME/.local/bin" export EDITOR=vim - # quartus - export QSYS_ROOTDIR="$HOME/.local/intelFPGA_lite/18.1/quartus/sopc_builder/bin" - # TODO: ssh-agent # TODO: rust @@ -27,5 +25,8 @@ if status is-interactive # prompt oh-my-posh init fish --config "$HOME/.config/oh-my-posh.toml" | source + # desable auto seguestions + export fish_autosuggestion_enabled=0 + end diff --git a/shell/dot-local/bin/gl b/shell/dot-local/bin/gl new file mode 100755 index 0000000..c3184d0 --- /dev/null +++ b/shell/dot-local/bin/gl @@ -0,0 +1,3 @@ +#!/bin/bash + +git log --graph --oneline --all diff --git a/ssh/dot-ssh/known_hosts b/ssh/dot-ssh/known_hosts index 484ee44..088eee7 100644 --- a/ssh/dot-ssh/known_hosts +++ b/ssh/dot-ssh/known_hosts @@ -11,6 +11,8 @@ gitea.finnvanreenen.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIb kapsalon.freenen.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCBr2iI34xReitjf4rp3TlD7/jcadTEZ1xe8Oos5bGSb+YFX6ib7n3MTp1PJhKCERsZZZ6F6/5qVzR3GrZ8boJY= kapsalon.freenen.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtpoyDT03A3WdqmnRsj1jtoIrQX2reDyZUXJau1wMuc kapsalon.freenen.nl ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxIonJnVr+iZ00q9NT8BTRuhNcXZWnS1IgMlAT7IpksSM/1fo4n3evniW1FRqWob8TSJb0j5aCQrurW5/4SQ/FEaPF3JDu9AxYG99pmbxLHFYLv2PzJWPI9KtFTwg2buqNFw+I4s/rOX/+W9lgDvxm+oKKAL/abYtrzffkdOpw81N5iuawdPU1Q1An5Yq9y3aFBdEYOGRSWhCudV/991v5w0MgMp8Db7V3Z/UorY7CpZSL/OqMuKz6OvSzNTj53CGU/vgMKSxmWGqG1Vtsv1T4S6m6IdWyxcE3JPoCyWEv3Q7SJL4/B25KaHe7H0qgfcHSodxustgrSWamAbobgTTmmRa3LQC8d8Pl60la6eyBBLOIBMlfMij1dWDM5osUUvXbYlu6Y/GAVLdAZSzpDql6hL+TBrHUEoWjdL9EPw5Dc3KUL5Z470tWNzLEfFvU+XaqV5rxWOpJIjPYaYTUqAG5BRqWYUAgcLB8PrMMablq9mlzPUTwk/1rzRUXxBgCQPs= +[10.1.2.2]:2653 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtpoyDT03A3WdqmnRsj1jtoIrQX2reDyZUXJau1wMuc +10.1.13.1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIILnBX5Cctz42WLLvwPQ+S1ojEJccY8wjwOmGCD+udo9 bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=