From e43c64e90ac1a3f27179a9972c3100815c193bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?= Date: Fri, 19 Mar 2021 03:42:58 +0300 Subject: [PATCH] Install script & SimCrop --- arch-setup/AUR.txt | 9 ++++- arch-setup/nonAUR.txt | 78 +++++++++++++++++++++++++++++++++++-- install.sh | 5 +++ mail/mutt/mailcap | 3 +- misc/htop/htoprc | 2 +- misc/keyboard | 1 + scripts/dmenu-mconnect | 60 +++++++++++++--------------- scripts/lock | 6 ++- scripts/status-bar/battery | 9 +++-- scripts/status-bar/date | 8 ++++ suckless/dwm/keybind.h | 17 ++++---- suckless/dwm/rules.h | 6 ++- suckless/dwmblocks/config.h | 1 + xorg/xinitrc | 5 ++- zsh/aliases | 1 + 15 files changed, 157 insertions(+), 54 deletions(-) create mode 100755 scripts/status-bar/date diff --git a/arch-setup/AUR.txt b/arch-setup/AUR.txt index 672a569f..87a1fa38 100644 --- a/arch-setup/AUR.txt +++ b/arch-setup/AUR.txt @@ -6,6 +6,7 @@ betterdiscordctl-git betterlockscreen bitwarden bitwarden-cli +brave-bin canto-next-git capt-src checkupdates+aur @@ -27,7 +28,8 @@ ifuse jetbrains-toolbox ly mailspring -mconnect-git +mpris-ctl +mpv-mpris-git mutt-wizard ncpamixer nerd-fonts-hack @@ -46,13 +48,16 @@ postman-bin python-click-spinner python-delorean qt5-styleplugins +ranger-git readability-cli +renpy-sdk rofi-bluetooth-git ruby-erubis ruby-xdg spicetify-cli spotify spotify-tui +spotifyd-full-git sselp sublime-text-3 surf @@ -62,10 +67,12 @@ termpdf-git ttf-material-design-icons ttf-symbola typora +vtop vue-cli wallabag-client wd719x-firmware whatsapp-nativefier-dark +xbanish-timeout-git xchat-se xmenu yaft diff --git a/arch-setup/nonAUR.txt b/arch-setup/nonAUR.txt index 5b33558e..ae40c32f 100644 --- a/arch-setup/nonAUR.txt +++ b/arch-setup/nonAUR.txt @@ -29,6 +29,7 @@ attr audit autoconf autoconf-archive +autoconf2.13 automake avahi baobab @@ -65,8 +66,10 @@ cantarell-fonts canto-curses capnproto capstone +cbindgen cblas cdparanoia +cheese chmlib chromaprint chrony @@ -74,12 +77,17 @@ cinnamon-desktop clang clipnotify clucene +clutter +clutter-gst +clutter-gtk cmake code +cogl colord compiler-rt conky coreutils +cpupower cracklib cronie cryptsetup @@ -93,6 +101,7 @@ dav1d db dbus dbus-glib +dbus-python dconf dejagnu desktop-file-utils @@ -117,6 +126,7 @@ electron electron6 elfutils enchant +engrampa exempi exfat-utils exiv2 @@ -135,16 +145,19 @@ filesystem findutils firefox-developer-edition flac +fltk fluidsynth fontconfig fontforge foremost freetype2 +frei0r-plugins fribidi fuse-common fuse2 fuse3 fzf +gavl gawk gc gcc @@ -152,6 +165,8 @@ gcc-libs gconf gcr gd +gdb +gdb-common gdbm gdk-pixbuf-xlib gdk-pixbuf2 @@ -190,6 +205,7 @@ gnome-session gnome-settings-daemon gnome-shell gnome-themes-extra +gnome-video-effects gnu-free-fonts gnupg gnuplot @@ -364,6 +380,7 @@ haskell-xml-conduit haskell-xml-types haskell-zip-archive haskell-zlib +hdf5 hexchat hicolor-icon-theme hidapi @@ -374,10 +391,12 @@ hunspell hwids hwloc hyphen +i7z iana-etc icu ijs imagemagick +imake imlib2 inetutils inkscape @@ -445,6 +464,7 @@ lib32-xz lib32-zlib lib32-zstd libabw +libaec libaio libarchive libass @@ -749,6 +769,7 @@ mkinitcpio-busybox mlocate mobile-broadband-provider-info mono +mozilla-common mpfr mpg123 mpv @@ -758,7 +779,9 @@ mtdev mujs mutter mysql-workbench +nasm ncurses +ncurses5-compat-libs ndctl nemo neofetch @@ -789,6 +812,7 @@ nuspell oniguruma openal opencore-amr +opencv openexr openjpeg2 openmpi @@ -908,8 +932,6 @@ python-cryptography python-css-parser python-cssselect python-dateutil -python-dbus -python-dbus-common python-decorator python-defusedxml python-distlib @@ -1055,7 +1077,47 @@ python-yaml python-zeroconf python-zipp python2 +python2-appdirs +python2-asn1crypto +python2-backports +python2-cachecontrol +python2-cffi +python2-chardet +python2-colorama +python2-configparser +python2-contextlib2 +python2-cryptography +python2-distlib +python2-distro python2-docutils +python2-enum34 +python2-future +python2-html5lib +python2-idna +python2-importlib-metadata +python2-ipaddress +python2-msgpack +python2-ordered-set +python2-packaging +python2-pathlib2 +python2-pep517 +python2-pip +python2-progress +python2-psutil +python2-pycparser +python2-pygame-sdl2 +python2-pyopenssl +python2-pyparsing +python2-requests +python2-resolvelib +python2-retrying +python2-scandir +python2-setuptools +python2-six +python2-toml +python2-urllib3 +python2-webencodings +python2-zipp qpdf qt5-base qt5-declarative @@ -1073,7 +1135,6 @@ qt5-x11extras qt5ct qtkeychain-qt5 radare2 -ranger rapidjson raptor rasqal @@ -1084,6 +1145,7 @@ readline redis redland refind +renpy rest rhash ripgrep @@ -1108,9 +1170,13 @@ run-parts rust sbc sbsigntools +scdoc scrot sdl sdl2 +sdl2_image +sdl2_mixer +sdl2_ttf seahorse sed semver @@ -1125,6 +1191,7 @@ sonic-visualiser sord sound-theme-freedesktop soundtouch +source-highlight spandsp speex speexdsp @@ -1150,6 +1217,7 @@ t1lib taglib talloc tar +tbb tcl tcsh tdb @@ -1169,6 +1237,7 @@ texlive-pictures texlive-pstricks texlive-publishers texlive-science +thermald thin-provisioning-tools thunar thunderbird @@ -1188,12 +1257,14 @@ ttf-joypixels ttf-liberation ttf-linux-libertine ttf-opensans +turbostat twine twolame tzdata uchardet udisks2 ueberzug +unclutter unibilium unixodbc unrar @@ -1328,6 +1399,7 @@ zbar zenity zeromq zimg +zip zita-alsa-pcmi zita-resampler zlib diff --git a/install.sh b/install.sh index 8371f330..c8765845 100755 --- a/install.sh +++ b/install.sh @@ -168,3 +168,8 @@ ninja sudo ninja install cd $prev +# Installl simcrop +git clone https://github.com/theFr1nge/simcrop.git /tmp/simcrop +cd /tmp/simcrop +sudo make install +cd $prev diff --git a/mail/mutt/mailcap b/mail/mutt/mailcap index b355f328..88bbdce7 100644 --- a/mail/mutt/mailcap +++ b/mail/mutt/mailcap @@ -1,6 +1,7 @@ text/plain; $EDITOR %s ; text/html; openfile %s ; nametemplate=%s.html -text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput; +#text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput; +text/html; firefox-developer-edition %s; image/*; openfile %s ; video/*; setsid mpv --quiet %s &; copiousoutput audio/*; mpv %s ; diff --git a/misc/htop/htoprc b/misc/htop/htoprc index a91e4c6f..30689fa6 100644 --- a/misc/htop/htoprc +++ b/misc/htop/htoprc @@ -1,7 +1,7 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 +sort_key=47 sort_direction=1 tree_sort_key=47 tree_sort_direction=1 diff --git a/misc/keyboard b/misc/keyboard index ef08bdbd..1b168b12 100755 --- a/misc/keyboard +++ b/misc/keyboard @@ -1,4 +1,5 @@ #!/bin/bash setxkbmap us -variant altgr-intl -option caps:escape # Set keyboard layout. map CapsLock to Esc +xset r rate 120 40 xmodmap -e "clear control" -e "add control = Control_L" -e "clear mod3" -e "add mod3 = Control_R" # Map right Ctrl to Mod3Mask diff --git a/scripts/dmenu-mconnect b/scripts/dmenu-mconnect index 52f42b09..128d2ce4 100755 --- a/scripts/dmenu-mconnect +++ b/scripts/dmenu-mconnect @@ -25,7 +25,7 @@ # nnn # zenity # ranger -Picker='zenity' +Picker='ranger' # Color Settings of dmenu COLOR_DISCONNECTED='#000' # Device Disconnected @@ -63,7 +63,7 @@ show_devices (){ icon=$(get_icon $battery $devicetype) # colors="$(get_colors $battery)" # echo "$colors" - show_menu "$devicename | $battery $icon" $deviceid $battery + show_menu "$devicename | $battery $icon" $deviceobj $battery devices+="$devicename $battery $icon $SEPERATOR" elif [ "$isreach" = "false" ] && [ "$istrust" = "true" ];then #nothing is found @@ -71,7 +71,7 @@ show_devices (){ else #found but not yet paired icon=$(get_icon -2 $devicetype) - show_pmenu $devicename $deviceid + show_pmenu $devicename $deviceobj devices+="$devicename $icon $SEPERATOR" fi done @@ -91,51 +91,45 @@ SendKeys(){ #displays a menu for the connected device show_menu () { optionNum=5 - options=$(printf "Send SMS\\nSend File\\nFind Device\\nPing\\nUnpair\\nkeys\\n") - options+=$(printf "\\nRefresh\\n") + options=$(printf "Send SMS\\nSend File\\nSend Text\\nSend URL\\nDisconnect\\n") menu=$(echo $options | dmenu -i -p $1 -l $optionNum ) case "$menu" in *'Send File') - [ $Picker == 'nnn' ] && kdeconnect-cli --share "file://$($TERMINAL nnn -p -)" -d $2 ; - [ $Picker == 'zenity' ] && kdeconnect-cli --share "file://$(zenity --file-selection)" -d $2 ; if [ $Picker == 'ranger' ]; then - mkdir -p /tmp/ranger/ && touch /tmp/ranger/sentfile - kdeconnect-cli --share "file://$($TERMINAL ranger --choosefile=/tmp/ranger/sentfile)" -d $2 + mkdir -p /tmp/ranger/ + rm -rf /tmp/ranger/sentfile + st -c ranger -e ranger --choosefile=/tmp/ranger/sentfile + if [ -f /tmp/ranger/sentfile ]; then + mconnectctl share-file "$2" "$(cat /tmp/ranger/sentfile)" + fi fi;; - *'Unpair' ) kdeconnect-cli --unpair -d $2 ;; *'Send SMS' ) message=$(echo 'OTW' | dmenu -i -p "Msg to send") recipient=$(echo '14039199518' | dmenu -i -p "Recipient's phone #") - kdeconnect-cli --send-sms "$message" --destination "$recipient" -d $2 ;; - *'Refresh' ) - kdeconnect-cli --refresh;; - *'Notification' ) - Notification_menu $notification1 $2;; - *'keys' ) - SendKeys "$2";; - esac + mconnectctl send-sms "$2" "$message" "$recipient" ;; + *'Send URL' ) + message=$(echo 'Clipboard' | dmenu -i -p "Enter Url:") + if [ "$message" = "Clipboard" ]; then + message=$(sselp) + fi + mconnectctl share-url "$2" "$message";; + *'Send Text' ) + message=$(echo 'Clipboard' | dmenu -i -p "Enter Url:") + if [ "$message" = "Clipboard" ]; then + message=$(sselp) + fi + mconnectctl share-text "$2" "$message";; + *'Disconnect' ) + mconnectctl disallow-device "$2" + esac } show_pmenu () { menu="$(printf "Pair Device" | dmenu -i -p "$1" )" case "$menu" in - *'Pair Device') kdeconnect-cli --pair -d $2 ;; + *'Pair Device') mconnectctl allow-device $2 ;; esac } -#still a work in progress -# get_colors () { -# case $1 in -# "-1") colors="-nb \"$COLOR_DISCONNECTED\" -nf \"#000\" " ;; -# "-2") colors="-nb \"$COLOR_NEWDEVICE\" -nf \"#000\" ";; -# 5*) colors="-nb \"$COLOR_BATTERY_50\" -nf \"#000\" ";; -# 6*) colors="-nb \"$COLOR_BATTERY_60\" -nf \"#000\" ";; -# 7*) colors="-nb \"$COLOR_BATTERY_70\" -nf \"#000\" ";; -# 8*) colors="-nb \"$COLOR_BATTERY_80\" -nf \"#000\" ";; -# *) colors="-nb \"$COLOR_BATTERY_LOW\" -nf \"#000\" ";; -# 9*|100) colors="-nb \"$COLOR_BATTERY_90\" -nf \"#000\" ";; -# esac -# echo $colors -# } get_icon () { if [ "$2" = "tablet" ] diff --git a/scripts/lock b/scripts/lock index de9f39a8..fd259251 100755 --- a/scripts/lock +++ b/scripts/lock @@ -1,2 +1,6 @@ #!/bin/bash -/home/yigit/.scripts/pacontrol.sh open-mute && /home/yigit/.scripts/dunst_toggle.sh -s && betterlockscreen -l -t 'Stay the fuck out!' && /home/yigit/.scripts/dunst_toggle.sh -e && /home/yigit/.scripts/pacontrol.sh toggle-mute +/home/yigit/.scripts/pacontrol.sh open-mute +/home/yigit/.scripts/dunst_toggle.sh -s +betterlockscreen -l -t 'Stay the fuck out!' +/home/yigit/.scripts/dunst_toggle.sh -e +/home/yigit/.scripts/pacontrol.sh toggle-mute diff --git a/scripts/status-bar/battery b/scripts/status-bar/battery index ef157ec6..906989fc 100755 --- a/scripts/status-bar/battery +++ b/scripts/status-bar/battery @@ -12,13 +12,16 @@ ramp70= ramp80= ramp90= ramp100= - +ac=ﮣ if [ "$NO_BAT" = true ] ; then - echo "^c#ebcb8b^ﮣ^d^ " + echo "^c#ebcb8b^$ac^d^ " else export bat=$(cat /sys/class/power_supply/BAT0/capacity) export status=$(cat /sys/class/power_supply/BAT0/status) - if [[ $bat -lt 10 ]]; then + export plugged=$(cat /sys/class/power_supply/AC/online) + if [[ $plugged == "1" ]]; then + echo "^c#ebcb8b^$ac^d^" + elif [[ $bat -lt 10 ]]; then echo "^c#ebcb8b^$ramp10^d^ $bat% " elif [[ $bat -lt 20 ]]; then echo "^c#ebcb8b^$ramp20^d^ $bat% " diff --git a/scripts/status-bar/date b/scripts/status-bar/date new file mode 100755 index 00000000..975db9f2 --- /dev/null +++ b/scripts/status-bar/date @@ -0,0 +1,8 @@ +#! /bin/sh + +icon= + +cmd=$(date +"%h %e") + +#echo "$ifg $icon $tfg$cmd" +echo -n "^c#0f111a^^b#88c0d0^ $icon $cmd ^d^" diff --git a/suckless/dwm/keybind.h b/suckless/dwm/keybind.h index 252ac3ca..ce934a9b 100644 --- a/suckless/dwm/keybind.h +++ b/suckless/dwm/keybind.h @@ -28,6 +28,10 @@ static const char *prev[] = {"/usr/bin/playerctl","previous",NULL}; static const char *next[] = {"/usr/bin/playerctl","next",NULL}; static const char *outmenu[] = {"/home/yigit/.scripts/dmenu-logout"}; +static const char *screenshot[] = { "scrot", "/tmp/%Y-%m-%d-%s_$wx$h.png", "-e","xclip -selection clipboard -target image/png -i $f; cp $f ~/Pictures/Screenshots;notify-send \"SNAP\" \"$f\"", NULL }; +static const char *windowshot[] = { "scrot", "-u", "/tmp/%Y-%m-%d-%s_$wx$h.png", "-e","xclip -selection clipboard -target image/png -i $f; cp $f ~/Pictures/Screenshots;notify-send \"SNAP\" \"$f\"", NULL }; +static const char *simcrop[] = {"simcrop","-fc","-sc",NULL}; + static const char *notification_off[] = {"/home/yigit/.scripts/dunst_toggle.sh","-s",NULL}; static const char *notification_on[] = {"/home/yigit/.scripts/dunst_toggle.sh", "-e",NULL}; @@ -40,15 +44,10 @@ static const char *bwmenu[] = {"/home/yigit/.scripts/password_manager", NULL}; static const char *network_manager[] = {"/home/yigit/.scripts/networkmanager_dmenu"}; - +static const char *mconnect[] = {"/home/yigit/.scripts/dmenu-mconnect"}; +static const char *genpwd[] = {"sh", "-c","/sbin/bw generate | xclip" }; static const char *trackpad[] = {"/home/yigit/.scripts/toggle_touchpad.sh"}; - -static const char *kdeconnect[] = {"/home/yigit/.local/bin/dmenu_kdeconnect.sh", NULL}; - static const char *bluetooth[] = {"/home/yigit/.scripts/dmenu-bluetooth", NULL}; - -static const char *screenshot[] = { "scrot","-d","3", "%Y-%m-%d-%s_$wx$h.jpg", "-e","xclip -selection clipboard -t image/jpg < $f; mv $f ~/Pictures/Screenshots/;dunstify --icon='/home/yigit/.icons/Numix-Circle/48/apps/camera.svg' -a 'SNAP' 'Screenshot taken'", NULL }; static const char *windowshot[] = { "scrot", "-u", "-d","3", "%Y-%m-%d-%s_$wx$h.jpg", "-e","xclip -selection clipboard -t image/jpg < $f; mv $f ~/Pictures/Screenshots/;dunstify --icon='/home/yigit/.icons/Numix-Circle/48/apps/camera.svg' -a 'SNAP' 'Screenshot taken'", NULL }; - static const char *url[] = {"/home/yigit/.scripts/dmenu_surf", NULL}; static const char *surf[] = {"/home/yigit/.scripts/tabbed_surf", NULL}; static const char *google[] = {"/home/yigit/.scripts/menu-surfraw", "google", NULL}; @@ -108,7 +107,7 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_t, spawn, {.v = trackpad} }, { MODKEY, XK_x, spawn, {.v = lock } }, { MODKEY, XK_c, spawn, {.v = clipmenu } }, - { MODKEY|ShiftMask, XK_p, spawn, {.v = kdeconnect } }, + { MODKEY|ShiftMask, XK_p, spawn, {.v = genpwd} }, { MODKEY|ShiftMask, XK_b, spawn, {.v = bluetooth } }, { MODKEY|Mod1Mask, XK_n, spawn, {.v = network_manager} }, /*Spiral*/ { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } }, @@ -121,9 +120,11 @@ static Key keys[] = { { 0, XF86XK_AudioNext, spawn, {.v = next } }, { 0, XK_Print, spawn, {.v = screenshot } }, { MODKEY, XK_Print, spawn, {.v = windowshot } }, + { MODKEY|ShiftMask, XK_e, spawn, {.v = simcrop } }, { MODKEY, XK_u, spawn, {.v = url} }, { MODKEY, XK_g, spawn, {.v = google} }, { MODKEY|ShiftMask, XK_c, spawn, {.v = online_class} }, + { MODKEY|ShiftMask, XK_m, spawn, {.v = mconnect} }, { MODKEY, XK_y, spawn, {.v = youtube} }, { MODKEY, XK_s, togglescratch, {.ui = 0 } }, { MODKEY|ShiftMask, XK_s, togglescratch, {.ui = 1 } }, diff --git a/suckless/dwm/rules.h b/suckless/dwm/rules.h index b372a9c7..72e309fc 100644 --- a/suckless/dwm/rules.h +++ b/suckless/dwm/rules.h @@ -26,11 +26,13 @@ static const Rule rules[] = { RULE(.instance = "spterm", .tags = SPTAG(0), .isfloating = 1) RULE(.class = "spfeh", .tags = SPTAG(1), .isfloating = 1) RULE(.instance = "spmutt", .tags = SPTAG(2), .isfloating = 1) - RULE(.class = "ranger", 0, .isfloating = 1) + RULE(.class = "ranger", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") RULE(.class = "vim", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") RULE(.class = "stpulse", 0, .isfloating = 1, .floatpos="50% 50% 800W 560H") RULE(.class = "mpv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") RULE(.instance = "sxiv", 0, .isfloating = 1, .floatpos="100% 1% 600W 350H") RULE(.class = "neomutt-send", 0, .isfloating = 1, .floatpos="50% 50% 1000W 700H") - RULE(.class = "neomutt-send", 0, .isfloating = 1, .floatpos="50% 50% 250W 600H") + RULE(.class = "neomutt-send", 0, .isfloating = 1, .floatpos="50% 50% 250W 600H") // Why did I put this here? +// RULE(.title = "SimCrop", 0, .isfloating = 1, .floatpos="50% 50% 800W 500H") + }; diff --git a/suckless/dwmblocks/config.h b/suckless/dwmblocks/config.h index be4968a3..16e31021 100644 --- a/suckless/dwmblocks/config.h +++ b/suckless/dwmblocks/config.h @@ -13,6 +13,7 @@ static Block blocks[] = { { "", PATH("network"), 120, 13}, { "", PATH("battery"), 60, 12}, { "", PATH("time"), 30, 11}, + { "", PATH("date"), 240, 22}, }; //Sets delimiter between status commands. NULL character ('\0') means no delimiter. diff --git a/xorg/xinitrc b/xorg/xinitrc index cb151292..ebf7eae3 100755 --- a/xorg/xinitrc +++ b/xorg/xinitrc @@ -60,7 +60,10 @@ firefox-developer-edition app.daily.dev& bitwarden-desktop & curl 'http://yeetclock/setcolor?R=136&G=192&B=208' & ~/.keyboard -#thunderbird & +xbanish -t 2000 -s & + +pactl upload-sample /usr/share/sounds/freedesktop/stereo/bell.oga x11-bell +pactl load-module module-x11-bell sample=x11-bell display=$DISPLAY dunst & diff --git a/zsh/aliases b/zsh/aliases index 834265fb..f299f8b5 100755 --- a/zsh/aliases +++ b/zsh/aliases @@ -13,6 +13,7 @@ alias tn="TERM=screen-256color-bce tmux new -s " alias tat="TERM=screen-256color-bce tmux a -t " alias yain="yay -Syu " alias ls="ls --color" +alias yay="yay --sudoloop" # Suffix aliases alias -g G=" | rg"