Merge branch 'main' into opt

This commit is contained in:
Michel 2023-11-13 10:50:08 +01:00
commit a824fa42d3
5 changed files with 46 additions and 41 deletions

View File

@ -112,12 +112,13 @@ git apply --stat --apply 2604.patch
- https://sw.kovidgoyal.net/kitty/binary/
- Install `JetBrains Mono` (without NF) & `NerdFontsSymbolsOnly` fonts.
- Note: outside of kitty, it may be interesting to also install _JetBrains
Mono_ *with* _NF_.
- Note: outside of kitty, it may be interesting to also install
_JetBrains Mono_ *with* _NF_.
```
sudo apt-get install kitty-terminfo
(kitty --version && curl https://sw.kovidgoyal.net/kitty/changelog/ | html2text) | less
sudo sh ~/.config/kitty/installer.sh launch=n dest=/opt
sudo update-alternatives \
@ -132,9 +133,9 @@ So it is more coherent/simpler to copy this behaviour into Zsh.
## lazygit
```
sudo apt install git-delta
```
### Dependencies
- git-delta
### Binary Releases
@ -142,7 +143,8 @@ sudo apt install git-delta
mkdir -p /opt/lazygit/bin
cd /opt/lazygit/bin
LOCATION=$(curl -s https://api.github.com/repos/jesseduffield/lazygit/releases/latest \
URI=https://api.github.com/repos/jesseduffield/lazygit
LOCATION=$(curl -s $URI/releases/latest \
| grep "browser_download_url.*Linux_x86_64" \
| awk '{ print $2 }' \
| sed 's/,$//' \
@ -156,9 +158,15 @@ tar xf *.tar.gz(om[1])
## neovim
```
sudo apt install libfuse2 xsel
### Dependencies
- kitty / NerdFont
- libfuse2
- xsel
### Binary Nightly Release
```
mkdir -p /opt/neovim/bin
cd /opt/neovim/bin

View File

@ -1,21 +0,0 @@
background #000000
foreground #f1f1f1
cursor #4c4c4c
selection_background #414141
color0 #2a2a2a
color8 #666666
color1 #ff0000
color9 #ff007f
color2 #78ff0e
color10 #66ff66
color3 #e6be00
color11 #f3d64d
color4 #396ad6
color12 #7099ec
color5 #b348bd
color13 #da66e5
color6 #66ccff
color14 #79def1
color7 #bababa
color15 #ffffff
selection_foreground #000000

View File

@ -0,0 +1,21 @@
background #000000
foreground #ffffff
cursor #ffffff
selection_background #b4d5ff
color0 #000000
color8 #555753
color1 #cc0000
color9 #ef2929
color2 #4e9a06
color10 #8ae234
color3 #c4a000
color11 #fce94f
color4 #3465a4
color12 #729fcf
color5 #75507b
color13 #ad7fa8
color6 #06989a
color14 #34e2e2
color7 #d3d7cf
color15 #eeeeec
selection_foreground #000000

View File

@ -99,7 +99,10 @@ inactive_tab_font_style italic
#: Color scheme {{{1
include Paul Millr.conf
# BEGIN_KITTY_THEME
include Tango Dark.conf
# END_KITTY_THEME
background_opacity 1.00
cursor #f41
selection_background none

16
.zshrc
View File

@ -40,8 +40,7 @@ typeset -U path fpath
### ASDF
#
# The direnv plugin is not up-to-date with new `asdf direnv setup` command.
#
# Line below from `asdf direnv setup --version latest`
source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
### b4b4r07/enhancd
@ -209,7 +208,7 @@ alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
lg()
{
export LAZYGIT_NEW_DIR_FILE=~/.lazygit/newdir
export LAZYGIT_NEW_DIR_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/lazygit/cd-on-quit_$$"
lazygit "$@"
if [ -f $LAZYGIT_NEW_DIR_FILE ]; then
cd "$(cat $LAZYGIT_NEW_DIR_FILE)"
@ -276,17 +275,12 @@ fi
export BROWSER=firefox
export EDITOR=vi
# -i Searches ignore case
# -F Automatically exit if the entire file can be displayed
# -R ANSI "color" escape sequences are output in "raw" form
# -S Chop long lines
# -X Disables sending the termcap initialization and deinitialization
# -M Long prompt
# -K Quit on ^C
export LESS=-iFRS
export SYSTEMD_LESS='iFRSXMK'
# KeePassXC SSH Agent
[[ -v SSH_AUTH_SOCK ]] || export SSH_AUTH_SOCK=$(echo /tmp/ssh-*/agent.*(U))
###
### History