diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 18c4cd8..5b97611 100755 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,97 +1,183 @@ switch (uname) case FreeBSD NetBSD DragonFly - echo Hi Beastie! + echo Hi Beastie! case Linux - echo Hi Tux! + #echo Hi Tux! + fish_vi_key_bindings + # PATH + # Local PATH + fish_add_path -a $HOME/.local/bin + + # Mason PATH + fish_add_path -a $HOME/.local/share/nvim/mason/bin + + # sbin PATH + fish_add_path -a /sbin + fish_add_path -a /usr/sbin + + # Rust + fish_add_path -a /usr/local/share/cargo/bin + + # Android + fish_add_path -a /usr/share/android-tools + + # Java + #fish_add_path -a /usr/local/jdk-21/bin + + # Ltex-LS + #fish_add_path -a /usr/local/share/ltex-ls-16.0.0/bin + + # pyenv + fish_add_path -a /usr/share/pyenv/bin + pyenv init - | source + status --is-interactive; and pyenv virtualenv-init - | source + + + + # VARIABLES + # Rust + set -gx CARGO_HOME '/usr/local/share/cargo' + + # ssh and gpg + set -x GPG_TTY (tty) + set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) + gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye > /dev/null + + # Editor + set -gx EDITOR 'nvim' + + # Manpager + set -gx PAGER 'nvim +Man!' + + # Term for ssh + #set -gx TERM 'xterm-256color' + + + # ALIAS + # convinience + alias doas="sudo" + alias reboot="sudo reboot" + alias shutdown="sudo shutdown" + + # Neovim + alias vi="nvim" + alias vim="nvim" + + # mutt + #alias mutt='neomutt' + + # rsync + alias rsync='rsync -h -v -r -P -p -t --stats' + + # wget folder + alias wget_f='wget -r -np -R "index.html*"' + + # btop + alias top='btop' + + # git signed + function git --wraps git + switch $argv[1] + case commit + /usr/bin/git commit -S + case tag + /usr/bin/git tag -S + case '*' + /usr/bin/git $argv + end + end + + case Darwin - #echo Hi Hexley! - fish_vi_key_bindings - set ID (id -u) - # Start tmux - if not set -q TMUX; and [ $ID != 0 ] - echo "Setting tmux" - set -g TMUX tmux new-session -d -s base - eval $TMUX - tmux attach-session -d -t base - end + #echo Hi Hexley! + fish_vi_key_bindings + set ID (id -u) + # Start tmux + if not set -q TMUX; and [ $ID != 0 ] + echo "Setting tmux" + set -g TMUX tmux new-session -d -s base + eval $TMUX + tmux attach-session -d -t base + end - # PATH - # Rust - source "$HOME/.cargo/env.fish" + # PATH + # Rust + source "$HOME/.cargo/env.fish" - # pyenv - #export PYENV_ROOT="$HOME/.pyenv" - #export PATH="$PYENV_ROOT/bin:$PATH" - pyenv init - | source - status --is-interactive; and pyenv virtualenv-init - | source + # pyenv + #export PYENV_ROOT="$HOME/.pyenv" + #export PATH="$PYENV_ROOT/bin:$PATH" + pyenv init - | source + status --is-interactive; and pyenv virtualenv-init - | source - # VARIABLES - if [ $ID != 0 ] - # ssh and gpg - set -x GPG_TTY (tty) - set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye > /dev/null - end + # VARIABLES + if [ $ID != 0 ] + # ssh and gpg + set -x GPG_TTY (tty) + set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) + gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye > /dev/null + end - # Editor - export EDITOR='nvim' + # Editor + set -x EDITOR='nvim' - # Manpager - export PAGER='nvim +Man!' + # Manpager + set -x PAGER='nvim +Man!' - # Term for ssh - #export TERM='xterm-256color' + # Term for ssh + #export TERM='xterm-256color' - # Homebrew - export HOMEBREW_NO_AUTO_UPDATE=1 - export HOMEBREW_NO_ENV_HINTS=1 + # Homebrew + set -x HOMEBREW_NO_AUTO_UPDATE=1 + set -x HOMEBREW_NO_ENV_HINTS=1 - # DBUS for zathura - #export DBUS_LAUNCHD_SESSION_BUS_SOCKET=/tmp/(id -u) - #export DBUS_SESSION_BUS_ADDRESS='unix:path='$DBUS_LAUNCHD_SESSION_BUS_SOCKET - #if pgrep -x dbus-daemon &> /dev/null - # printf (_ "%sdbus-daemon%s is running\n") (set_color red) (set_color normal) - #else - # #echo "dbus-daemon is not running" - # dbus-daemon --fork --session --address=$DBUS_SESSION_BUS_ADDRESS - #end + # DBUS for zathura + #export DBUS_LAUNCHD_SESSION_BUS_SOCKET=/tmp/(id -u) + #export DBUS_SESSION_BUS_ADDRESS='unix:path='$DBUS_LAUNCHD_SESSION_BUS_SOCKET + #if pgrep -x dbus-daemon &> /dev/null + # printf (_ "%sdbus-daemon%s is running\n") (set_color red) (set_color normal) + #else + # #echo "dbus-daemon is not running" + # dbus-daemon --fork --session --address=$DBUS_SESSION_BUS_ADDRESS + #end - # ALIAS - # convinience - alias doas='sudo' + # ALIAS + # convinience + alias doas='sudo' - # ls - alias ls='colorls' + # ls + alias ls='colorls' - # neovim - alias vi='nvim' - alias vim='nvim' + # neovim + alias vi='nvim' + alias vim='nvim' - # mutt - #alias mutt='neomutt' + # mutt + #alias mutt='neomutt' - # rsync - alias rsync='rsync -h -v -r -P -p -t --stats' + # rsync + alias rsync='rsync -h -v -r -P -p -t --stats' - # wget folder - alias wget_f='wget -r -np -R "index.html*"' + # wget folder + alias wget_f='wget -r -np -R "index.html*"' - # btop - alias top='btop' + # btop + alias top='btop' - # git signed - function git --wraps git - switch $argv[1] - case commit - /usr/bin/git commit -S - case tag - /usr/bin/git tag -S - case '*' - /usr/bin/git $argv - end - end + # git signed + function git --wraps git + switch $argv[1] + case commit + /usr/bin/git commit -S + case tag + /usr/bin/git tag -S + case '*' + /usr/bin/git $argv + end + end case '*' diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables deleted file mode 100755 index 37eab00..0000000 --- a/.config/fish/fish_variables +++ /dev/null @@ -1,33 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR --export PYENV_ROOT:/Users/administrator/\x2epyenv -SETUVAR __fish_initialized:3400 -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:blue -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:yellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/Users/administrator/\x2elocal/share/nvim/mason/bin\x1e/Users/administrator/\x2elocal/bin\x1e/opt/homebrew/opt/ruby/bin\x1e/opt/homebrew/sbin\x1e/opt/homebrew/bin diff --git a/.gnupg/common.conf b/.gnupg/common.conf deleted file mode 100644 index 5add401..0000000 --- a/.gnupg/common.conf +++ /dev/null @@ -1 +0,0 @@ -use-keyboxd diff --git a/.gnupg/crls.d/DIR.txt b/.gnupg/crls.d/DIR.txt deleted file mode 100644 index 2a29a47..0000000 --- a/.gnupg/crls.d/DIR.txt +++ /dev/null @@ -1 +0,0 @@ -v:1: diff --git a/.gnupg/sshcontrol b/.gnupg/sshcontrol deleted file mode 100644 index c61ee5c..0000000 --- a/.gnupg/sshcontrol +++ /dev/null @@ -1,11 +0,0 @@ -# List of allowed ssh keys. Only keys present in this file are used -# in the SSH protocol. The ssh-add tool may add new entries to this -# file to enable them; you may also add them manually. Comment -# lines, like this one, as well as empty lines are ignored. Lines do -# have a certain length limit but this is not serious limitation as -# the format of the entries is fixed and checked by gpg-agent. A -# non-comment line starts with optional white spaces, followed by the -# keygrip of the key given as 40 hex digits, optionally followed by a -# caching TTL in seconds, and another optional field for arbitrary -# flags. Prepend the keygrip with an '!' mark to disable it. - diff --git a/.gnupg/trustdb.gpg b/.gnupg/trustdb.gpg deleted file mode 100644 index b2894f9..0000000 Binary files a/.gnupg/trustdb.gpg and /dev/null differ diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys deleted file mode 100644 index e69de29..0000000 diff --git a/.ssh/config b/.ssh/config deleted file mode 100644 index 2f3a00b..0000000 --- a/.ssh/config +++ /dev/null @@ -1,45 +0,0 @@ -#Host eduardo-cueto.com -# HostName eduardo-cueto.com -# User deb-ser-adm -# IdentityFile ~/.ssh/id_admin - -#Host bsd-talk.com -# IdentityFile ~/.ssh/id_server - -#Host github.com -# IdentityFile ~/.ssh/id_gittest - -Host unix-talk.com - IdentityFile ~/.ssh/id_rsa_yubikey.pub - Port 22 - -#Host unix-talk.com -# IdentityFile ~/.ssh/id_nitro_1 -# Port 33 - -#Host fd98:f0b:88f:10::1 -# IdentityFile ~/.ssh/id_nitro_1 -# Port 22 - -#Host 2a02:8084:d6be:1298::1 -# IdentityFile ~/.ssh/id_openwrt -# Port 22 - -#Host unix-talk.com - #IdentityFile ~/.ssh/id_secure - -#Host bsd-talk.com - #IdentityFile ~/.ssh/id_local_server_2 - -#Host 216.238.68.117 -# IdentityFile ~/.ssh/id_admin - -Host unix-talk.com - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - Port 33 - -Host unix-talk.com - IdentitiesOnly yes - IdentityFile ~/.ssh/id_rsa_yubikey.pub - Port 22 diff --git a/.ssh/id_rsa_yubikey.pub b/.ssh/id_rsa_yubikey.pub deleted file mode 100644 index 47660a5..0000000 --- a/.ssh/id_rsa_yubikey.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCprFFmFGk8tPme6drgEjrC4ZZvhKEM524A82aX+2l+ikWN83++4RLQe5IoOqE8S4J2wBv5JLsds8IJDigwaVPYOaRNse3cRnBId+ESdDsYT4d5hikYv0/JORpooynCX4ortBq0Us++IB3bwyZiRk3uS7SprDmUioTHtup1CO1yEWR9SppZjOOU/YYoeVAuLzLPL4TC64zwrUKrxDq/Q30db30Jt5/4VXoeAfL62LA8sCckEtpyhro5QHagzKypXkkOlp7CUPK1eUmVt1v6SIXMmw7R1X52SvTauMavWgiV1kW7bJlE89PJ5hHoPnfHEHMhIQs5JMvXGkSCwVsaKRcOSg9lII9Py4sCy3ky9l/7Xi/WTfG5xORZ5C3ea9oJcDwP3I5fIJ6cyr7W3R2Q7KhaT4NoNHbuq0kY/EfeQKHkaqWqJPEogg/1SQm6/oPUmg2hPId99+E3H/EAGkwxE8ZkfsAXbPO5mmZlxHKzLtA6MyQ8XKNnVi9rCPyhSbuRhN+HE7QaTvFue5mKtJqgTJfRz3l2IuN6oYXTh5fMnhM7P8BeZulZf2dg7ypKb9nncdjOVCt3sxLBwz2cO2vOVswjaxR/H+tqP+kCpmKtqoYa8PeMCkSvl7kxvdS26vjjfF6pUInb+SXF799IPbYY4vPfLSH1gk7VRa8z/DqvhHPCDw== cardno:000F_63793DE6