diff --git a/etc/rc.cygwin b/etc/rc.cygwin index c55f193..40d6311 100644 --- a/etc/rc.cygwin +++ b/etc/rc.cygwin @@ -29,6 +29,7 @@ export CYGWIN=winsymlinks + soft/ctags/ctags ~ - soft/htop ~/.config - soft/mc ~/.config ++ soft/dfc ~/.config + soft/vim/vim ~ + soft/vim/vimrc ~ - soft/vimperator ~ diff --git a/etc/rc.linux-gnu b/etc/rc.linux-gnu index 872dea2..b2c3cc0 100644 --- a/etc/rc.linux-gnu +++ b/etc/rc.linux-gnu @@ -57,6 +57,7 @@ mkdir -p ~/.config/dunst - soft/stalonetray/stalonetrayrc ~ - soft/tmux/tmux.conf ~ + media/alsa/asoundrc ~ ++ soft/dfc ~/.config + soft/polybar ~/.config + soft/htop ~/.config - soft/mc ~/.config diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases index a8f64a8..5acfa3c 100755 --- a/etc/shell/bash/aliases +++ b/etc/shell/bash/aliases @@ -29,7 +29,7 @@ alias less="less -R" #noindex alias lss='\ls --format=single-column' #noindex alias nl="nl -b a" #noindex alias df='df -hT' #noindex -alias dfc='dfc -t apfs,ext4,fuseblk,osxfuse -w' #noindex +alias dfc='dfc -t apfs,ext4,fuseblk,osxfuse -w -s -T' #noindex alias du='du -hs' #noindex alias free="free -m" #noindex alias wget='wget -c -T 5' #noindex @@ -208,22 +208,17 @@ vicd() { #noindex } function vifm() { #noindex - if [ -f ~/.config/vifm/lastdir ]; then - \rm ~/.config/vifm/lastdir + if [ -f ~/.vifm/lastdir ]; then + \rm ~/.vifm/lastdir fi # "command" prevents recursive call TERM=xterm-256color command vifm . - if [ -f ~/.config/vifm/lastdir ]; then - cd "`cat ~/.config/vifm/lastdir`" + if [ -f ~/.vifm/lastdir ]; then + cd "`cat ~/.vifm/lastdir`" fi } -#- Создание doc-файла в vim -vdoc() { - vim "$1" && libreoffice --convert-to doc --invisible "$1" -} - #- Копирование содержимого файла в буфер обмена xc() { cat "$@" | xclip -selection clipboard @@ -357,12 +352,12 @@ apply() { #- Копирование файла $1 в $SHELLRC/bin/$2 cpbin() { - cp $1 $SHELLRC/bin/$2/ + cp -i $1 $SHELLRC/bin/$2/ } #- Перемещение файла $1 в $SHELLRC/bin/$2 mvbin() { - mv $1 $SHELLRC/bin/$2/ + mv -i $1 $SHELLRC/bin/$2/ } #- Создание символической ссылки на файл $1 в $SHELLRC/bin/$2 diff --git a/etc/soft/dfc/dfcrc b/etc/soft/dfc/dfcrc new file mode 100644 index 0000000..bc166c0 --- /dev/null +++ b/etc/soft/dfc/dfcrc @@ -0,0 +1,68 @@ +# Optional configuration file for dfc + +# Colors used for the default text output +# Possible values are: +# - black +# - red +# - green +# - yellow +# - blue +# - magenta +# - cyan +# - white +# Note: it only concerns foreground colors + +# Display bold font or extra light colors +# Note: This might work differently on some terminals +# Use either "yes" or "no" +bold_font = yes + +# Header color +color_header = blue +# Color when usage is low +color_low = green +# Color when usage is medium +color_medium = yellow +# Color when usage is high +color_high = red + +# Values in percent when color changes in the graph +# starting value from which usage is considered medium +graph_medium = 50 +# starting value from which usage is considered high +graph_high = 85 + +# Symbol used for the graph (can be any ASCII symbol) +graph_symbol = = + +# You can also choose the colors for the HTML export +# Color values can take any of html recognized value +# For instance, this is white: #FFFFFF +# This is red: #FF0000 +# Etc. +# NOTE: you MUST ommit the # sign when setting it here +# (white becomes FFFFFF and so on) + +# Header background color (also used in footer) +html_color_header_bg = 970000 +# Header font color (also used in footer) +html_color_header_fg = FFFFFF +# Cell background color +html_color_cell_bg = E9E9E9 +# Cell font color +html_color_cell_fg = 000000 +# Background color on mouse hover +html_color_hover_bg = FFFFFF +# Font color on mouse hover +html_color_hover_fg = 000000 +# Color when usage is low +html_color_low = 348017 +# Color when usage is medium +html_color_medium = FDD017 +# Color when usage is high +html_color_high = F62217 + +# separator for CSV export +csv_separator = , + +# vim: set noet syn=conf diff --git a/etc/soft/vifm/commands b/etc/soft/vifm/commands index 7f6fc35..a3e066d 100644 --- a/etc/soft/vifm/commands +++ b/etc/soft/vifm/commands @@ -1,7 +1,8 @@ " Выход с переходом в текущую директорию command! Q :execute '!echo %d > ~/.vifm/lastdir' | quit -command df dfc -t apfs,ext4,fuseblk -w %m 2> /dev/null +command df dfc -t apfs,ext4,fuseblk,osxfuse -w -s -T %m 2> /dev/null +command dfc dfc -t apfs,ext4,fuseblk,osxfuse -w -s -T %m 2> /dev/null command dus dus %d/* %q command dmesg dmesg %m