From 2b56aa538fbfcb7caa4d7d09817b9d9dd3b61be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?= Date: Tue, 30 Mar 2021 22:11:31 +0300 Subject: [PATCH] lf configuration done --- config/lf/lfrc | 183 +++++++++++++--------------------- config/ncmpcpp/bindings | 18 +--- config/ncmpcpp/config | 110 +++++++++++++++----- config/vdirsyncer/config | 2 +- local/applications/lf.desktop | 9 ++ local/bin/lf-ueberzug | 31 +++++- local/bin/pacontrol.sh | 15 ++- local/bin/status-bar/date | 2 +- local/bin/status-bar/mail | 3 +- local/bin/status-bar/mpc | 19 ++++ profile | 1 + root/kdialog | 6 +- suckless/dwm/config.h | 10 +- suckless/dwm/keybind.h | 6 +- suckless/dwm/rules.h | 5 +- suckless/dwmblocks/config.h | 5 +- 16 files changed, 251 insertions(+), 174 deletions(-) create mode 100644 local/applications/lf.desktop create mode 100755 local/bin/status-bar/mpc diff --git a/config/lf/lfrc b/config/lf/lfrc index 3349ff95..b6d542fb 100644 --- a/config/lf/lfrc +++ b/config/lf/lfrc @@ -9,9 +9,24 @@ set ignorecase true # Custom Functions cmd open ${{ - case $(file --mime-type "$f" -bL) in - text/*|application/json) $EDITOR "$f";; - *) xdg-open "$f" ;; + echo "$fx" > /tmp/b + case $fx in + *.py|*.java|*.json|*.h|*.c|*.cpp|*.js) $EDITOR "$f";; + *.tar.bz|*.tar.bz2|*.tbz|*.tbz2|*.tar.gz|*.tgz|*.tar.xz|*.txz|*.zip|*.rar|*.iso) + mntdir="$f-archivemount" + echo $mntdir > /tmp/a + [ ! -d "$mntdir" ] && { + mkdir "$mntdir" + archivemount "$f" "$mntdir" + echo "$mntdir" >> "/tmp/__lf_archivemount_$id" + } + lf -remote "send $id cd \"$mntdir\"" + lf -remote "send $id reload" + ;; + *) + for f in $fx; do + $OPENER $f > /dev/null 2> /dev/null & + done;; esac }} @@ -40,13 +55,21 @@ cmd chmod ${{ lf -remote 'send reload' }} -cmd sudomkfile ${{ - printf "File Name: " - read ans - sudo $EDITOR $ans +cmd trash %trash-put $fx + +cmd setwallpaper ${{ + echo "$fx" > /tmp/c + echo convert "$fx" "$HOME/.local/backgrounds/wall.jpg" > /tmp/d + convert "$fx" "$HOME/.local/backgrounds/wall.jpg" + feh --bg-fill "$HOME/.local/backgrounds/wall.jpg" }} -cmd setwallpaper %cp "$f" ~/.dotfiles/backgrounds/wall.png && xwallpaper --zoom "$f" +cmd git_branch ${{ + git branch | fzf | xargs git checkout + pwd_shell=$(pwd) + lf -remote "send $id updir" + lf -remote "send $id cd \"$pwd_shell\"" +}} cmd fzf_jump ${{ res="$(find . -maxdepth 3 | fzf --reverse --header='Jump to location')" @@ -58,28 +81,29 @@ cmd fzf_jump ${{ lf -remote "send $id $cmd \"$res\"" }} -cmd broot_jump ${{ - f=$(mktemp) - res="$(broot --outcmd $f && cat $f | sed 's/cd //')" - rm -f "$f" - if [ -f "$res" ]; then - cmd="select" - elif [ -d "$res" ]; then - cmd="cd" - fi - lf -remote "send $id $cmd \"$res\"" +cmd cd_jump ${{ + printf "Keyword: " + read ans + lf -remote "send $id cd $ans" }} -cmd open_config ${{ - $EDITOR $(bookmenu -b ~/.config/bookmenu/configs -f fzf -o) +cmd on-cd &{{ + # display git repository status in your prompt + source /usr/share/git/completion/git-prompt.sh + GIT_PS1_SHOWDIRTYSTATE=auto + GIT_PS1_SHOWSTASHSTATE=auto + GIT_PS1_SHOWUNTRACKEDFILES=auto + GIT_PS1_SHOWUPSTREAM=auto + GIT_PS1_COMPRESSSPARSESTATE=auto + git=$(__git_ps1 " [GIT BRANCH:> %s]") || true + fmt="\033[32;1m%u@%h\033[0m:\033[34;1m%w\033[0m\033[33;1m$git\033[0m" + lf -remote "send $id set promptfmt \"$fmt\"" }} -cmd dragon %dragon-drag-and-drop -a -x $fx -cmd dragon-stay %dragon-drag-and-drop -a $fx -cmd dragon-individual %dragon-drag-and-drop $fx -cmd cpdragon %cpdragon -cmd mvdragon %mvdragon -cmd dlfile %dlfile +cmd open ${{ + case "$f" in + esac +}} # Archive bindings cmd unarchive ${{ @@ -101,14 +125,9 @@ cmd tarbz2 %tar cjvf "$f.tar.bz2" "$f" cmd trash ${{ files=$(printf "$fx" | tr '\n' ';') while [ "$files" ]; do - # extract the substring from start of string up to delimiter. - # this is the first "element" of the string. file=${files%%;*} trash-put "$(basename "$file")" - # if there's only one element left, set `files` to an empty string. - # this causes us to exit this `while` loop. - # else, we delete the first "element" of the string from files, and move onto the next. if [ "$files" = "$file" ]; then files='' else @@ -118,6 +137,7 @@ cmd trash ${{ }} cmd clear_trash %trash-empty +cmd trash %trash-put $fx cmd restore_trash ${{ trash-restore @@ -125,8 +145,7 @@ cmd restore_trash ${{ cmd stripspace %stripspace "$f" -# Bindings -# Remove some defaults +# Old keybinds cleanup map m map o map n @@ -138,8 +157,8 @@ map e map f # File Openers -map ee $$EDITOR "$f" -map u $view "$f" +map e $$EDITOR "$f" +map u xdg-open "$f" # Archive Mappings map az zip @@ -149,34 +168,21 @@ map ab targz map au unarchive # Trash Mappings -map dd trash +map tt trash map tc clear_trash map tr restore_trash -# Broot Mapping -map f broot_jump - -# Dragon Mapping -map dr dragon -map ds dragon-stay -map di dragon-individual -map dm mvdragon -map dc cpdragon -map dl dlfile - map ss stripspace # Basic Functions map . set hidden! -map DD delete +map D delete map p paste -map x cut +map dd cut map y copy map open map mf mkfile -map mr sudomkfile map md mkdir -map ms $mkscript map ch chmod map bg setwallpaper map o open_config @@ -188,69 +194,20 @@ map R reload map C clear map U unselect -# Movement -map gtr cd ~/.local/share/Trash/files -map gus cd /run/media/brodie - -map gv. cd ~/videos -map gva cd ~/videos/anime - -map gy. cd ~/videos/youtube -map gyt cd ~/videos/youtube/ToUpload -map gyu cd ~/videos/youtube/Uploaded -map gya cd ~/videos/youtube/asset -map go. cd ~/videos/podcast -map got cd ~/videos/podcast/ToUpload -map gou cd ~/videos/podcast/Uploaded - -map gp. cd ~/pictures -map gpm cd ~/pictures/mpvscreenshots -map gpa cd ~/pictures/Anime -map gps cd ~/pictures/screenshots +map cd cd_jump +map cf fzf_jump -map gw. cd ~/pictures/Wallpapers -map gww cd ~/pictures/Wallpapers/Wallpapers -map gwm cd ~/pictures/Wallpapers/MobileWallpapers - -map gt. cd ~/documents/Textbooks -map gt1 cd ~/documents/Textbooks/1stYear -map gt2 cd ~/documents/Textbooks/2ndYear -map gt3 cd ~/documents/Textbooks/3rdYear -map gu3 cd ~/documents/Uni/3rdYear -map gd cd ~/documents - -map gD cd ~/downloads -map ge cd ~/desktop - -map gs. cd ~/scripts -map gsl cd ~/scripts/lf -map gsa cd ~/scripts/alsa -map gsi cd ~/scripts/i3 -map gse cd ~/scripts/lemonbar -map gsp cd ~/scripts/polybar -map gsb cd ~/scripts/bspwm -map gsu cd ~/scripts/pulse -map gdt cd ~/scripts/transmission - -map gr. cd ~/repos -map grb cd ~/repos/bookmenu -map grf cd ~/repos/cleanfullscreen -map grm cd ~/repos/dmenu -map grd cd ~/repos/dotfiles -map gri cd ~/repos/init -map grk cd ~/repos/kanban-board -map grl cd ~/repos/lbryurlconvert -map grP cd ~/repos/PerlProjects -map grr cd ~/repos/reading-list -map grs cd ~/repos/st -map grw cd ~/repos/website +# Git Mappings +map gib :git_branch +map gip ${{clear; git pull --rebase || true; echo "press ENTER"; read ENTER}} +map gis ${{clear; git status; echo "press ENTER"; read ENTER}} +map gil ${{clear; git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit}} +# Movement +map ~ cd ~ +map g/ cd / +map gm cd /media +map gd cd ~/.dotfiles map gc cd ~/.config -map gC cd ~/.local/share/cell -map gl cd ~/.local -map gE cd /etc -map gU. cd /usr -map gUs cd /usr/share - -map \;j cd ~ +map gs cd ~/.local/share/bin diff --git a/config/ncmpcpp/bindings b/config/ncmpcpp/bindings index 645e41fe..aaef890e 100644 --- a/config/ncmpcpp/bindings +++ b/config/ncmpcpp/bindings @@ -177,11 +177,6 @@ #def_key "backspace" # replay_song # -#def_key "f" -# seek_forward -# -#def_key "b" -# seek_backward # #def_key "r" # toggle_repeat @@ -402,11 +397,6 @@ #def_key "f" # find_item_forward -def_key "+" - show_clock -def_key "=" - volume_up - def_key "j" scroll_down def_key "k" @@ -469,11 +459,11 @@ def_key "s" reset_search_engine def_key "s" show_search_engine -def_key "f" - show_browser -def_key "f" - change_browse_mode def_key "x" delete_playlist_items def_key "P" show_playlist +def_key "f" + seek_forward +def_key "b" + seek_backward diff --git a/config/ncmpcpp/config b/config/ncmpcpp/config index 36324960..a3db764d 100644 --- a/config/ncmpcpp/config +++ b/config/ncmpcpp/config @@ -3,30 +3,88 @@ ncmpcpp_directory = "~/.config/ncmpcpp" lyrics_directory = "~/.local/share/lyrics" mpd_music_dir = "~/Music" -message_delay_time = "1" + +autocenter_mode = "yes" +follow_now_playing_lyrics = "yes" +ignore_leading_the = "yes" +ignore_diacritics = "yes" +default_place_to_search_in = "database" + +## Display Modes ## +playlist_editor_display_mode = "columns" +search_engine_display_mode = "columns" +browser_display_mode = "columns" +playlist_display_mode = "columns" + +## General Colors ## +colors_enabled = "yes" +main_window_color = "white" +header_window_color = "cyan" +volume_color = "green" +statusbar_color = "white" +progressbar_color = "cyan" +progressbar_elapsed_color = "white" + +## Song List ## +song_columns_list_format = "(10)[blue]{l} (30)[green]{t} (30)[magenta]{a} (30)[yellow]{b}" +song_list_format = "{$7%a - $9}{$5%t$9}|{$5%f$9}$R{$6%b $9}{$3%l$9}" + +## Current Item ## +current_item_prefix = "$(blue)$r" +current_item_suffix = "$/r$(end)" +current_item_inactive_column_prefix = "$(cyan)$r" + +## Alternative Interface ## +user_interface = "alternative" +alternative_header_first_line_format = "$0$aqqu$/a {$6%a$9 - }{$3%t$9}|{$3%f$9} $0$atqq$/a$9" +alternative_header_second_line_format = "{{$4%b$9}{ [$8%y$9]}}|{$4%D$9}" + +## Classic Interface ## +song_status_format = " $6%a $7⟫⟫ $3%t $7⟫⟫ $4%b " + +## Visualizer ## visualizer_type = "spectrum" -song_list_format = {$4%a - }{%t}|{$8%f$9}$R{$3(%l)$9} -song_status_format = $b{{$8"%t"}} $3by {$4%a{ $3in $7%b{ (%y)}} $3}|{$8%f} -song_library_format = {%n - }{%t}|{%f} -alternative_header_first_line_format = $b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b -alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D} -current_item_prefix = $(cyan)$r$b -current_item_suffix = $/r$(end)$/b -current_item_inactive_column_prefix = $(magenta)$r -current_item_inactive_column_suffix = $/r$(end) -playlist_display_mode = columns -browser_display_mode = columns -progressbar_look = -> -media_library_primary_tag = album_artist -media_library_albums_split_by_date = no -startup_screen = "media_library" -display_volume_level = no -ignore_leading_the = yes -external_editor = nvim -use_console_editor = yes -empty_tag_color = magenta -main_window_color = white -progressbar_color = black:b -progressbar_elapsed_color = blue:b -statusbar_color = red -statusbar_time_color = cyan:b +visualizer_in_stereo = "yes" +visualizer_look = "◆▋" + +startup_screen = visualizer +startup_slave_screen = playlist +startup_slave_screen_focus = yes +locked_screen_width_part = 30 + +## Navigation ## +cyclic_scrolling = "yes" +header_text_scrolling = "yes" +jump_to_now_playing_song_at_start = "yes" +lines_scrolled = "2" + +## Other ## +system_encoding = "utf-8" +regular_expressions = "extended" + +## Selected tracks ## +selected_item_prefix = "* " +discard_colors_if_item_is_selected = "yes" + +## Seeking ## +incremental_seeking = "yes" +seek_time = "1" + +## Visibility ## +header_visibility = "yes" +statusbar_visibility = "yes" +titles_visibility = "yes" + +## Progress Bar ## +progressbar_look = "=>-" + +## Now Playing ## +now_playing_prefix = "> " +centered_cursor = "yes" + +# Misc +display_bitrate = "yes" +enable_window_title = "yes" +empty_tag_marker = "" + +execute_on_song_change="kill -63 $(pidof dwmblocks)" diff --git a/config/vdirsyncer/config b/config/vdirsyncer/config index f199a266..88fc75ec 100644 --- a/config/vdirsyncer/config +++ b/config/vdirsyncer/config @@ -8,7 +8,7 @@ collections = ["from a", "from b"] [storage nx_contacts_local] type = "filesystem" -path = "~/.card/contacts" +path = "~/.local/share/card/contacts" fileext = ".vcf" [storage nx_contacts_remote] diff --git a/local/applications/lf.desktop b/local/applications/lf.desktop new file mode 100644 index 00000000..22aa6d2f --- /dev/null +++ b/local/applications/lf.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=ranger +Comment=Launches the lf file manager +Icon=utilities-terminal +Terminal=false +Exec=st -c lf -e lf +Categories=ConsoleOnly;System;FileTools;FileManager +MimeType=inode/directory;inode/mount-point;x-scheme-handler/ssh;x-scheme-handler/smb;x-scheme-handler/nfs;x-scheme-handler/ftp;application/x-directory; diff --git a/local/bin/lf-ueberzug b/local/bin/lf-ueberzug index 950aabb3..42ae958b 100755 --- a/local/bin/lf-ueberzug +++ b/local/bin/lf-ueberzug @@ -1,5 +1,4 @@ #!/usr/bin/env sh -# TODO: Remove LF_UebERZUG_FIFO and use LF_UEBERZUG_TEMPDIR/fifo cleanup() { rm -r "$LF_UEBERZUG_TEMPDIR" 2>/dev/null @@ -13,5 +12,33 @@ export LF_UEBERZUG_FIFO="$LF_UEBERZUG_TEMPDIR/fifo" mkfifo "$LF_UEBERZUG_FIFO" tail -f "$LF_UEBERZUG_FIFO" | ueberzug layer --silent & ueberzugpid=$! -lf $@ + +last_dir=$(cat /tmp/lf-last-dir) + + +fid="$(mktemp)" + +prev=$(pwd) +cd $last_dir +lf -command '$printf $id > '"$fid"'' -last-dir-path=/tmp/lf-last-dir "$@" +cd $prev +id="$(cat "$fid")" +archivemount_dir="/tmp/__lf_archivemount_$id" +if [ -f "$archivemount_dir" ]; then + cat "$archivemount_dir" | \ + while read -r line; do + sudo umount "$line" + rmdir "$line" + done + rm -f "$archivemount_dir" +fi +if [ -f "$tmp" ]; then + dir="$(cat "$tmp")" + rm -f "$tmp" + if [ -d "$dir" ]; then + if [ "$dir" != "$(pwd)" ]; then + cd "$dir" + fi + fi +fi cleanup diff --git a/local/bin/pacontrol.sh b/local/bin/pacontrol.sh index 03aba72e..e48b7ada 100755 --- a/local/bin/pacontrol.sh +++ b/local/bin/pacontrol.sh @@ -35,8 +35,13 @@ vol_interval=5 sinks=$(pactl list short sinks | cut -c 1) latest_sink=${sinks[*]: -1} -NOW=$(pactl list sinks | grep '^[[:space:]]Volume:' | head -n $latest_sink | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' ) -MUTE=$(pactl list sinks | grep '^[[:space:]]Mute:'| head -n $latest_sink | tail -n 1 | awk -F ":" '{print $2}'| xargs) +SINK=$(pactl list short sinks | grep -n RUNNING | cut -d":" -f1) +if [ "$SINK" = "" ]; then + SINK=1 +fi + +NOW=$( pactl list sinks | grep '^[[:space:]]Volume:' | head -n $SINK | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' ) +MUTE=$(pactl list sinks | grep '^[[:space:]]Mute:'| head -n $SINK | tail -n 1 | awk -F ":" '{print $2}'| xargs) case $1 in "up") @@ -61,8 +66,10 @@ case $1 in ;; *) usage ;; esac -NOW=$(pactl list sinks | grep '^[[:space:]]Volume:' | head -n $latest_sink | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' ) -MUTE=$(pactl list sinks | grep '^[[:space:]]Mute:'| head -n $latest_sink | tail -n 1 | awk -F ":" '{print $2}'| xargs) + + +NOW=$( pactl list sinks | grep '^[[:space:]]Volume:' | head -n $SINK | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' ) +MUTE=$(pactl list sinks | grep '^[[:space:]]Mute:'| head -n $SINK | tail -n 1 | awk -F ":" '{print $2}'| xargs) kill -48 $(pidof dwmblocks) send_notification $NOW $MUTE diff --git a/local/bin/status-bar/date b/local/bin/status-bar/date index faae4400..a8b1a380 100755 --- a/local/bin/status-bar/date +++ b/local/bin/status-bar/date @@ -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 + canberra-gtk-play -i message -V 30 dunstify -a " Event approaching" "[$time] $name" fi fi diff --git a/local/bin/status-bar/mail b/local/bin/status-bar/mail index 13ccb09d..df18f62f 100755 --- a/local/bin/status-bar/mail +++ b/local/bin/status-bar/mail @@ -3,7 +3,8 @@ mcount=$(cat ~/.cache/mcount) msync=$(cat ~/.cache/msync) -echo -n "^c#a3be8c^ ^d^ $msync ^c#81a1c1^ ^d^ $mcount" +#echo -n "^c#a3be8c^ ^d^ $msync ^c#81a1c1^ ^d^ $mcount" (Takes more space) +echo -n "^c#81a1c1^ ^d^ $mcount" case $BLOCK_BUTTON in 1) setsid -f st -c center -n center -e neomutt;; diff --git a/local/bin/status-bar/mpc b/local/bin/status-bar/mpc new file mode 100755 index 00000000..f21ca483 --- /dev/null +++ b/local/bin/status-bar/mpc @@ -0,0 +1,19 @@ +#!/bin/sh + +online=$(mpc 2> /dev/null) +title=$(mpc -f "%title%" 2> /dev/null | head -n 1) +artist=$(mpc -f "%artist%" 2> /dev/null | head -n 1) + +if [ ! "$online" = "" ]; then + if [ "$(echo "$online" | wc -l)" -le 1 ]; then + echo -n "^c#a48ead^ ^d^" + else + echo -n "^c#a48ead^ ^d^ ${title:0:30} - ${artist:0:30}" + fi +else + echo -n "^c#a48ead^ﳌ ^d^" +fi +case $BLOCK_BUTTON in + 1) setsid -f st -c htop -n htop -e htop;; +esac + diff --git a/profile b/profile index 636f627b..79d92df2 100755 --- a/profile +++ b/profile @@ -10,6 +10,7 @@ export TMUX_PLUGIN_MANAGER_PATH=~/.tmux/plugins export BORG_KEYS_DIR=~/.keys/borg export BROWSER="/home/yigit/.local/bin/brave-start" export EDITOR=vim +export OPENER=xdg-open export ANDROID_HOME=/home/yigit/Android export DEFAULT_RECIPIENT="yigitcolakoglu@hotmail.com" diff --git a/root/kdialog b/root/kdialog index b6e2da0e..d2d8e621 100755 --- a/root/kdialog +++ b/root/kdialog @@ -19,9 +19,9 @@ done; path=$( echo ${filename%/*} ) file=$( echo ${filename##/*/} ) -rm /tmp/ranger-chrome-choosed -st -c ranger -n ranger -e ranger --choosefiles=/tmp/ranger-chrome-choosed -selected=$(cat /tmp/ranger-chrome-choosed 2> /dev/null) +rm /tmp/lf-chrome-choosed +st -c lf -n lf -e $HOME/.local/share/bin/lf-ueberzug --selection-path=/tmp/lf-chrome-choosed +selected=$(cat /tmp/lf-chrome-choosed 2> /dev/null) if [ ! $? = 0 ] then exit 1 diff --git a/suckless/dwm/config.h b/suckless/dwm/config.h index 52b6f47b..a4b5f456 100644 --- a/suckless/dwm/config.h +++ b/suckless/dwm/config.h @@ -7,7 +7,7 @@ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows sel static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ static int showsystray = 1; /* 0 means no systray */ -static const int tag_padding = 0; +static const int tag_padding = 0; static const char *layoutmenu_cmd = "/home/yigit/.scripts/layoutmenu.sh"; static const char autostartblocksh[] = "autostart_blocking.sh"; static const char autostartsh[] = "autostart.sh"; @@ -34,7 +34,7 @@ static char *tagicons[][NUMTAGS] = { [DEFAULT_TAGS] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, [ALTERNATIVE_TAGS] = { "A", "B", "C", "D", "E", "F", "G", "H", "I" }, }; - + /* layout(s) */ static const float mfact = 0.5; /* factor of master area size [0.05..0.95] */ static const int nmaster = 1; /* number of clients in master area */ @@ -43,7 +43,7 @@ static const int resizehints = 0; /* 1 means respect size hints in tiled resi static const Layout layouts[] = { /* symbol arrange function */ { "鉶", tile }, /* first entry is default */ - { "", dwindle }, + { "", dwindle }, { "ﱖ", grid }, { "", centeredmaster }, { "", centeredfloatingmaster }, @@ -55,11 +55,15 @@ static const Layout layouts[] = { const char *spcmd1[] = {"st", "-c", "scratchpad", "-n", "spterm", "-g", "120x34", NULL }; const char *spcmd2[] = {"feh", "--title", "scratchpad", "--class", "spfeh", "-g","900x300+500+350", "/home/yigit/Pictures/us_keyboard.png", NULL}; const char *spcmd3[] = {"st", "-c", "scratchpad", "-n", "spmutt", "-g", "180x51", "-e", "neomutt", NULL }; +static const char *spcmd4[] = { "/usr/local/bin/st", "-g", "140x45", "-c", "spfile", "-n", "spfile", "-e", "/home/yigit/.local/share/bin/lf-ueberzug", NULL }; +static const char *spcmd5[] = { "/usr/local/bin/st", "-g", "140x45", "-c", "spmusic", "-n", "spmusic", "-e", "ncmpcpp", NULL }; static Sp scratchpads[] = { {"spterm", spcmd1}, {"spfeh", spcmd2}, {"spmutt", spcmd3}, + {"spfile", spcmd4}, + {"spmusic", spcmd5}, }; static const BarRule barrules[] = { diff --git a/suckless/dwm/keybind.h b/suckless/dwm/keybind.h index f8a10cbe..5f8888dc 100644 --- a/suckless/dwm/keybind.h +++ b/suckless/dwm/keybind.h @@ -15,7 +15,6 @@ static char dmenumon[2] = "0"; static const char *dmenucmd[] = { "/home/yigit/.local/share/bin/dmenu_run_history", "-m", dmenumon, "-z", "1900", "-x", "10", "-y", "10"}; static const char *termcmd[] = { "/usr/local/bin/st", NULL }; static const char *tmuxcmd[] = { "/usr/local/bin/st","-e", "/home/yigit/.local/share/bin/st_tmux", NULL }; -static const char *rangercmd[] = { "/usr/local/bin/st","-c","ranger","-n","ranger","-e", "ranger", NULL }; static const char *upvol[] = { "/home/yigit/.local/share/bin/pacontrol.sh", "up", NULL }; static const char *downvol[] = { "/home/yigit/.local/share/bin/pacontrol.sh", "down", NULL }; static const char *mutevol[] = { "/home/yigit/.local/share/bin/pacontrol.sh", "toggle-mute", NULL }; @@ -69,7 +68,6 @@ static Key keys[] = { { MODKEY, XK_p, spawn, {.v = bwmenu } }, { MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = tmuxcmd } }, - { MODKEY|ShiftMask, XK_f, spawn, {.v = rangercmd} }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY|ShiftMask, XK_i, spawn, {.v = screensaver} }, @@ -144,8 +142,10 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_u, spawn, {.v = udevil_umount} }, { MODKEY, XK_y, spawn, {.v = youtube} }, { MODKEY, XK_s, togglescratch, {.ui = 0 } }, - { MODKEY|ShiftMask, XK_s, togglescratch, {.ui = 1 } }, + { MODKEY|ShiftMask, XK_s, togglescratch, {.ui = 1 } }, { MODKEY, XK_m, togglescratch, {.ui = 2 } }, + { MODKEY|ShiftMask, XK_f, togglescratch, {.ui = 3} }, + { MODKEY, XK_n, togglescratch, {.ui = 4} }, /* FloatPos Patch Keybinds */ { Mod3Mask, XK_u, floatpos, {.v = "-26x -26y" } }, // ↖ { Mod3Mask, XK_i, floatpos, {.v = " 0x -26y" } }, // ↑ diff --git a/suckless/dwm/rules.h b/suckless/dwm/rules.h index 7607f552..1154202c 100644 --- a/suckless/dwm/rules.h +++ b/suckless/dwm/rules.h @@ -25,9 +25,12 @@ static const Rule rules[] = { RULE(.class = "Spotify", .tags = 1 << 9) RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) RULE(.class = "spfeh", .tags = SPTAG(1), .isfloating = 1) - /* Terminal Window Rules */ RULE(.instance = "spmutt", .tags = SPTAG(2), .isfloating = 1) + RULE(.instance = "spfile", .tags = SPTAG(3), .isfloating = 1) + RULE(.instance = "spmusic", .tags = SPTAG(4), .isfloating = 1) + /* Terminal Window Rules */ RULE(.class = "ranger", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") + RULE(.class = "lf", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") RULE(.class = "vim", 0, .isfloating = 1, .floatpos="50% 50% 1000W 700H") RULE(.class = "stpulse", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") RULE(.class = "mpv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") diff --git a/suckless/dwmblocks/config.h b/suckless/dwmblocks/config.h index 0ecb1863..f195d63d 100644 --- a/suckless/dwmblocks/config.h +++ b/suckless/dwmblocks/config.h @@ -7,10 +7,11 @@ static Block blocks[] = { { "", PATH("dunst"), 120, 18}, { "", PATH("mail"), 120, 23}, { "", PATH("keyboard"), 120, 24}, + { "", PATH("mpc"), 240, 29}, { "", PATH("bluetooth"), 120, 26}, { "", PATH("mconnect"), 120, 20}, - { "", PATH("todo"), 120, 27}, - { "", PATH("nextcloud"), 600, 25}, +// { "", PATH("todo"), 120, 27}, +// { "", PATH("nextcloud"), 600, 25}, { "", PATH("cpu-temp"), 30, 17}, { "", PATH("memory"), 120, 21}, { "", PATH("weather"), 60, 16},