diff --git a/.gitmodules b/.gitmodules index ac82dd1..d21d948 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "etc/soft/vim/vim/+plugins/look-up"] path = etc/soft/vim/vim/+plugins/look-up - url = git://github.com/envrm/look-up.git + url = https://notabug.org/envrm/look-up diff --git a/etc/rc.darwin18 b/etc/rc.darwin18 new file mode 100644 index 0000000..2e6a4ae --- /dev/null +++ b/etc/rc.darwin18 @@ -0,0 +1,74 @@ +# --------------------------------------------------------------- +# [ GNU/LINUX ] +# --------------------------------------------------------------- + +mkdir -p ~/.config/dunst + +# --------------------------------------------------------------- + +# [ Shell ] + ++ shell/bash/bash_profile ~ ++ shell/bash/bashrc ~ +- shell/guile/guile ~ +- shell/tcl/tclshrc ~ +- shell/tcl/wishrc ~ +- shell/screen/screenrc ~ +- shell/hstr/hh_blacklist ~ + +# [ X.org ] + +- X/Xdefaults ~ +- X/XCompose ~ +- X/xinitrc.$(uname -i) ~ +- wm/gtk/gtkrc-2.0 ~ +- wm/gtk/gtk-bookmarks ~ ++ wm/musca/musca_start.$(uname -i) ~ +- wm/fonts/fonts.conf ~ ++ wm/fonts/nerd-fonts ~/.fonts/ + +# [ Net ] + +- net/ssh ~ +- net/rtorrent/rtorrent.rc ~ +- net/lftp/lftprc ~ +- net/snownews ~ +- mail/mailcap/mailcap ~ +- mail/procmail/procmailrc ~ + +# [ Soft ] + +- media/ncmpcpp ~ +- media/moc ~ +- media/scmpc ~ +- soft/bar/barrc ~ +- soft/conky/conkyrc.$(uname -i) ~ +- soft/ctags/ctags ~ +- soft/htop ~/.config +- soft/dunst/dunstrc ~/.config/dunst +- soft/mc ~/.config ++ soft/vim/vim ~ ++ soft/nvim ~/.config ++ soft/vifm ~ ++ soft/vim/vimrc ~ +- soft/vimperator ~ +- soft/vimperator/vimperatorrc ~ ++ soft/git/gitconfig ~ +- soft/git/gitk ~ +- soft/stalonetray/stalonetrayrc ~ + +: --------------------------------------------------------------- + +mkdir -pv ../var/{shell,log,mpd,scmpc,vim} +mkdir -pv ../var/vim/{backup,undo,mru,swp,view,yankring} +mkdir -pv net/ssh/sessions + +: --------------------------------------------------------------- + +#xdg-mime default zathura.desktop application/pdf +#xdg-mime default gpicview.desktop image/gif +#xdg-mime default gpicview.desktop image/jpg +#xdg-mime default gpicview.desktop image/png + +: --------------------------------------------------------------- + diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases index 9bb19de..23b2aea 100755 --- a/etc/shell/bash/aliases +++ b/etc/shell/bash/aliases @@ -22,19 +22,12 @@ alias cp='cp -i -v -r' #noindex alias rm="rm -i -v" #noindex alias rmdir="rmdir -v" #noindex -#- Алиасы для стандартных команд - -ls-with-icons() { ls-i --color=always -N -w $(tput cols) "$@"; } #noindex -dir-with-icons() { dir-i --color=always -N -w $(tput cols) "$@"; } #noindex -vdir-with-icons() { vdir-i --color=always -N -w $(tput cols) "$@"; } #noindex +#- Псевдонимы для стандартных команд alias gcc="gcc -Os -Wextra -Wall" #noindex alias g++="g++ -Os -Wall" #noindex alias echo="echo -e" #noindex alias less="less -R" #noindex -alias ls='ls-with-icons -lGhpXv --color=always --group-directories-first' #noindex -alias lsl='ls-with-icons -L' #noindex -alias lst='ls-with-icons -al --time-style=+%D | grep $(\date +%D)' #noindex alias lss='\ls --format=single-column' #noindex alias nl="nl -b a" #noindex alias df='df -hT' #noindex @@ -77,6 +70,8 @@ alias g=git #noindex alias startx="xinit -- /usr/bin/X" #noindex alias lftp="LFTP_HOME=$SHELLRC/etc/net/lftp lftp" #noindex +alias vk="TERM=xterm vk-cli" #noindex + alias fm="nnn" #noindex if [ $UID -eq 0 ]; then diff --git a/etc/shell/bash/aliases_linux b/etc/shell/bash/aliases_linux new file mode 100644 index 0000000..6a3a212 --- /dev/null +++ b/etc/shell/bash/aliases_linux @@ -0,0 +1,10 @@ +# Псевдонимы + +ls-with-icons() { ls-i --color=always -N -w $(tput cols) "$@"; } #noindex +dir-with-icons() { dir-i --color=always -N -w $(tput cols) "$@"; } #noindex +vdir-with-icons() { vdir-i --color=always -N -w $(tput cols) "$@"; } #noindex + +alias ls='ls-with-icons -lGhpXv --color=always --group-directories-first' #noindex +alias lsl='ls-with-icons -L' #noindex +alias lst='ls-with-icons -al --time-style=+%D | grep $(\date +%D)' #noindex + diff --git a/etc/shell/bash/aliases_macos b/etc/shell/bash/aliases_macos new file mode 100644 index 0000000..9fd53db --- /dev/null +++ b/etc/shell/bash/aliases_macos @@ -0,0 +1,5 @@ + +alias ls='ls -lGhpv --color=always --group-directories-first' #noindex +alias lsl='ls -L' #noindex +alias lst='ls -al --time-style=+%D | grep $(\date +%D)' #noindex + diff --git a/etc/shell/bash/bash_completion b/etc/shell/bash/bash_completion index 7401e69..f193d32 100644 --- a/etc/shell/bash/bash_completion +++ b/etc/shell/bash/bash_completion @@ -169,7 +169,7 @@ have() # use GNU sed if we have it, since its extensions are still used in our code # -[[ ($UNAME != Linux) && ($UNAME != Cygwin) ]] && have gsed && alias sed=gsed +#[[ ($UNAME != Linux) && ($UNAME != Cygwin) ]] && have gsed && alias sed=gsed # This function checks whether a given readline variable # is `on'. diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 5b23cca..61791b0 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: Пн 28 янв 2019 21:13:14 +# Изменён: Сб 23 фев 2019 17:31:37 # ################################################################################ @@ -112,25 +112,6 @@ white="\033[1;1m" #Подсветка результатов grep export GREP_COLOR='1;31' -#Цвета ls -# export LS_COLORS="\ -# no=00:fi=00:di=01;34:ln=01;36:\ -# pi=40;33:so=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:\ -# *.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:\ -# *.lzh=01;31:*.zip=01;31:*.7z=01;31:*.rar=01;31:*.z=01;31:*.Z=01;31:\ -# *.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:\ -# *.jpg=00;35:*.jpeg=00;35:*.JPG=00;35:*.png=00;35:*.gif=00;35:*.bmp=00;35:\ -# *.ppm=00;35:*.tga=00;35:*.xbm=00;35:*.xpm=00;35:*.tif=00;35:*.png=00;35:\ -# *.mpg=01;35:*.avi=01;35:*.fli=01;35:*.vob=01;35:*.mp4=01;35:*.wmv=01;35:\ -# *.txt=00;33:*.doc=00;33:*.odt=00;33:*.rtf=00;33:*.pdf=00;33:*.djvu=00;33:\ -# *.mp3=01;36:*.wav=01;36:*.ape=01;36:*.ogg=01;36:*.wma=01;36:*.midi=01;36:\ -# *.flac=01;36:*.gpt=01;38:*.gp2=01;38:*.gp3=01;38:*.gp4=01;38:\ -# *.c=00;04:*.cpp=00;04:*.pas=00;04:*.ui=00;04:*.sh=00;04:*.py=00;04:*.rb=00;04:\ -# *.gl=01;35:*.dl=01;35:" - -# export LS_COLORS=$($BASHRC/ls_colors_generator.py) -export LS_COLORS=$(cat $BASHRC/ls_colors_generated) - #Настройка подсветки мануалов export LESS_TERMCAP_mb=$'\E[01;31m' export LESS_TERMCAP_md=$'\E[01;31m' @@ -178,8 +159,8 @@ path++ () { else export $2="${!2:+${!2}:}$i" fi - else - echo "$i is not a directory" >&2 + #else + #echo "$i is not a directory" >&2 fi done } @@ -187,17 +168,6 @@ path++ () { INIT_PATH=$PATH PATH="." -if [[ $OS != Windows* ]]; then - path++ $SHELLRC/etc/shell/cw/def PATH - path++ $SHELLRC/bin/app:$SHELLRC/bin/dmenu:$SHELLRC/bin/musca:$SHELLRC/bin/exec PATH -fi - -path++ $SHELLRC/bin:$SHELLRC/bin/scripts PATH -path++ /bin:/usr/bin:/usr/local/bin PATH - -#Android SDK -path++ /opt/android-sdk-linux/platforms/:/opt/android-sdk-linux/tools/ PATH - if [ $UID -eq 0 ]; then TMOUT=600 PROMPT_COLOR='\033[1;31m' @@ -208,7 +178,9 @@ if [ $UID -eq 0 ]; then path++ /usr/local/sbin PATH else PROMPT_COLOR='\033[1;32m' - export HOME=/home/$(whoami) + + path++ $INIT_PATH PATH + #export HOME=$HOME fi # }}} ########################################################################## @@ -221,17 +193,14 @@ fi # shopt -s expand_aliases # }}} ########################################################################## -# {{{ Настройка Cygwin +# {{{ Загрузка системоспецифичных настроек ################################################################################ -if [[ `uname -o` == Cygwin ]]; then - path++ $INIT_PATH PATH - - [[ -f $BASHRC/aliases_cygwin ]] && CYGWIN_ALIASES="$BASHRC/aliases_cygwin" \ - && . $CYGWIN_ALIASES \ - && HELPSRC+=("$CYGWIN_ALIASES") - [[ -f $BASHRC/bash_completion_cygwin ]] && . $BASHRC/bash_completion_cygwin -fi +case "$(uname -s)" in + "Linux") [[ -f $BASHRC/bashrc_linux ]] && . "$BASHRC/bashrc_linux";; + "Cygwin") [[ -f $BASHRC/bashrc_cygwin ]] && . "$BASHRC/bashrc_cygwin";; + "Darwin") [[ -f $BASHRC/bashrc_macos ]] && . "$BASHRC/bashrc_macos";; +esac # }}} ########################################################################## @@ -243,16 +212,14 @@ fi [ -n "$SSH_CLIENT" ] && PROMPT_SHH="[${red}ssh${PROMPT_COLOR}]" -PS1="$PROMPT_COLOR┌─[$yellow\h$PROMPT_COLOR]─(${yellow}\j${PROMPT_COLOR})$PROMPT_SHH─[$yellow\w$PROMPT_COLOR]\n$PROMPT_COLOR└─[$PROMPT_COLOR\t]\$ $rstc" - PS2="$green-> $rstc" PS3="$green+> $rstc" PS4="$green++ $rstc" short_pwd() { # echo -en '  ' - # pwd | sed 's@/home/'$USER'@~@; s@^\([~/][^/]*/\).*\(\(/[^/]*\)\{3\}\)$@\1\2@' - pwd | sed 's@/home/'$USER'@~@; s@^\(\([~/][^/]*\)\{2\}/\).*\(\(/[^/]*\)\{2\}\)$@\1...\3@' + # pwd | sed 's@'$HOME'@~@; s@^\([~/][^/]*/\).*\(\(/[^/]*\)\{3\}\)$@\1\2@' + pwd | sed 's@'$HOME'@~@; s@^\(\([~/][^/]*\)\{2\}/\).*\(\(/[^/]*\)\{2\}\)$@\1...\3@' } # PROMPT_COMMAND="history -a; history -n;" @@ -290,14 +257,10 @@ export HISTIGNORE="&:[bf]g:h:c:exit:,ww:~:..:,-:,w,w:,m:ls:\:q:t:\?" #Не за umask 022 shopt -s progcomp -shopt -s globstar #Включение масок ** и **/ (рекурсивный перебор) -shopt -s autocd #Интерпретировать команды как параметры cd -shopt -s checkjobs #При выходе проверять фоновые задания shopt -s histappend #Не добавлять команды, не переписывая историю shopt -s cmdhist #Сохранение многострочной команды в одной строке shopt -s cdable_vars #Аргументы cd могут быть переменными shopt -s cdspell #Исправление ошибок в именах директорий -shopt -s dirspell #Исправление имен директорий при автодополнении shopt -s checkhash #Проверка на существование команд в хеш-таблице shopt -s lithist #Заменять ';' на '\n' в многострочных командах shopt -s histreedit #Повторное редактирование команды @@ -316,8 +279,6 @@ shopt -s extglob #Расширенное сопоставление с обра # @(шаблон) Одно появление указанного шаблона # !(шаблон) Всё, кроме одного появления указанного шаблона -[[ (-f $BASHRC/cdargs-bash.sh) && (`uname -o` != Cygwin) ]] && . $BASHRC/cdargs-bash.sh - #Привычные комбинации клавиш для режима vi bind -m vi-command ".":insert-last-argument bind -m vi-insert "\C-l.":clear-screen diff --git a/etc/shell/bash/bashrc_cygwin b/etc/shell/bash/bashrc_cygwin new file mode 100644 index 0000000..0827846 --- /dev/null +++ b/etc/shell/bash/bashrc_cygwin @@ -0,0 +1,7 @@ +path++ $INIT_PATH PATH + +[[ -f $BASHRC/aliases_cygwin ]] && CYGWIN_ALIASES="$BASHRC/aliases_cygwin" \ + && . $CYGWIN_ALIASES \ + && HELPSRC+=("$CYGWIN_ALIASES") +[[ -f $BASHRC/bash_completion_cygwin ]] && . $BASHRC/bash_completion_cygwin + diff --git a/etc/shell/bash/bashrc_linux b/etc/shell/bash/bashrc_linux new file mode 100644 index 0000000..dc90153 --- /dev/null +++ b/etc/shell/bash/bashrc_linux @@ -0,0 +1,26 @@ +# Настройка путей + +path++ $SHELLRC/etc/shell/cw/def PATH +path++ $SHELLRC/bin/app:$SHELLRC/bin/dmenu:$SHELLRC/bin/musca:$SHELLRC/bin/exec PATH + +path++ $SHELLRC/bin:$SHELLRC/bin/scripts PATH +path++ /bin:/usr/bin:/usr/local/bin PATH + +# Настройки оболочки + +shopt -s globstar #Включение масок ** и **/ (рекурсивный перебор) +shopt -s autocd #Интерпретировать команды как параметры cd +shopt -s checkjobs #При выходе проверять фоновые задания +shopt -s dirspell #Исправление имен директорий при автодополнении + +[[ (-f $BASHRC/cdargs-bash.sh) ]] && . $BASHRC/cdargs-bash.sh + +[[ -f $BASHRC/aliases_linux ]] && LINUX_ALIASES="$BASHRC/aliases_linux" \ + && . $LINUX_ALIASES \ + && HELPSRC+=("$LINUX_ALIASES") + +# export LS_COLORS=$($BASHRC/ls_colors_generator.py) +export LS_COLORS=$(cat $BASHRC/ls_colors_generated) + +PS1="$PROMPT_COLOR┌─[$yellow\h$PROMPT_COLOR]─(${yellow}\j${PROMPT_COLOR})$PROMPT_SHH─[$yellow\w$PROMPT_COLOR]\n$PROMPT_COLOR└─[$PROMPT_COLOR\t]\$ $rstc" + diff --git a/etc/shell/bash/bashrc_macos b/etc/shell/bash/bashrc_macos new file mode 100644 index 0000000..194eed1 --- /dev/null +++ b/etc/shell/bash/bashrc_macos @@ -0,0 +1,25 @@ +PATH="/usr/local/opt/coreutils/libexec/gnubin/:$PATH" + +[[ -f $BASHRC/aliases_macos ]] && MACOS_ALIASES="$BASHRC/aliases_macos" \ + && . $MACOS_ALIASES \ + && HELPSRC+=("$MACOS_ALIASES") +[[ -f $BASHRC/bash_completion_macos ]] && . $BASHRC/bash_completion_macos + +#Цвета ls +export LS_COLORS="\ +no=00:fi=00:di=01;34:ln=01;36:\ +pi=40;33:so=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:\ +*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:\ +*.lzh=01;31:*.zip=01;31:*.7z=01;31:*.rar=01;31:*.z=01;31:*.Z=01;31:\ +*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:\ +*.jpg=00;35:*.jpeg=00;35:*.JPG=00;35:*.png=00;35:*.gif=00;35:*.bmp=00;35:\ +*.ppm=00;35:*.tga=00;35:*.xbm=00;35:*.xpm=00;35:*.tif=00;35:*.png=00;35:\ +*.mpg=01;35:*.avi=01;35:*.fli=01;35:*.vob=01;35:*.mp4=01;35:*.wmv=01;35:\ +*.txt=00;33:*.doc=00;33:*.odt=00;33:*.rtf=00;33:*.pdf=00;33:*.djvu=00;33:\ +*.mp3=01;36:*.wav=01;36:*.ape=01;36:*.ogg=01;36:*.wma=01;36:*.midi=01;36:\ +*.flac=01;36:*.gpt=01;38:*.gp2=01;38:*.gp3=01;38:*.gp4=01;38:\ +*.c=00;04:*.cpp=00;04:*.pas=00;04:*.ui=00;04:*.sh=00;04:*.py=00;04:*.rb=00;04:\ +*.gl=01;35:*.dl=01;35:" + +PS1="$PROMPT_COLOR[${yellow}devopc${PROMPT_COLOR}]-(${yellow}\j${PROMPT_COLOR})$PROMPT_SHH-[$yellow\w$PROMPT_COLOR]\n$PROMPT_COLOR[$PROMPT_COLOR\t]\$ $rstc" + diff --git a/etc/soft/conky/conkyrc.GenuineIntel b/etc/soft/conky/conkyrc.GenuineIntel index 641ef22..858ae3b 100644 --- a/etc/soft/conky/conkyrc.GenuineIntel +++ b/etc/soft/conky/conkyrc.GenuineIntel @@ -1,6 +1,6 @@ background yes use_xft yes -xftfont DejaVu Mono:size=11 +xftfont DejaVuSansMono Nerd Font Mono:size=10 xftalpha 1 update_interval 2.0 total_run_times 0 @@ -37,15 +37,13 @@ default_color black own_window_colour D9D9D9 TEXT -[ ${color darkblue}${execi 2 SHELL=/bin/sh musca -c "silent show groups" \ - | cut -f 2- -d ' ' \ - | sed -e :a -e '$b;N;s/\n/ | /;ba' \ - | sed 's/- //g;s/\*/+/g' -} ]${offset 55}\ +[ ${color darkblue}${execi 2 ~/.shellrc/bin/scripts/musca_status} ] \ +${offset 55}\ ${alignc} \ ${if_mounted /}$color /: ${color brown}${fs_free /}${endif}\ ${if_mounted /home}$color | home: ${color brown}${fs_free /home}${endif}\ ${if_mounted /mnt/DATA}$color | data: ${color brown}${fs_free /mnt/DATA}${endif}\ ${alignr}\ +${execi 300 ~/.shellrc/bin/scripts/ttable} \ ${color darkblue}[${execi 2 SHELL=/bin/sh ~/.shellrc/bin/skb 1}]$color | \ ${color black}${time %H:%M} (${time %d.%m.%Y}) diff --git a/etc/soft/git/gitconfig b/etc/soft/git/gitconfig index 9cfa3ce..48346ab 100644 --- a/etc/soft/git/gitconfig +++ b/etc/soft/git/gitconfig @@ -62,6 +62,7 @@ url = !git remote -v | grep fetch | grep -o 'https.* ' | xargs xdg-open hub = "!github_clone() { git clone git://github.com/${1}.git; }; github_clone" + nb = "!github_clone() { git clone https://notabug.org/${1}.git; }; github_clone" calendar = !git-cal diff --git a/etc/soft/packages.list b/etc/soft/packages.list index 1cfde50..dac77e6 100644 --- a/etc/soft/packages.list +++ b/etc/soft/packages.list @@ -18,6 +18,7 @@ networkmanager -> connman + https://github.com/eurogiciel-oss/connman-json-clien tig #? ls https://github.com/illinoisjackson/even-better-ls xst https://github.com/gnotclub/xst +nerd-fonts https://github.com/ryanoasis/nerd-fonts ufed cpg, mvg https://github.com/mrdrogdrog/advcpmv diff --git a/etc/soft/vifm/colors/default.vifm b/etc/soft/vifm/colors/def.vifm similarity index 100% rename from etc/soft/vifm/colors/default.vifm rename to etc/soft/vifm/colors/def.vifm diff --git a/etc/soft/vim/vim/+ftplugin/tcl.vim b/etc/soft/vim/vim/+ftplugin/tcl.vim index 49a3a9d..dc27531 100644 --- a/etc/soft/vim/vim/+ftplugin/tcl.vim +++ b/etc/soft/vim/vim/+ftplugin/tcl.vim @@ -11,7 +11,7 @@ set errorformat=%f:\ Line\ %l:\ %t\ %m " Формат строки с инфор " TODO: переименовать Tcl.vim (<- tags.tcl) if !has("win32unix") - source $HOME/.vim/+omnicompletion/tcl/tcl.vim + source $HOME/.vim/+omnicompletion/tcl/tcl_completion.vim endif setlocal omnifunc=TclComplete diff --git a/etc/soft/vim/vim/+omnicompletion/tcl/tcl.vim b/etc/soft/vim/vim/+omnicompletion/tcl/tcl_completion.vim similarity index 100% rename from etc/soft/vim/vim/+omnicompletion/tcl/tcl.vim rename to etc/soft/vim/vim/+omnicompletion/tcl/tcl_completion.vim diff --git a/etc/wm/musca/musca_start.AuthenticAMD b/etc/wm/musca/musca_start.AuthenticAMD index aa93848..6313ae1 100644 --- a/etc/wm/musca/musca_start.AuthenticAMD +++ b/etc/wm/musca/musca_start.AuthenticAMD @@ -1,7 +1,7 @@ [~/.musca_start] # -# Изменён: Пн 31 дек 2018 17:17:42 +# Изменён: Пт 01 фев 2019 17:19:42 # #Цветовая схема#{{{ @@ -56,25 +56,12 @@ bind on Mod4+x exec dmenu_exec bind on Mod4+z exec dmenfm bind on Mod4+Shift+z exec dmenfm -#Управление mpd -bind on Mod4+p exec dmpc - -# Радио -bind on Mod4+r exec radio - # Браузер bind on Mod4+w exec www # Список окон bind on Mod4+g exec windows - -#Выбор виртуальной машины для запуска -bind on Mod4+Shift+V exec VM - -#Монтирование устройств -bind on Mod4+Shift+m exec mountmenu - # dmenu с перечнем всех окон bind on Mod4+Shift+w switch window @@ -121,11 +108,11 @@ bind on Mod4+Control+j focus down # Переключение между группами bind on Mod4+Next use (next) bind on Mod4+Prior use (prev) -#bind on Mod4+Tab use (next) +bind on Mod4+Tab use (next) bind on Mod4+Control+Tab use (prev) # Переход на другой монитор -bind on Mod4+Tab screen (next) +#bind on Mod4+Tab screen (next) # Пометить фрейм как занятый для открывающихся окон bind on Mod4+Shift+d dedicate flip @@ -183,7 +170,7 @@ bind on Mod4+1 use 0 bind on Mod4+2 use 1 bind on Mod4+3 use 2 bind on Mod4+4 use 3 -#bind on Mod4+5 use 4 +bind on Mod4+5 use 4 #bind on Mod4+6 use 5 #bind on Mod4+7 use 6 #bind on Mod4+8 use 7 @@ -203,7 +190,8 @@ manage off Conky set window_open_frame empty # Формат запуска dmenu -set dmenu dmenu -i -fn '-*-fixed-*-*-*-*-15-*-*-*-*-*-*-*' +set dmenu dmenu -i +#set dmenu dmenu -i -fn '-*-fixed-*-*-*-*-15-*-*-*-*-*-*-*' #set dmenu rofi -dmenu #}}} @@ -211,7 +199,7 @@ set dmenu dmenu -i -fn '-*-fixed-*-*-*-*-15-*-*-*-*-*-*-*' exec conky exec xbindkeys -f $SHELLRC/etc/X/xbindkeysrc.$(uname -i) exec xrdb ~/.Xdefaults -# exec urxvtd -q -o -f +#exec urxvtd -q -o -f #exec xmodmap $SHELLRC/etc/X/Xmodmaprc.AuthenticAMD #}}} diff --git a/etc/wm/musca/musca_start.GenuineIntel b/etc/wm/musca/musca_start.GenuineIntel index 57f5ce8..5030724 100644 --- a/etc/wm/musca/musca_start.GenuineIntel +++ b/etc/wm/musca/musca_start.GenuineIntel @@ -1,7 +1,7 @@ [~/.musca_start] # -# Изменён: Ср 13 дек 2017 19:33:15 +# Изменён: Пт 01 фев 2019 17:19:43 # #Цветовая схема#{{{ @@ -30,10 +30,11 @@ refresh #Комбинации клавиш#{{{ # Терминал -bind on Mod4+t exec urxvtc +bind on Mod4+t exec xstab # dmenu -bind on Mod4+x exec ~/.shellrc/bin/dmenu/dmenu_exec +#bind on Mod4+x exec ~/.shellrc/bin/dmenu/dmenu_exec +bind on Mod4+x exec rofi -show run # Файловый менеджер dmenu bind on Mod4+z exec dmenfm @@ -177,7 +178,8 @@ set dmenu dmenu -i # Запуск программ#{{{ exec conky exec xbindkeys -f $SHELLRC/etc/X/xbindkeysrc.$(uname -i) -exec urxvtd -q -o -f +exec xrdb ~/.Xdefaults +#exec urxvtd -q -o -f #exec xmodmap $SHELLRC/etc/X/Xmodmaprc.AuthenticAMD #}}} diff --git a/etc/wm/wallpaper.GenuineIntel.jpg b/etc/wm/wallpaper.GenuineIntel.jpg index 5739703..657865b 100644 Binary files a/etc/wm/wallpaper.GenuineIntel.jpg and b/etc/wm/wallpaper.GenuineIntel.jpg differ