diff options
| -rwxr-xr-x | install.sh | 80 | ||||
| l--------- | pix/.local/share/wallpapers/bg | 1 | ||||
| -rwxr-xr-x | scripts/.local/bin/remaps | 2 | ||||
| -rwxr-xr-x | x11/.xinitrc | 6 |
4 files changed, 60 insertions, 29 deletions
@@ -3,16 +3,16 @@ SRCDIR="$HOME/.local/src/" rm ~/.config/mimeapps.list -rm ~/.local/share/wallpapers/bg +rm ~/.config/user-dirs.dirs mkdir -p "$SRCDIR" -sudo apt-get -y install stow -stow $(ls -d */) +if [ -z $(command -v stow) ]; then + sudo apt-get -y install stow +fi -ln -sf ~/.local/share/wallpapers/mountains.jpg ~/.local/share/wallpapers/bg +stow -R -v $(ls -d */) -# update nvim plugins -nvim +'hi NormalFloat guibg=#1e222a' +PackerSync +ln -sf ~/.local/share/wallpapers/mountains.jpg ~/.local/share/wallpapers/bg # yes/no dialog # https://gist.github.com/davejamesmiller/1965569 @@ -165,61 +165,88 @@ if [ "$1" = "-i" ]; then # required for ly sudo apt-get install build-essential libpam0g-dev libxcb-xkb-dev - git clone --recurse-submodules https://github.com/nullgemm/ly.git + if [ ! -d ly ]; then + git clone --recurse-submodules https://github.com/nullgemm/ly.git + fi # required for st, dwm and dwmblocks sudo apt-get install libfontconfig-dev libx11-dev libxft-dev # required for dwm sudo apt-get install libx11-xcb-dev libxcb-res0-dev - git clone https://github.com/ivan-boikov/dwm - git clone https://github.com/ivan-boikov/dwmblocks - git clone https://github.com/lukesmithxyz/st + if [ ! dwm ]; then + git clone https://github.com/ivan-boikov/dwm + fi + if [ ! dwmblocks ]; then + git clone https://github.com/ivan-boikov/dwmblocks + fi + if [ ! st ]; then + git clone https://github.com/lukesmithxyz/st + fi # required for neovim sudo apt-get install ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip curlgit - clone https://github.com/neovim/neovim - git clone https://github.com/jarun/nnn + if [! -d neovim ]; then + git clone https://github.com/neovim/neovim + fi + + # required for nnn + sudo apt-get install pkg-config libncursesw5-dev libreadline-dev + if [ ! -d nnn ]; then + git clone https://github.com/jarun/nnn + fi # required for pamixer sudo apt-get install meson libboost-dev libpulse0 libpulse-dev - git clone https://github.com/cdemoulins/pamixer + if [ ! -d pamixer ]; then + git clone https://github.com/cdemoulins/pamixer + fi # required for devour sudo apt-get install libx11-dev # is it necessary with dwm swallow patch? - git clone https://github.com/salman-abedin/devour + if [ ! -d devour ]; then + git clone https://github.com/salman-abedin/devour + fi # dragon sudo apt-get install libgtk-3-dev - git clone https://github.com/mwh/dragon + if [ ! -d dragon ]; then + git clone https://github.com/mwh/dragon + fi # digimend drivers if ask "Install DIGImend drivers?"; then - cd "$SRCDIR" sudo apt-get install "linux-headers-$(uname -r)" - git clone https://github.com/DIGImend/digimend-kernel-drivers + if [ ! -d digimend-kernel-drivers ]; then + git clone https://github.com/DIGImend/digimend-kernel-drivers + fi fi # xournalpp if ask "Install xournalpp?"; then sudo apt-get install "linux-headers-$(uname -r)" dkms sudo apt-get install cmake libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev libcppunit-dev dvipng texlive libxml2-dev liblua5.3-dev libzip-dev librsvg2-dev gettext lua-lgi - cd "$SRCDIR" - git clone https://github.com/xournalpp/xournalpp + if [ ! -d xournalpp ]; then + git clone https://github.com/xournalpp/xournalpp + fi fi - # required for nnn - sudo apt-get install pkg-config libncursesw5-dev libreadline-dev - # required for oomox if ask "Install oomox theming engine?"; then sudo apt-get install python3-gi python3-gi-cairo libglib2.0-bin libgdk-pixbuf2.0-dev libxml2-utils x11-xserver-utils gir1.2-gtk-3.0 gir1.2-glib-2.0 gir1.2-pango-1.0 gir1.2-gdkpixbuf-2.0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf bash bc sed grep parallel sassc libsass1 imagemagick optipng librsvg2-bin inkscape python3-pillow python3-pystache python3-yaml make automake libgtk-3-dev - cd "$SRCDIR" - git clone https://github.com/themix-project/oomox --recursive + if [ ! -d oomox ]; then + git clone https://github.com/themix-project/oomox --recursive + fi fi umi_all +fi + +if [ "$1" = "-u" ]; then + umi_all +fi +if [ "$1" = "-f" ]; then # cleaning Firefox, schizo-style # https://12bytes.org/articles/tech/firefox/firefoxgecko-configuration-guide-for-privacy-and-performance-buffs/ if ask "Schizofy firefox?"; then @@ -242,6 +269,7 @@ if [ "$1" = "-i" ]; then fi fi -if [ "$1" = "-u" ]; then - umi_all +if [ "$1" = "nvim" ]; then + # update nvim plugins + nvim +'hi NormalFloat guibg=#1e222a' +PackerSync fi diff --git a/pix/.local/share/wallpapers/bg b/pix/.local/share/wallpapers/bg new file mode 120000 index 0000000..04f15d3 --- /dev/null +++ b/pix/.local/share/wallpapers/bg @@ -0,0 +1 @@ +/home/ivan/.local/share/wallpapers/mountains.jpg
\ No newline at end of file diff --git a/scripts/.local/bin/remaps b/scripts/.local/bin/remaps index 262b70e..de83314 100755 --- a/scripts/.local/bin/remaps +++ b/scripts/.local/bin/remaps @@ -32,3 +32,5 @@ xset r rate 200 75 -option compose:rctrl \ -option nbsp:level3n \ -option terminate:ctrl_alt_bkspc + +notify-send "Keyboard remapped" diff --git a/x11/.xinitrc b/x11/.xinitrc index 6e48db5..ab6826a 100755 --- a/x11/.xinitrc +++ b/x11/.xinitrc @@ -14,9 +14,7 @@ else . "$HOME/.xprofile" fi -setbg & - -picom & +compton & firefox & # delay thunderbird to allow protonmail initialize and avoid thunderbirds' "no connection to 127.0.0.1" protonmail-bridge --no-window & ( sleep 5 && thunderbird & ) @@ -25,6 +23,8 @@ telegram-desktop & redshift -l40:2 & syncthing & xfce4-power-manager & +$HOME/.local/bin/remaps & +setbg & dwmblocks & |