From 7876f9736f30ee3601281b3025ddd5c2f23e9ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Sun, 2 Jun 2024 13:36:24 +0200 Subject: [PATCH] Sun Jun 2 01:36:24 PM CEST 2024 --- .config/lf/colors | 174 ----------------------------------- .config/lf/icons | 77 ---------------- .config/lf/lfrc | 22 ----- NixOS/modules/zsh/config.nix | 24 ++--- 4 files changed, 7 insertions(+), 290 deletions(-) delete mode 100644 .config/lf/colors delete mode 100644 .config/lf/icons delete mode 100644 .config/lf/lfrc diff --git a/.config/lf/colors b/.config/lf/colors deleted file mode 100644 index b65d3f0..0000000 --- a/.config/lf/colors +++ /dev/null @@ -1,174 +0,0 @@ -# vim:ft=dircolors -# (This is not a dircolors file but it helps to highlight colors and comments) - -# default values from dircolors -# (entries with a leading # are not implemented in lf) -# #no 00 # NORMAL -# fi 00 # FILE -# #rs 0 # RESET -# di 01;34 # DIR -# ln 01;36 # LINK -# #mh 00 # MULTIHARDLINK -# pi 40;33 # FIFO -# so 01;35 # SOCK -# #do 01;35 # DOOR -# bd 40;33;01 # BLK -# cd 40;33;01 # CHR -# or 40;31;01 # ORPHAN -# #mi 00 # MISSING -# su 37;41 # SETUID -# sg 30;43 # SETGID -# #ca 30;41 # CAPABILITY -# tw 30;42 # STICKY_OTHER_WRITABLE -# ow 34;42 # OTHER_WRITABLE -# st 37;44 # STICKY -# ex 01;32 # EXEC - -# default values from lf (with matching order) -# ln 01;36 # LINK -# or 31;01 # ORPHAN -# tw 01;34 # STICKY_OTHER_WRITABLE -# ow 01;34 # OTHER_WRITABLE -# st 01;34 # STICKY -# di 01;34 # DIR -# pi 33 # FIFO -# so 01;35 # SOCK -# bd 33;01 # BLK -# cd 33;01 # CHR -# su 01;32 # SETUID -# sg 01;32 # SETGID -# ex 01;32 # EXEC -# fi 00 # FILE - -# file types (with matching order) -ln 01;36 # LINK -or 31;01 # ORPHAN -tw 34 # STICKY_OTHER_WRITABLE -ow 34 # OTHER_WRITABLE -st 01;34 # STICKY -di 01;34 # DIR -pi 33 # FIFO -so 01;35 # SOCK -bd 33;01 # BLK -cd 33;01 # CHR -su 01;32 # SETUID -sg 01;32 # SETGID -ex 01;32 # EXEC -fi 00 # FILE - -# archives or compressed (dircolors defaults) -*.tar 01;31 -*.tgz 01;31 -*.arc 01;31 -*.arj 01;31 -*.taz 01;31 -*.lha 01;31 -*.lz4 01;31 -*.lzh 01;31 -*.lzma 01;31 -*.tlz 01;31 -*.txz 01;31 -*.tzo 01;31 -*.t7z 01;31 -*.zip 01;31 -*.z 01;31 -*.dz 01;31 -*.gz 01;31 -*.lrz 01;31 -*.lz 01;31 -*.lzo 01;31 -*.xz 01;31 -*.zst 01;31 -*.tzst 01;31 -*.bz2 01;31 -*.bz 01;31 -*.tbz 01;31 -*.tbz2 01;31 -*.tz 01;31 -*.deb 01;31 -*.rpm 01;31 -*.jar 01;31 -*.war 01;31 -*.ear 01;31 -*.sar 01;31 -*.rar 01;31 -*.alz 01;31 -*.ace 01;31 -*.zoo 01;31 -*.cpio 01;31 -*.7z 01;31 -*.rz 01;31 -*.cab 01;31 -*.wim 01;31 -*.swm 01;31 -*.dwm 01;31 -*.esd 01;31 - -# image formats (dircolors defaults) -*.jpg 01;35 -*.jpeg 01;35 -*.mjpg 01;35 -*.mjpeg 01;35 -*.gif 01;35 -*.bmp 01;35 -*.pbm 01;35 -*.pgm 01;35 -*.ppm 01;35 -*.tga 01;35 -*.xbm 01;35 -*.xpm 01;35 -*.tif 01;35 -*.tiff 01;35 -*.png 01;35 -*.svg 01;35 -*.svgz 01;35 -*.mng 01;35 -*.pcx 01;35 -*.mov 01;35 -*.mpg 01;35 -*.mpeg 01;35 -*.m2v 01;35 -*.mkv 01;35 -*.webm 01;35 -*.ogm 01;35 -*.mp4 01;35 -*.m4v 01;35 -*.mp4v 01;35 -*.vob 01;35 -*.qt 01;35 -*.nuv 01;35 -*.wmv 01;35 -*.asf 01;35 -*.rm 01;35 -*.rmvb 01;35 -*.flc 01;35 -*.avi 01;35 -*.fli 01;35 -*.flv 01;35 -*.gl 01;35 -*.dl 01;35 -*.xcf 01;35 -*.xwd 01;35 -*.yuv 01;35 -*.cgm 01;35 -*.emf 01;35 -*.ogv 01;35 -*.ogx 01;35 - -# audio formats (dircolors defaults) -*.aac 00;36 -*.au 00;36 -*.flac 00;36 -*.m4a 00;36 -*.mid 00;36 -*.midi 00;36 -*.mka 00;36 -*.mp3 00;36 -*.mpc 00;36 -*.ogg 00;36 -*.ra 00;36 -*.wav 00;36 -*.oga 00;36 -*.opus 00;36 -*.spx 00;36 -*.xspf 00;36 diff --git a/.config/lf/icons b/.config/lf/icons deleted file mode 100644 index ae8d86c..0000000 --- a/.config/lf/icons +++ /dev/null @@ -1,77 +0,0 @@ -di  -fi 📃 -tw 🤝 -ow 📂 -ln ⛓ -or ❌ -ex 🎯 -*.txt ✍ -*.mom ✍ -*.me ✍ -*.ms ✍ -*.avif 🖼 -*.png 🖼 -*.webp 🖼 -*.ico 🖼 -*.jpg 📸 -*.jpe 📸 -*.jpeg 📸 -*.gif 🖼 -*.svg 🗺 -*.tif 🖼 -*.tiff 🖼 -*.xcf 🖌 -*.html 🌎 -*.xml 📰 -*.gpg 🔒 -*.css 🎨 -*.pdf 📚 -*.djvu 📚 -*.epub 📚 -*.csv 📓 -*.xlsx 📓 -*.tex 📜 -*.md 📘 -*.r 📊 -*.R 📊 -*.rmd 📊 -*.Rmd 📊 -*.m 📊 -*.mp3 🎵 -*.opus 🎵 -*.ogg 🎵 -*.m4a 🎵 -*.flac 🎼 -*.wav 🎼 -*.mkv 🎥 -*.mp4 🎥 -*.webm 🎥 -*.mpeg 🎥 -*.avi 🎥 -*.mov 🎥 -*.mpg 🎥 -*.wmv 🎥 -*.m4b 🎥 -*.flv 🎥 -*.zip 📦 -*.rar 📦 -*.7z 📦 -*.tar 📦 -*.z64 🎮 -*.v64 🎮 -*.n64 🎮 -*.gba 🎮 -*.nes 🎮 -*.gdi 🎮 -*.1 ℹ -*.nfo ℹ -*.info ℹ -*.log 📙 -*.iso 📀 -*.img 📀 -*.bib 🎓 -*.ged 👪 -*.part 💔 -*.torrent 🔽 -*.jar ♨ -*.java ♨ diff --git a/.config/lf/lfrc b/.config/lf/lfrc deleted file mode 100644 index 78f34e2..0000000 --- a/.config/lf/lfrc +++ /dev/null @@ -1,22 +0,0 @@ -set icons true -set autoquit true -set mouse true -set number true -set relativenumber true -set cursorpreviewfmt "" - -cmd q quit - -map quit -map half-up -map . set hidden! -map o $nvim -c "lua require(\"oil\").open(\"$PWD\")" -map - $nvim -c "lua require(\"oil\").open(\"$PWD\")" -map open - -cmd jump ${{ - res=$(zsh -c "source $HOME/.zshrc && find_global d") - lf -remote "send $id cd \"$res\"" -}} - -map :jump diff --git a/NixOS/modules/zsh/config.nix b/NixOS/modules/zsh/config.nix index 838fc60..447a257 100644 --- a/NixOS/modules/zsh/config.nix +++ b/NixOS/modules/zsh/config.nix @@ -43,16 +43,18 @@ autosuggestion.enable = true; initExtraFirst = '' - source ${config.xdg.configHome}/zsh/p10k.zsh + source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme + source ${./files/p10k.zsh} + source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh function zvm_after_init() { - source ${config.xdg.configHome}/zsh/term.zsh - source ${config.xdg.configHome}/zsh/completion.zsh - source ${config.xdg.configHome}/zsh/waypipe.zsh + source ${./files/term.zsh} + source ${./files/completion.zsh} + source ${./files/waypipe.zsh} if [ -n "\$\{commands[fzf-share]\}" ]; then source "$(fzf-share)/key-bindings.zsh" source "$(fzf-share)/completion.zsh" fi - source ${config.xdg.configHome}/zsh/keys.zsh + source ${./files/keys.zsh} } ''; @@ -82,17 +84,5 @@ history.save = 10000000; history.path = "${config.xdg.dataHome}/zsh/history"; autocd = true; - plugins = [ - { - name = "zsh-powerlevel10k"; - src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/"; - file = "powerlevel10k.zsh-theme"; - } - { - name = "vi-mode"; - src = pkgs.zsh-vi-mode; - file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh"; - } - ]; }; }