diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 2ca4e9a..f652931 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,13 +1,13 @@ - -# /\ ,, -# || ' || -# =||= \\ _-_, ||/\\ -# || || ||_. || || -# || || ~ || || || -# \\, \\ ,-_- \\ |/ -# _/ - + +# /\ ,, +# || ' || +# =||= \\ _-_, ||/\\ +# || || ||_. || || +# || || ~ || || || +# \\, \\ ,-_- \\ |/ +# _/ + source ~/.cache/wal/colors.fish @@ -17,7 +17,7 @@ set -Ux DESKTOP_SESSION bspwm set -Ux EDITOR vim set -Ux JDK_JAVA_OPTIONS "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Djdk.gtk.version=3 -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true" set -Ux SYSTEMD_EDITOR vim -set -gx fish_user_paths $fish_user_paths (ruby -e 'print Gem.user_dir')/bin /home/agatha/.cargo/bin /home/agatha/.cabal/bin /home/agatha/.espressif/tools/xtensa-esp32-elf-clang/esp-13.0.0-20211203-x86_64-unknown-linux-gnu/bin/ +set -gx fish_user_paths $fish_user_paths (ruby -e 'print Gem.user_dir')/bin /home/agatha/.local/bin /home/agatha/.cargo/bin /home/agatha/.cabal/bin /home/agatha/.espressif/tools/xtensa-esp32-elf-clang/esp-13.0.0-20211203-x86_64-unknown-linux-gnu/bin/ set -Ux LIBCLANG_PATH "/home/agatha/.espressif/tools/xtensa-esp32-elf-clang/esp-13.0.0-20211203-x86_64-unknown-linux-gnu/lib" set -Ux PIP_USER no @@ -30,6 +30,7 @@ alias ls 'exa -lFhT --group-directories-first --level 1' alias py python3 alias xclip 'xclip -selection clipboard' alias youtube-dl-audio 'youtube-dl --ignore-errors --output "%(title)s.%(ext)s" --extract-audio --audio-format best' +alias ip 'ip -color=always' if status is-interactive # Commands to run in interactive sessions can go here @@ -51,8 +52,21 @@ end bind . 'expand-dot-to-parent-directory-path' +# args: file host container path +function scp-lxc + scp -r $argv[1] $argv[2]:/tmp/ + set -l pid (string trim (ssh $argv[2] (string join ' ' "sudo lxc-ls -f -Fpid" $argv[3]) | sed -n 2p)) + ssh $argv[2] (string join '' "sudo mv /tmp/" (basename $argv[1]) " /proc/" $pid "/root/" $argv[4]) +end + # if test -n "$DESKTOP_SESSION" # set -x (gnome-keyring-daemon --start --components=secrets | string split "=") # end +set -e SSH_AGENT_PID +set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) +# so gpg-agent knows in what tty to prompt for key passwords +set -x GPG_TTY (tty) +gpg-connect-agent updatestartuptty /bye > /dev/null + starship init fish | source diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index c05ad2c..f07fc07 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,17 +1,17 @@ -# _-_-, , , -# // , ' || || -# ||/\\ \\ =||= =||= '\\/\\ -# ~|| < || || || || ;' -# ||/\\ || || || ||/ -# _-__,\\, \\ \\, \\, |/ -# ( -# -_- +# _-_-, , , +# // , ' || || +# ||/\\ \\ =||= =||= '\\/\\ +# ~|| < || || || || ;' +# ||/\\ || || || ||/ +# _-__,\\, \\ \\, \\, |/ +# ( +# -_- -font_family Sarasa Term Slab SC -bold_font Sarasa Term Slab SC Bold -italic_font Sarasa Term Slab SC Italic -bold_italic_font Sarasa Term Slab SC Bold Italic +font_family Iosevka Gothic +bold_font Iosevka Gothic Bold +italic_font Iosevka Gothic Italic +bold_italic_font Iosevka Bold Italic # font_features IosevkaNerdFontCompleteM-Medium +ss05 +cv25=26 +cv26=9 +cv50=26 +cv71=2 +cv74=1 +cv82=2 +cv87=3 diff --git a/.imwheelrc b/.imwheelrc deleted file mode 100644 index 164f031..0000000 --- a/.imwheelrc +++ /dev/null @@ -1,7 +0,0 @@ -".*" -None, Up, Button4, 3 -None, Down, Button5, 3 -Control_L, Up, Control_L|Button4 -Control_L, Down, Control_L|Button5 -Shift_L, Up, Shift_L|Button4 -Shift_L, Down, Shift_L|Button5 diff --git a/.vimrc b/.vimrc index 36a48c2..132157a 100644 --- a/.vimrc +++ b/.vimrc @@ -51,6 +51,7 @@ if has('nvim') Plug 'j-hui/fidget.nvim' Plug 'jghauser/mkdir.nvim' Plug 'jose-elias-alvarez/null-ls.nvim' + Plug 'simrat39/rust-tools.nvim' Plug 'stevearc/dressing.nvim' Plug 'williamboman/nvim-lsp-installer' Plug 'antoinemadec/FixCursorHold.nvim' @@ -74,6 +75,11 @@ endif call plug#end() +" NixOS config +if hostname() == "bloodletting" + set backupdir=~/.local/state/nvim/backups +endif + " Lightline config let g:lightline = { \ 'colorscheme': 'icebergDark',