diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 6e9d945..05b39bb 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -27,7 +27,7 @@ width = (111,444) # The maximum height of a single notification, excluding the frame. - height = 222 + height = 200 # Position the notification in the top right corner origin = top-right @@ -208,7 +208,7 @@ min_icon_size = 32 # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 128 + max_icon_size = 100 # Paths to default icons (only neccesary when not using recursive icon lookup) icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ @@ -444,6 +444,9 @@ # summary = *says* # urgency = critical # +#[gotify] +# appname = Gotify + #[twitter] # appname = Pidgin # summary = *twitter.com* diff --git a/.config/fish/conf.d/autopair.fish b/.config/fish/conf.d/autopair.fish new file mode 100644 index 0000000..abb4bf3 --- /dev/null +++ b/.config/fish/conf.d/autopair.fish @@ -0,0 +1,39 @@ +status is-interactive || exit + +set --global autopair_left "(" "[" "{" '"' "'" +set --global autopair_right ")" "]" "}" '"' "'" +set --global autopair_pairs "()" "[]" "{}" '""' "''" + +function _autopair_fish_key_bindings --on-variable fish_key_bindings + set --query fish_key_bindings[1] || return + + test $fish_key_bindings = fish_default_key_bindings && + set --local mode default insert || + set --local mode insert default + + bind --mode $mode[-1] --erase \177 \b \t + + bind --mode $mode[1] \177 _autopair_backspace # macOS ⌫ + bind --mode $mode[1] \b _autopair_backspace + bind --mode $mode[1] \t _autopair_tab + + printf "%s\n" $autopair_pairs | while read --local left right --delimiter "" + bind --mode $mode[-1] --erase $left $right + if test $left = $right + bind --mode $mode[1] $left "_autopair_insert_same \\$left" + else + bind --mode $mode[1] $left "_autopair_insert_left \\$left \\$right" + bind --mode $mode[1] $right "_autopair_insert_right \\$right" + end + end +end + +_autopair_fish_key_bindings + +function _autopair_uninstall --on-event autopair_uninstall + string collect ( + bind --all | string replace --filter --regex -- "_autopair.*" --erase + set --names | string replace --filter --regex -- "^autopair" "set --erase autopair" + ) | source + functions --erase (functions --all | string match "_autopair_*") +end diff --git a/.config/fish/conf.d/lf-icons.fish b/.config/fish/conf.d/lf-icons.fish new file mode 100644 index 0000000..22e49d4 --- /dev/null +++ b/.config/fish/conf.d/lf-icons.fish @@ -0,0 +1,221 @@ +set -Ux LF_ICONS "\ +*.7z=:\ +*.aac=:\ +*.ace=:\ +*.alz=:\ +*.arc=:\ +*.arj=:\ +*.asf=:\ +*.atom=:\ +*.au=:\ +*.avi=:\ +*.bash=:\ +*.bash_history=:\ +*.bashprofile=:\ +*.bashrc=:\ +*.bmp=:\ +*.bz2=:\ +*.bz=:\ +*.c=:\ +*.cab=:\ +*.cc=:\ +*.cfg=:\ +*.cgm=:\ +*.clang-format=:\ +*.clj=:\ +*.cmd=:\ +*.coffee=:\ +*.cpio=:\ +*.cpp=:\ +*.css=:\ +*.d=:\ +*.dart=:\ +*.deb=:\ +*.dl=:\ +*.DS_Store=:\ +*.dwm=:\ +*.dz=:\ +*.ear=:\ +*.emf=:\ +*.env=:\ +*.erl=:\ +*.esd=:\ +*.exs=:\ +*.fish=:\ +*.flac=:\ +*.flc=:\ +*.fli=:\ +*.flv=:\ +*.fs=:\ +*.gif=:\ +*.git=:\ +*.gitattributes=:\ +*.gitconfig=:\ +*.github=:\ +*.gitignore=:\ +*.gitignore_global=:\ +*.gitkeep=:\ +*.gitmodules=:\ +*.gl=:\ +*.go=:\ +*.gz=:\ +*.h=:\ +*.hh=:\ +*.hidden=:\ +*.hpp=:\ +*.hs=:\ +*.html=:\ +*.hyper.js=:\ +*.jar=:\ +*.java=:\ +*.jl=:\ +*.jpeg=:\ +*.jpg=:\ +*.js=:\ +*.json=:\ +*.jsx=:\ +*.lha=:\ +*.lrz=:\ +*.lua=:\ +*.lz4=:\ +*.lz=:\ +*.lzh=:\ +*.lzma=:\ +*.lzo=:\ +*.m2v=:\ +*.m4a=:\ +*.m4v=:\ +*.map=:\ +*.md=:\ +*.mdx=:\ +*.mid=:\ +*.midi=:\ +*.mjpeg=:\ +*.mjpg=:\ +*.mka=:\ +*.mkv=:\ +*.mng=:\ +*.mov=:\ +*.mp3=:\ +*.mp4=:\ +*.mp4v=:\ +*.mpc=:\ +*.mpeg=:\ +*.mpg=:\ +*.nix=:\ +*.npmignore=:\ +*.npmrc=:\ +*.nuv=:\ +*.nvmrc=:\ +*.oga=:\ +*.ogg=:\ +*.ogm=:\ +*.ogv=:\ +*.ogx=:\ +*.opus=:\ +*.pbm=:\ +*.pcx=:\ +*.pdf=:\ +*.pgm=:\ +*.php=:\ +*.pl=:\ +*.png=:\ +*.ppm=:\ +*.pro=:\ +*.ps1=:\ +*.py=:\ +*.qt=:\ +*.ra=:\ +*.rar=:\ +*.rb=:\ +*.rm=:\ +*.rmvb=:\ +*.rpm=:\ +*.rs=:\ +*.rvm=:\ +*.rz=:\ +*.sar=:\ +*.scala=:\ +*.sh=:\ +*.skhdrc=:\ +*.sol=ﲹ:\ +*.spx=:\ +*.svg=:\ +*.svgz=:\ +*.swm=:\ +*.t7z=:\ +*.tar=:\ +*.taz=:\ +*.tbz2=:\ +*.tbz=:\ +*.tga=:\ +*.tgz=:\ +*.tif=:\ +*.tiff=:\ +*.tlz=:\ +*.tmux.conf=:\ +*.trash=:\ +*.ts=:\ +*.tsx=:\ +*.txz=:\ +*.tz=:\ +*.tzo=:\ +*.tzst=:\ +*.vim=:\ +*.vimrc=:\ +*.vob=:\ +*.vscode=:\ +*.war=:\ +*.wav=:\ +*.webm=:\ +*.wim=:\ +*.xbm=:\ +*.xcf=:\ +*.xpm=:\ +*.xspf=:\ +*.xwd=:\ +*.xz=:\ +*.yabairc=:\ +*.yaml=פּ:\ +*.yarn-integrity=:\ +*.yarnrc=:\ +*.yml=פּ:\ +*.yuv=:\ +*.z=:\ +*.zip=:\ +*.zoo=:\ +*.zprofile=:\ +*.zprofile=:\ +*.zsh=:\ +*.zsh_history=:\ +*.zshrc=:\ +*.zst=:\ +*bin=:\ +*config=:\ +*docker-compose.yml=:\ +*dockerfile=:\ +*gradle=:\ +*gruntfile.coffee=:\ +*gruntfile.js=:\ +*gruntfile.ls=:\ +*gulpfile.coffee=:\ +*gulpfile.js=:\ +*gulpfile.ls=:\ +*include=:\ +*lib=:\ +*localized=:\ +*node_modules=:\ +*package.json=:\ +*rubydoc=:\ +*tsconfig.json=:\ +*yarn.lock=:\ +di=:\ +dt=:\ +ex=:\ +fi=:\ +ln=:\ +or=:\ +ow=:\ +st=:\ +tw=:\ +" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index b512527..ea5b48f 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -13,16 +13,16 @@ if status is-interactive alias dotfiles="git --git-dir=/home/q/repos/dotfiles --work-tree=$HOME" set -U fish_user_paths $HOME/bin $fish_user_paths - + set -x TERM "xterm-256color" set -x PF_INFO "ascii title os kernel wm shell pkgs memory" - set -x TERM "xterm" + # set -x TERM "xterm" set -x EDITOR "nvim" set -x XDG_DATA_HOME $HOME/.local/share set srcdir "$HOME/.cache/" set pkgdir "$HOME/.npm/" alias npm="npm --cache $srcir/npm-cache" - + set fish_greeting # Commands to run in interactive sessions can go here end diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins index f32bf5f..618bfd8 100644 --- a/.config/fish/fish_plugins +++ b/.config/fish/fish_plugins @@ -2,3 +2,5 @@ jorgebucaran/fisher jorgebucaran/nvm.fish derekstavis/fish-neovim catppuccin/fish +jorgebucaran/autopair.fish +joshmedeski/fish-lf-icons diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index d7d2418..c06912b 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,10 +1,13 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR --export LF_ICONS:\x2a\x2e7z\x3d\uf410\x3a\x2a\x2eaac\x3d\uf40f\x3a\x2a\x2eace\x3d\uf410\x3a\x2a\x2ealz\x3d\uf410\x3a\x2a\x2earc\x3d\uf410\x3a\x2a\x2earj\x3d\uf410\x3a\x2a\x2easf\x3d\uf40f\x3a\x2a\x2eatom\x3d\ue764\x3a\x2a\x2eau\x3d\uf40f\x3a\x2a\x2eavi\x3d\uf40f\x3a\x2a\x2ebash\x3d\uf489\x3a\x2a\x2ebash_history\x3d\uf489\x3a\x2a\x2ebashprofile\x3d\uf489\x3a\x2a\x2ebashrc\x3d\uf489\x3a\x2a\x2ebmp\x3d\uf40f\x3a\x2a\x2ebz2\x3d\uf410\x3a\x2a\x2ebz\x3d\uf410\x3a\x2a\x2ec\x3d\ue61e\x3a\x2a\x2ecab\x3d\uf410\x3a\x2a\x2ecc\x3d\ue61d\x3a\x2a\x2ecfg\x3d\ue615\x3a\x2a\x2ecgm\x3d\uf40f\x3a\x2a\x2eclang\x2dformat\x3d\ue615\x3a\x2a\x2eclj\x3d\ue768\x3a\x2a\x2ecmd\x3d\uf40d\x3a\x2a\x2ecoffee\x3d\ue751\x3a\x2a\x2ecpio\x3d\uf410\x3a\x2a\x2ecpp\x3d\ue61d\x3a\x2a\x2ecss\x3d\ue614\x3a\x2a\x2ed\x3d\ue7af\x3a\x2a\x2edart\x3d\ue798\x3a\x2a\x2edeb\x3d\uf410\x3a\x2a\x2edl\x3d\uf40f\x3a\x2a\x2eDS_Store\x3d\uf179\x3a\x2a\x2edwm\x3d\uf410\x3a\x2a\x2edz\x3d\uf410\x3a\x2a\x2eear\x3d\uf410\x3a\x2a\x2eemf\x3d\uf40f\x3a\x2a\x2eenv\x3d\uf444\x3a\x2a\x2eerl\x3d\ue7b1\x3a\x2a\x2eesd\x3d\uf410\x3a\x2a\x2eexs\x3d\ue62d\x3a\x2a\x2efish\x3d\uf489\x3a\x2a\x2eflac\x3d\uf40f\x3a\x2a\x2eflc\x3d\uf40f\x3a\x2a\x2efli\x3d\uf40f\x3a\x2a\x2eflv\x3d\uf40f\x3a\x2a\x2efs\x3d\ue7a7\x3a\x2a\x2egif\x3d\uf40f\x3a\x2a\x2egit\x3d\ue725\x3a\x2a\x2egitattributes\x3d\ue725\x3a\x2a\x2egitconfig\x3d\ue725\x3a\x2a\x2egithub\x3d\uf408\x3a\x2a\x2egitignore\x3d\ue725\x3a\x2a\x2egitignore_global\x3d\ue725\x3a\x2a\x2egitkeep\x3d\ue725\x3a\x2a\x2egitmodules\x3d\ue725\x3a\x2a\x2egl\x3d\uf40f\x3a\x2a\x2ego\x3d\ue627\x3a\x2a\x2egz\x3d\uf410\x3a\x2a\x2eh\x3d\ue61e\x3a\x2a\x2ehh\x3d\ue61d\x3a\x2a\x2ehidden\x3d\uf023\x3a\x2a\x2ehpp\x3d\ue61d\x3a\x2a\x2ehs\x3d\ue777\x3a\x2a\x2ehtml\x3d\ue60e\x3a\x2a\x2ehyper\x2ejs\x3d\uf489\x3a\x2a\x2ejar\x3d\uf410\x3a\x2a\x2ejava\x3d\ue738\x3a\x2a\x2ejl\x3d\ue624\x3a\x2a\x2ejpeg\x3d\uf40f\x3a\x2a\x2ejpg\x3d\uf40f\x3a\x2a\x2ejs\x3d\ue74e\x3a\x2a\x2ejson\x3d\ue60b\x3a\x2a\x2ejsx\x3d\ue7ba\x3a\x2a\x2elha\x3d\uf410\x3a\x2a\x2elrz\x3d\uf410\x3a\x2a\x2elua\x3d\ue620\x3a\x2a\x2elz4\x3d\uf410\x3a\x2a\x2elz\x3d\uf410\x3a\x2a\x2elzh\x3d\uf410\x3a\x2a\x2elzma\x3d\uf410\x3a\x2a\x2elzo\x3d\uf410\x3a\x2a\x2em2v\x3d\uf40f\x3a\x2a\x2em4a\x3d\uf40f\x3a\x2a\x2em4v\x3d\uf40f\x3a\x2a\x2emap\x3d\uf278\x3a\x2a\x2emd\x3d\ue609\x3a\x2a\x2emdx\x3d\ue609\x3a\x2a\x2emid\x3d\uf40f\x3a\x2a\x2emidi\x3d\uf40f\x3a\x2a\x2emjpeg\x3d\uf40f\x3a\x2a\x2emjpg\x3d\uf40f\x3a\x2a\x2emka\x3d\uf40f\x3a\x2a\x2emkv\x3d\uf40f\x3a\x2a\x2emng\x3d\uf40f\x3a\x2a\x2emov\x3d\uf40f\x3a\x2a\x2emp3\x3d\uf40f\x3a\x2a\x2emp4\x3d\uf40f\x3a\x2a\x2emp4v\x3d\uf40f\x3a\x2a\x2empc\x3d\uf40f\x3a\x2a\x2empeg\x3d\uf40f\x3a\x2a\x2empg\x3d\uf40f\x3a\x2a\x2enix\x3d\uf313\x3a\x2a\x2enpmignore\x3d\ue71e\x3a\x2a\x2enpmrc\x3d\ue71e\x3a\x2a\x2enuv\x3d\uf40f\x3a\x2a\x2envmrc\x3d\ue718\x3a\x2a\x2eoga\x3d\uf40f\x3a\x2a\x2eogg\x3d\uf40f\x3a\x2a\x2eogm\x3d\uf40f\x3a\x2a\x2eogv\x3d\uf40f\x3a\x2a\x2eogx\x3d\uf40f\x3a\x2a\x2eopus\x3d\uf40f\x3a\x2a\x2epbm\x3d\uf40f\x3a\x2a\x2epcx\x3d\uf40f\x3a\x2a\x2epdf\x3d\uf411\x3a\x2a\x2epgm\x3d\uf40f\x3a\x2a\x2ephp\x3d\ue608\x3a\x2a\x2epl\x3d\ue769\x3a\x2a\x2epng\x3d\uf40f\x3a\x2a\x2eppm\x3d\uf40f\x3a\x2a\x2epro\x3d\ue7a1\x3a\x2a\x2eps1\x3d\uf40d\x3a\x2a\x2epy\x3d\ue73c\x3a\x2a\x2eqt\x3d\uf40f\x3a\x2a\x2era\x3d\uf40f\x3a\x2a\x2erar\x3d\uf410\x3a\x2a\x2erb\x3d\ue739\x3a\x2a\x2erm\x3d\uf40f\x3a\x2a\x2ermvb\x3d\uf40f\x3a\x2a\x2erpm\x3d\uf410\x3a\x2a\x2ers\x3d\ue7a8\x3a\x2a\x2ervm\x3d\ue21e\x3a\x2a\x2erz\x3d\uf410\x3a\x2a\x2esar\x3d\uf410\x3a\x2a\x2escala\x3d\ue737\x3a\x2a\x2esh\x3d\uf40d\x3a\x2a\x2eskhdrc\x3d\uf179\x3a\x2a\x2esol\x3d\ufcb9\x3a\x2a\x2espx\x3d\uf40f\x3a\x2a\x2esvg\x3d\uf40f\x3a\x2a\x2esvgz\x3d\uf40f\x3a\x2a\x2eswm\x3d\uf410\x3a\x2a\x2et7z\x3d\uf410\x3a\x2a\x2etar\x3d\uf410\x3a\x2a\x2etaz\x3d\uf410\x3a\x2a\x2etbz2\x3d\uf410\x3a\x2a\x2etbz\x3d\uf410\x3a\x2a\x2etga\x3d\uf40f\x3a\x2a\x2etgz\x3d\uf410\x3a\x2a\x2etif\x3d\uf40f\x3a\x2a\x2etiff\x3d\uf40f\x3a\x2a\x2etlz\x3d\uf410\x3a\x2a\x2etmux\x2econf\x3d\uf489\x3a\x2a\x2etrash\x3d\uf1f8\x3a\x2a\x2ets\x3d\ue628\x3a\x2a\x2etsx\x3d\ue7ba\x3a\x2a\x2etxz\x3d\uf410\x3a\x2a\x2etz\x3d\uf410\x3a\x2a\x2etzo\x3d\uf410\x3a\x2a\x2etzst\x3d\uf410\x3a\x2a\x2evim\x3d\ue62b\x3a\x2a\x2evimrc\x3d\ue62b\x3a\x2a\x2evob\x3d\uf40f\x3a\x2a\x2evscode\x3d\ue70c\x3a\x2a\x2ewar\x3d\uf410\x3a\x2a\x2ewav\x3d\uf40f\x3a\x2a\x2ewebm\x3d\uf40f\x3a\x2a\x2ewim\x3d\uf410\x3a\x2a\x2exbm\x3d\uf40f\x3a\x2a\x2excf\x3d\uf40f\x3a\x2a\x2expm\x3d\uf40f\x3a\x2a\x2exspf\x3d\uf40f\x3a\x2a\x2exwd\x3d\uf40f\x3a\x2a\x2exz\x3d\uf410\x3a\x2a\x2eyabairc\x3d\uf179\x3a\x2a\x2eyaml\x3d\ufb44\x3a\x2a\x2eyarn\x2dintegrity\x3d\ue718\x3a\x2a\x2eyarnrc\x3d\ue718\x3a\x2a\x2eyml\x3d\ufb44\x3a\x2a\x2eyuv\x3d\uf40f\x3a\x2a\x2ez\x3d\uf410\x3a\x2a\x2ezip\x3d\uf410\x3a\x2a\x2ezoo\x3d\uf410\x3a\x2a\x2ezprofile\x3d\uf489\x3a\x2a\x2ezprofile\x3d\uf489\x3a\x2a\x2ezsh\x3d\uf489\x3a\x2a\x2ezsh_history\x3d\uf489\x3a\x2a\x2ezshrc\x3d\uf489\x3a\x2a\x2ezst\x3d\uf410\x3a\x2abin\x3d\ue5fc\x3a\x2aconfig\x3d\ue5fc\x3a\x2adocker\x2dcompose\x2eyml\x3d\uf308\x3a\x2adockerfile\x3d\uf308\x3a\x2agradle\x3d\ue70e\x3a\x2agruntfile\x2ecoffee\x3d\ue611\x3a\x2agruntfile\x2ejs\x3d\ue611\x3a\x2agruntfile\x2els\x3d\ue611\x3a\x2agulpfile\x2ecoffee\x3d\ue610\x3a\x2agulpfile\x2ejs\x3d\ue610\x3a\x2agulpfile\x2els\x3d\ue610\x3a\x2ainclude\x3d\ue5fc\x3a\x2alib\x3d\uf121\x3a\x2alocalized\x3d\uf179\x3a\x2anode_modules\x3d\ue718\x3a\x2apackage\x2ejson\x3d\ue718\x3a\x2arubydoc\x3d\ue73b\x3a\x2atsconfig\x2ejson\x3d\ue628\x3a\x2ayarn\x2elock\x3d\ue718\x3adi\x3d\uf115\x3adt\x3d\uf115\x3aex\x3d\uf427\x3afi\x3d\uf40e\x3aln\x3d\uf481\x3aor\x3d\uf481\x3aow\x3d\uf115\x3ast\x3d\uf115\x3atw\x3d\uf115\x3a SETUVAR __fish_initialized:3400 SETUVAR _fisher_catppuccin_2F_fish_files:\x7e/\x2econfig/fish/themes/Catppuccin\x20Frappe\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Latte\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Macchiato\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Mocha\x2etheme +SETUVAR _fisher_jorgebucaran_2F_autopair_2E_fish_files:\x7e/\x2econfig/fish/functions/_autopair_backspace\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_left\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_right\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_same\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_tab\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/autopair\x2efish SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_list\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e\x7e/\x2econfig/fish/functions/nvm\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e\x7e/\x2econfig/fish/completions/nvm\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejorgebucaran/nvm\x2efish\x1ederekstavis/fish\x2dneovim\x1ecatppuccin/fish +SETUVAR _fisher_joshmedeski_2F_fish_2D_lf_2D_icons_files:\x7e/\x2econfig/fish/conf\x2ed/lf\x2dicons\x2efish +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejorgebucaran/nvm\x2efish\x1ederekstavis/fish\x2dneovim\x1ecatppuccin/fish\x1ejorgebucaran/autopair\x2efish\x1ejoshmedeski/fish\x2dlf\x2dicons SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR fish_color_autosuggestion:6e738d SETUVAR fish_color_cancel:ed8796 diff --git a/.config/fish/functions/_autopair_backspace.fish b/.config/fish/functions/_autopair_backspace.fish new file mode 100644 index 0000000..a43fa79 --- /dev/null +++ b/.config/fish/functions/_autopair_backspace.fish @@ -0,0 +1,9 @@ +function _autopair_backspace + set --local index (commandline --cursor) + set --local buffer (commandline) + + test $index -ge 1 && + contains -- (string sub --start=$index --length=2 -- "$buffer") $autopair_pairs && + commandline --function delete-char + commandline --function backward-delete-char +end diff --git a/.config/fish/functions/_autopair_insert_left.fish b/.config/fish/functions/_autopair_insert_left.fish new file mode 100644 index 0000000..f078e86 --- /dev/null +++ b/.config/fish/functions/_autopair_insert_left.fish @@ -0,0 +1,13 @@ +function _autopair_insert_left --argument-names left right + set --local buffer (commandline) + set --local before (commandline --cut-at-cursor) + + commandline --insert -- $left + + switch "$buffer" + case "$before"{," "\*,$autopair_right\*} + set --local index (commandline --cursor) + commandline --insert -- $right + commandline --cursor $index + end +end diff --git a/.config/fish/functions/_autopair_insert_right.fish b/.config/fish/functions/_autopair_insert_right.fish new file mode 100644 index 0000000..a0bd61c --- /dev/null +++ b/.config/fish/functions/_autopair_insert_right.fish @@ -0,0 +1,11 @@ +function _autopair_insert_right --argument-names key + set --local buffer (commandline) + set --local before (commandline --cut-at-cursor) + + switch "$buffer" + case "$before$key"\* + commandline --cursor (math (commandline --cursor) + 1) + case \* + commandline --insert -- $key + end +end diff --git a/.config/fish/functions/_autopair_insert_same.fish b/.config/fish/functions/_autopair_insert_same.fish new file mode 100644 index 0000000..27f971d --- /dev/null +++ b/.config/fish/functions/_autopair_insert_same.fish @@ -0,0 +1,20 @@ +function _autopair_insert_same --argument-names key + set --local buffer (commandline) + set --local index (commandline --cursor) + set --local next (string sub --start=(math $index + 1) --length=1 -- "$buffer") + + if test (math (count (string match --all --regex -- "$key" "$buffer")) % 2) = 0 + test $key = $next && commandline --cursor (math $index + 1) && return + + commandline --insert -- $key + + if test $index -lt 1 || + contains -- (string sub --start=$index --length=1 -- "$buffer") "" " " $autopair_left && + contains -- $next "" " " $autopair_right + commandline --insert -- $key + commandline --cursor (math $index + 1) + end + else + commandline --insert -- $key + end +end diff --git a/.config/fish/functions/_autopair_tab.fish b/.config/fish/functions/_autopair_tab.fish new file mode 100644 index 0000000..f2ab8eb --- /dev/null +++ b/.config/fish/functions/_autopair_tab.fish @@ -0,0 +1,7 @@ +function _autopair_tab + commandline --paging-mode && down-or-search && return + + string match --quiet --regex -- '\$[^\s]*"$' (commandline --current-token) && + commandline --function end-of-line --function backward-delete-char + commandline --function complete +end diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 2b43d53..ffe2026 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -130,7 +130,7 @@ bind = $mainMod SHIFT, S,exec, bin/w-screenrecord bind = $mainMod, C, killactive, -bind = $mainMod, M, exit, +bind = $mainMod, X, exit, bind = $mainMod, F, fullscreen, 2 bind = $mainMod, S, togglefloating, bind = $mainMod, P, pseudo, # dwindle @@ -145,9 +145,10 @@ binde= ,F3, exec, pactl set-sink-volume @DEFAULT_SINK@ +1% bind = $mainMod, b, exec, foot -e bluetuith bind = $mainMod, RETURN, exec, foot bind = $mainMod, N, exec, foot -e lf +bind = $mainMod, M, exec, foot -e cmus bind = $mainMod, d, exec, wofi --show drun -I -i -bind = ,Print,exec,makescreenshot - +bind = ,Print, exec, makescreenshot +bind = $mainMod, l, exec, lockscreen # not forget install xdg-desktop-portal 1.14.6 # Modify file /usr/share/xdg-desktop-portal/portals/{}.portal UserIn=sway;wlroots diff --git a/.config/hypr/scripts/kb_hypr b/.config/hypr/scripts/kb_hypr new file mode 100755 index 0000000..6f5d9f1 Binary files /dev/null and b/.config/hypr/scripts/kb_hypr differ diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 54ebf95..33aa31f 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -18,11 +18,12 @@ cmd edit-config ${{ cmd open &{{ case $(file --mime-type "$f" -bL) in - text/*|application/json) lf -remote "send $id \$$EDITOR \$fx";; + text/*|application/json) lf -remote "send $id \$$EDITOR \"$fx\"";; image/*) swayimg -f "$f";; audio/*) lf -remote "send $id \$mpv --audio-display=no \"$fx\" && clear";; video/*) mpv "$f";; application/pdf|application/epub) zathura "$f";; + *) xdg-open "$f";; esac }} @@ -55,12 +56,12 @@ cmd fzf_search ${{ cmd unarchive ${{ set -f case $f in - *.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar xjvf $f;; - *.tar.gz|*.tgz) tar xzvf $f;; - *.tar.xz|*.txz) tar xJvf $f;; - *.zip) unzip $f;; - *.rar) unrar x $f;; - *.7z) 7z x $f;; + *.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar xjvf "$f";; + *.tar.gz|*.tgz) tar xzvf "$f";; + *.tar.xz|*.txz) tar xJvf "$f";; + *.zip) unzip "$f";; + *.rar) unrar x "$f";; + *.7z) 7z x "$f";; esac }} @@ -88,7 +89,7 @@ cmd trash ${{ file=${files%%;*} if [[ "$(pwd)" == "/home/$USER/.local/share/Trash/files" ]]; then - rm -rf $file + rm -rf "$fx" else trash-put "$(basename "$file")" fi @@ -101,6 +102,24 @@ cmd trash ${{ done }} +# cmd trash ${{ +# files=$(printf "$fx" | tr '\n' ';') +# while [ "$files" ]; do +# file=${files%%;*} +# if [[ $PWD == "$HOME/.local/share/Trash/files" ]]; then +# rm -rf "$file" +# else +# trash-put "$(basename "$filename")" +# fi +# +# if [ "$files" = "$file" ]; then +# files='' +# else +# files="${files#*;}" +# fi +# done +# }} + # lfrc cmd restore-from-trash ${{ ids="$(echo -ne '\n' | \ @@ -122,10 +141,15 @@ map d map e map f map t +map u +map a + +map ua unarchive map . set hidden! map md push %mkdir +map gp jump-prev map y copy map p paste @@ -159,6 +183,7 @@ map gs cd ~/Pictures/screenshots map gv cd ~/Videos map gm cd ~/Music +map gA cd ~/Anime map gt cd ~/.local/share/Trash/files map tc %rm -rf ~/.local/share/Trash/files/* diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index fbe037a..6bcae01 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,8 +1,8 @@ local core = {"options", "globals", "keybinds", "autocmds", "plugins"} for _,source in ipairs(core) do - local ok, fault = pcall(require,'core.' .. source) - if not ok then - vim.notify("Failed to load " .. source .."\n\n" .. fault ) - end + local ok, fault = pcall(require,'core.' .. source) + if not ok then + vim.notify("Failed to load " .. source .."\n\n" .. fault ) + end end diff --git a/.config/nvim/lua/core/plugins.lua b/.config/nvim/lua/core/plugins.lua index 5afbb5b..e567bf2 100644 --- a/.config/nvim/lua/core/plugins.lua +++ b/.config/nvim/lua/core/plugins.lua @@ -141,37 +141,73 @@ require("lazy").setup({ preset = 'codicons', symbol_map = { - Text = "", - Method = "", - Function = "", + Text = "󰉿", + Method = "󰆧", + Function = "󰊕", Constructor = "", - Field = "ﰠ", - Variable = "", - Class = "ﴯ", + Field = "󰜢", + Variable = "󰀫", + Class = "󰠱", Interface = "", Module = "", - Property = "ﰠ", - Unit = "塞", - Value = "", + Property = "󰜢", + Unit = "󰑭", + Value = "󰎠", Enum = "", - Keyword = "", + Keyword = "󰌋", Snippet = "", - Color = "", - File = "", - Reference = "", - Folder = "", + Color = "󰏘", + File = "󰈙", + Reference = "󰈇", + Folder = "󰉋", EnumMember = "", - Constant = "", - Struct = "פּ", + Constant = "󰏿", + Struct = "󰙅", Event = "", - Operator = "", - TypeParameter = "" - } + Operator = "󰆕", + TypeParameter = "", + }, + + -- symbol_map = { + -- Text = "", + -- Method = "", + -- Function = "", + -- Constructor = "", + -- Field = "ﰠ", + -- Variable = "", + -- Class = "ﴯ", + -- Interface = "", + -- Module = "", + -- Property = "ﰠ", + -- Unit = "塞", + -- Value = "", + -- Enum = "", + -- Keyword = "", + -- Snippet = "", + -- Color = "", + -- File = "", + -- Reference = "", + -- Folder = "", + -- EnumMember = "", + -- Constant = "", + -- Struct = "פּ", + -- Event = "", + -- Operator = "", + -- TypeParameter = "" + -- } } end }, - {"folke/which-key.nvim", opts = {}, lazy = true}, + { + "folke/which-key.nvim", + opts = {}, lazy = true, + config = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + require("which-key").setup() + end + }, { "L3MON4D3/LuaSnip", @@ -199,18 +235,18 @@ require("lazy").setup({ end, }, - { - "ray-x/lsp_signature.nvim", - config = function() - local lsp_signature = require("lsp_signature") - - lsp_signature.setup{ - hint_enable = false, - verbose = true - } - - end - }, + -- { + -- "ray-x/lsp_signature.nvim", + -- config = function() + -- local lsp_signature = require("lsp_signature") + -- + -- lsp_signature.setup{ + -- hint_enable = false, + -- verbose = true + -- } + -- + -- end + -- }, -- Debug Adapter Protocol { diff --git a/.config/waybar/config b/.config/waybar/config index 012784a..f2a7734 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,14 +1,14 @@ { - // "layer": "top", // Waybar at top layer + "layer": "top", // Waybar at top layer "position": "top", "height": 39, "width": 1895, - "spacing": 10, + "spacing": 3, - "modules-left": ["hyprland/window","pulseaudio","bluetooth"], + "modules-left": ["hyprland/window", "pulseaudio","tray"], "modules-center": ["wlr/workspaces"], - "modules-right": ["custom/cmus", "custom/weather", "tray", "battery", "custom/language", "clock"], + "modules-right": ["custom/cmus", "custom/weather", "custom/language", "clock", "battery"], "wlr/workspaces": { "format": "{icon}", @@ -17,17 +17,34 @@ "on-click": "activate", "all-outputs": false, "format": "{icon}", + + // "format-icons": { + // "1": "", + // "2": "", + // "3": "", + // "4": "", + // "5": "", + // "6": "", + // "urgent": "", + // "focused": "", + // "default": "" + //} + "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - "5": "", - "6": "", - "urgent": "", - "focused": "", - "default": "" - } + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "", + "7": "", + "8": "", + "9": "", + "focused": " ", + "urgent": " ", + //"default": " ", + }, + "icon-size": 14 }, "sway/mode": { @@ -40,8 +57,7 @@ }, "clock": { - "format": "{:%I:%M %p}", - "format-alt": "{:%Y-%m-%d %I:%M %p}" + "format": "{:%a, %d/%m/%Y %I:%M %p}", }, "custom/cmus": { diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 79784a2..47fdd84 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -29,7 +29,7 @@ button { padding: 10px; background-color: @background; color: #d8dee8; - border-radius: 15px; + border-radius: 8px; } button:hover { @@ -37,7 +37,7 @@ button:hover { padding: 10px; background-color: @background; color: #d8dee8; - border-radius: 15px; + border-radius: 8px; } button:focus { @@ -45,20 +45,24 @@ button:focus { padding: 10px; background-color: @background; color: #d8dee8; - border-radius: 15px; + border-radius: 8px; } #workspaces { - margin: 0; + padding: 0 15px 0 15px; + margin: 5px 0 5px 0; + background-color: @background; + color: @white; + border-radius: 14px; + /* margin: 0; */ } #workspaces button { padding: 0 5px; margin: 5px; - background-color: @background; + /* background-color: ; */ color: #444b6a; - border-radius: 16px; } #workspaces button:hover { @@ -80,7 +84,7 @@ button:focus { margin: 5px 0 5px 0; background-color: @background; color: #d8dee8; - border-radius: 12px; + border-radius: 10px; } #tray > .passive { @@ -97,7 +101,7 @@ button:focus { margin: 5px 0 5px 0; background-color: @background; color: #b9f27c; - border-radius: 15px; + border-radius: 8px; } @@ -106,7 +110,7 @@ button:focus { margin: 5px 0 5px 0; background-color: @background; color: @white; - border-radius: 12px; + border-radius: 8px; } @@ -115,7 +119,7 @@ button:focus { margin: 5px 0 5px 0; background-color: @background; color: @white; - border-radius: 12px; + border-radius: 8px; } @@ -125,7 +129,7 @@ button:focus { margin: 5px 0 5px 0; background-color: @background; color: #d8dee8; - border-radius: 15px; + border-radius: 8px; } @keyframes blink { @@ -143,44 +147,28 @@ label:focus { background-color: @background; padding: 0 15px 0 15px; margin: 5px 0 5px 0; - border-radius: 12px; + border-radius: 8px; } -/* #keyboard-state { */ -/* background: #97e1ad; */ -/* color: #000000; */ -/* padding: 0 0px; */ -/* margin: 0 5px; */ -/* min-width: 16px; */ -/* } */ -/**/ -/* #keyboard-state > label { */ -/* padding: 0 0px; */ -/* } */ -/**/ -/* #keyboard-state > label.locked { */ -/* background: rgba(0, 0, 0, 0.2); */ -/* } */ - #pulseaudio { background-color: @background; padding: 0 15px 0 15px; margin: 5px 0 5px 0; - border-radius: 12px; + border-radius: 8px; } #bluetooth { background-color: @background; padding: 0 15px 0 15px; margin: 5px 0 5px 0; - border-radius: 12px; + border-radius: 8px; } #battery { padding: 0 15px 0 15px; margin: 5px 0 5px 0; - border-radius: 12px; + border-radius: 8px; color: @blue; background: @background; } diff --git a/Pictures/wallpapers/1920x1080-945579-waves-digital-art-artwork-minimalism-The-Great-Wave-off-Kanagawa.png b/Pictures/wallpapers/1920x1080-945579-waves-digital-art-artwork-minimalism-The-Great-Wave-off-Kanagawa.png new file mode 100644 index 0000000..6a92a12 Binary files /dev/null and b/Pictures/wallpapers/1920x1080-945579-waves-digital-art-artwork-minimalism-The-Great-Wave-off-Kanagawa.png differ diff --git a/Pictures/wallpapers/gruvbox/0c5vX9L.png b/Pictures/wallpapers/gruvbox/0c5vX9L.png new file mode 100644 index 0000000..3e2900b Binary files /dev/null and b/Pictures/wallpapers/gruvbox/0c5vX9L.png differ diff --git a/Pictures/wallpapers/gruvbox/cropped-1920-1080-851016.jpg b/Pictures/wallpapers/gruvbox/cropped-1920-1080-851016.jpg deleted file mode 100644 index cd2c179..0000000 Binary files a/Pictures/wallpapers/gruvbox/cropped-1920-1080-851016.jpg and /dev/null differ diff --git a/Pictures/wallpapers/wallhaven-zxyqyv_1920x1080.png b/Pictures/wallpapers/gruvbox/wallhaven-zxyqyv_1920x1080.png similarity index 100% rename from Pictures/wallpapers/wallhaven-zxyqyv_1920x1080.png rename to Pictures/wallpapers/gruvbox/wallhaven-zxyqyv_1920x1080.png diff --git a/Pictures/wallpapers/nature/wallhaven-r2mp6j_1920x1080.png b/Pictures/wallpapers/nature/wallhaven-r2mp6j_1920x1080.png deleted file mode 100644 index 869ef51..0000000 Binary files a/Pictures/wallpapers/nature/wallhaven-r2mp6j_1920x1080.png and /dev/null differ diff --git a/Pictures/wallpapers/nord/1045054.jpg b/Pictures/wallpapers/nord/1045054.jpg new file mode 100644 index 0000000..a6e2d07 Binary files /dev/null and b/Pictures/wallpapers/nord/1045054.jpg differ diff --git a/Pictures/wallpapers/nord/850990.png b/Pictures/wallpapers/nord/850990.png deleted file mode 100644 index 47abbab..0000000 Binary files a/Pictures/wallpapers/nord/850990.png and /dev/null differ diff --git a/Pictures/wallpapers/nord/851006.png b/Pictures/wallpapers/nord/851006.png deleted file mode 100644 index 985516a..0000000 Binary files a/Pictures/wallpapers/nord/851006.png and /dev/null differ diff --git a/Pictures/wallpapers/nord/855154.png b/Pictures/wallpapers/nord/855154.png new file mode 100644 index 0000000..b03b88a Binary files /dev/null and b/Pictures/wallpapers/nord/855154.png differ diff --git a/Pictures/wallpapers/nord/wallhaven-d5rrm3_1920x1080.png b/Pictures/wallpapers/nord/wallhaven-d5rrm3_1920x1080.png deleted file mode 100644 index 04b5cf0..0000000 Binary files a/Pictures/wallpapers/nord/wallhaven-d5rrm3_1920x1080.png and /dev/null differ diff --git a/Pictures/wallpapers/wallpaperflare.com_wallpaper.jpg b/Pictures/wallpapers/wallpaperflare.com_wallpaper.jpg new file mode 100644 index 0000000..71fe9fc Binary files /dev/null and b/Pictures/wallpapers/wallpaperflare.com_wallpaper.jpg differ diff --git a/README.md b/README.md index a45c928..827b7a1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ # TODO - [x] Neovim - - [ ] Migrate from packer to lazy + - [x] Migrate from packer to lazy - [ ] Debugger Protocol - [ ] Quickfix - - [ ] Code folding diff --git a/images/rice.png b/images/rice.png index 35298b5..4a226a1 100644 Binary files a/images/rice.png and b/images/rice.png differ