From b490adebcefc046c2d1b4fb5aae64e57e200dceb Mon Sep 17 00:00:00 2001 From: Yigit Colakoglu Date: Sat, 3 Apr 2021 18:39:15 +0300 Subject: [PATCH] Fixed Local/Share/Applications --- README.md | 6 ++++-- config/.gitignore | 1 - config/mimeapps.list | 2 ++ config/mpd/mpd.conf | 2 +- config/vim/after/ftplugin/tex.vim | 1 + config/vim/plugin/lightline-bufferline.vim | 1 + config/vim/plugin/vim-ripgrep.vim | 2 +- config/vim/vimrc | 4 ++++ local/bin/dmenu-edit | 6 +++--- local/bin/status-bar/date | 4 ++-- local/bin/status-bar/weather | 6 +++--- local/share/.gitignore | 1 + local/share/vim/.gitignore | 1 - 13 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 config/vim/after/ftplugin/tex.vim diff --git a/README.md b/README.md index b9f77092..0953aff4 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,11 @@ Have fun! Another copy of all of this is [here](https://git.yigitcolakoglu.com/y ## Installation Just run + ```sh git clone --recurse-submodules https://github.com/theFr1nge/dotfiles.git ~/.dotfiles && ~/.dotfiles/install.sh ``` + This will download everything you need. After that, I have a list of all the packages I have installed on my machine in the directory arch-setup/. If you have any problems regarding the setup, you should first check whether you have missing packages. After the clone process, it is pretty straightforward, you can run the `install.sh` script which creates necessary symlinks. @@ -38,6 +40,6 @@ You might want to edit your crontab and the ~/.config.env. * [X] Neomutt further config * [X] Dwmblocks entry for tracking last mailsync time -* Fix ISO4755 and externalpipe conflict -* [ ] Better documentation +* [X] Fix ISO4755 and externalpipe conflict +* [ ] Better documentation (Perhaps an auto-documentation tool written in python?) * [X] Dmenu for restarting certain processes like dwm, dwmblocks, dunst, mconnect diff --git a/config/.gitignore b/config/.gitignore index e31c826d..f2ee7775 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -6,7 +6,6 @@ !antibody !antibody/** !BetterDiscord -!BetterDiscord/** !calcurse !calcurse/hooks !dunst diff --git a/config/mimeapps.list b/config/mimeapps.list index 148e8b16..9db82a71 100644 --- a/config/mimeapps.list +++ b/config/mimeapps.list @@ -24,3 +24,5 @@ x-scheme-handler/mailto=neomutt.desktop message/rfc822=userapp-neomutt.desktop application/x-directory=lf.desktop +[Added Associations] +application/javascript=gvim.desktop;vim.desktop; diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index a91a125d..c94fcaf8 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -20,5 +20,5 @@ audio_output { } input_cache { - size "512 MB" + size "1 GB" } diff --git a/config/vim/after/ftplugin/tex.vim b/config/vim/after/ftplugin/tex.vim new file mode 100644 index 00000000..78c9d33b --- /dev/null +++ b/config/vim/after/ftplugin/tex.vim @@ -0,0 +1 @@ +setlocal wrap linebreak nolist diff --git a/config/vim/plugin/lightline-bufferline.vim b/config/vim/plugin/lightline-bufferline.vim index 34f244b6..6f9b250a 100644 --- a/config/vim/plugin/lightline-bufferline.vim +++ b/config/vim/plugin/lightline-bufferline.vim @@ -1,4 +1,5 @@ set showtabline=2 +set guioptions-=e let g:lightline#bufferline#show_number = 2 let g:lightline#bufferline#shorten_path = 0 diff --git a/config/vim/plugin/vim-ripgrep.vim b/config/vim/plugin/vim-ripgrep.vim index 5254c103..bab75178 100644 --- a/config/vim/plugin/vim-ripgrep.vim +++ b/config/vim/plugin/vim-ripgrep.vim @@ -1,3 +1,3 @@ " bind K to search word under cursor -nnoremap K :Rg +nnoremap ,K :Rg cnoreabbrev Ag ((getcmdtype() is# ':' && getcmdline() is# 'Ag')?('Rg'):('Ag')) " Map Ag to Rg as well diff --git a/config/vim/vimrc b/config/vim/vimrc index 0dfae9ee..d0bf9fd3 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -33,6 +33,10 @@ map gs :Gstatus " Recently edited files map h :History +" map gj and gk to j and k for seamless movement in tex +map j gj +map k gk + " CtrlP use FZF (faster!) nnoremap :Files nnoremap b :Buffers diff --git a/local/bin/dmenu-edit b/local/bin/dmenu-edit index 8dfbb1b4..b58b0cd4 100755 --- a/local/bin/dmenu-edit +++ b/local/bin/dmenu-edit @@ -13,10 +13,10 @@ selection=$(echo -e "$items\n$scripts\n$suckless" | $DMENU) if [ ! "$selection" = "" ]; then if [ $(echo $selection | cut -d"/" -f 1) = "scripts" ]; then - st -c vim -n vim -e vim "$(echo $selection | sed -n "s|scripts/|$HOME/.dotfiles/local/bin/|p")" + st -c vim -n vim -e $EDITOR "$(echo $selection | sed -n "s|scripts/|$HOME/.dotfiles/local/bin/|p")" elif [ $(echo $selection | cut -d"/" -f 1) = "suckless" ]; then - st -c vim -n vim -e vim "$(echo $selection | sed -n "s|suckless/|$HOME/.dotfiles/suckless/|p")" + st -c vim -n vim -e $EDITOR "$(echo $selection | sed -n "s|suckless/|$HOME/.dotfiles/suckless/|p")" else - st -c vim -n vim -e vim "$(echo $selection | sed -n "s|config/|$HOME/.dotfiles/config/|p")" + st -c vim -n vim -e $EDITOR "$(echo $selection | sed -n "s|config/|$HOME/.dotfiles/config/|p")" fi fi diff --git a/local/bin/status-bar/date b/local/bin/status-bar/date index 3f359cde..ed10f41a 100755 --- a/local/bin/status-bar/date +++ b/local/bin/status-bar/date @@ -22,7 +22,7 @@ if [ ! "$next" = "" ]; then name=$(echo "$next" | cut -d ' ' -f 5- -) time_left=$(date --date="$(echo "$next" | cut -d '[' -f2 | cut -d ']' -f1 )" "+%k%M") - if [ "$time_left" -lt 30 ]; then + if [ "$time_left" -lt 7 ]; then if [ ! -f "$XDG_CACHE_HOME/calcurse" ];then touch "$XDG_CACHE_HOME/calcurse" fi @@ -30,7 +30,7 @@ if [ ! "$next" = "" ]; then if [ "$(grep "$name" "$XDG_CACHE_HOME/calcurse")" = "" ]; then time=$(calcurse -a | grep -E "\s*$name\$" -B 1 | head -n 1 | cut -c4-8) echo "$name" > "$XDG_CACHE_HOME/calcurse" - canberra-gtk-play -i message -V 30 + canberra-gtk-play -i message -V 20 dunstify -a " Event approaching" "[$time] $name" fi fi diff --git a/local/bin/status-bar/weather b/local/bin/status-bar/weather index fe7d1c7a..2d0f0158 100755 --- a/local/bin/status-bar/weather +++ b/local/bin/status-bar/weather @@ -67,11 +67,11 @@ showweather() { data=$(echo -ne $(echo $data | cut -d' ' -f 1-4)" ${WCODES[$(echo $data | cut -d' ' -f 5)]}") echo $data | awk -F' ' '{ if ($4 > 30) - print "^c#ffffff^ ^d^" $4 "kh / "$5 " ^d^ " $1 "°C" + print "^c#ffffff^ ^d^" $4 "kh "$5 " ^d^ " $1 "°C" else if ($2 < $3) - print "^c#ffffff^ ^d^" $3 "% / "$5 " ^d^ " $1 "°C" + print "^c#ffffff^ ^d^" $3 "% "$5 " ^d^ " $1 "°C" else - print "^c#81a1c1^ ^d^" $2 "% / " $5 " ^d^ " $1 "°C"}' + print "^c#81a1c1^ ^d^" $2 "% " $5 " ^d^ " $1 "°C"}' } case $BLOCK_BUTTON in diff --git a/local/share/.gitignore b/local/share/.gitignore index a9faedbc..4bd065ae 100644 --- a/local/share/.gitignore +++ b/local/share/.gitignore @@ -3,6 +3,7 @@ !fonts !icons !themes +!applications !vim !vim/** diff --git a/local/share/vim/.gitignore b/local/share/vim/.gitignore index 271c7287..ac0ffad4 100644 --- a/local/share/vim/.gitignore +++ b/local/share/vim/.gitignore @@ -1,6 +1,5 @@ # Folder Created By vim-plug plugged -after undo view spell