diff --git a/config/.ssh/config b/config/.ssh/config index 0475062..79d88ba 100644 --- a/config/.ssh/config +++ b/config/.ssh/config @@ -30,7 +30,7 @@ Host hetzner User stev IdentityFile ~/.ssh/hetzner Host backup - Hostname 192.168.1.108 + Hostname 192.168.1.23 User stev IdentityFile ~/.ssh/uukey-ed25519 Host desktop diff --git a/ddeps.sh b/ddeps.sh index e126e8c..c258995 100755 --- a/ddeps.sh +++ b/ddeps.sh @@ -12,33 +12,32 @@ function dpkg_url() { } # installing base dependencies -sudo apt-get -my install \ - git \ - vim \ - stow \ - etckeeper \ - tmux \ - zsh \ - powerline\ - htop \ - mc \ - curl \ - aptitude \ - nnn \ +sudo apt -my install \ ack \ - fzf \ - ripgrep \ - grc \ - fd-find \ - ncdu \ - exa \ - trash-cli \ - bat \ - nala \ + aptitude \ + curl \ duf \ - tree \ + etckeeper \ + fzf \ + git \ + grc \ + htop \ + lua5.1 \ + luarocks \ make \ - wget + mc \ + nala \ + ncdu \ + nnn \ + powerline\ + ripgrep \ + stow \ + tmux \ + trash-cli \ + tree \ + vim \ + wget \ + zsh read -n1 -p $'\nDoes this system need a ssh server?\n' REPLY if [[ $REPLY == [Yy] ]]; then @@ -52,9 +51,19 @@ read -n1 -p $'\nDoes this system have a GUI?\n' REPLY #This section installs software outside apt dpkg_url https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb -dpkg_url https://github.com/bootandy/dust/releases/download/v1.1.2/du-dust_1.1.2-1_amd64.deb -dpkg_url https://github.com/charmbracelet/glow/releases/download/v2.1.0/glow_2.1.0_amd64.deb -dpkg_url https://github.com/ClementTsang/bottom/releases/download/0.10.2/bottom_0.10.2-1_amd64.deb +git config --global core.pager delta +git config --global interactive.diffFilter 'delta --color-only' +git config --global delta.navigate true +git config --global merge.conflictStyle zdiff3 +dpkg_url https://github.com/bootandy/dust/releases/download/v1.2.3/du-dust_1.2.3-1_amd64.deb +dpkg_url https://github.com/charmbracelet/glow/releases/download/v2.1.1/glow_2.1.1_amd64.deb +dpkg_url https://github.com/ClementTsang/bottom/releases/download/0.11.1/bottom_0.11.1-1_amd64.deb +dpkg_url https://github.com/sharkdp/bat/releases/download/v0.25.0/bat_0.25.0_amd64.tmp_deb +dpkg_url https://github.com/sharkdp/fd/releases/download/v10.3.0/fd_10.3.0_amd64.deb -dpkg_url https://github.com/sharkdp/bat/releases/download/v0.25.0/bat_0.25.0_amd64.deb -dpkg_url https://github.com/muesli/duf/releases/download/v0.8.1/duf_0.8.1_linux_amd64.deb +echo "Install lazygit" +LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | \grep -Po '"tag_name": *"v\K[^"]*') +curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" +tar xf lazygit.tar.gz lazygit +sudo install lazygit -D -t /usr/local/bin/ +trash lazygit lazygit.tar.gz diff --git a/init.sh b/init.sh index c797f13..c268c71 100755 --- a/init.sh +++ b/init.sh @@ -76,7 +76,7 @@ git_user () { #install neovim & nvchad echo "Installing neovim & Friends!" -bash ./nvchad.sh +bash ./lazyvim.sh #install fonts for terminal fonts () { diff --git a/lazyvim.sh b/lazyvim.sh new file mode 100755 index 0000000..4881ffd --- /dev/null +++ b/lazyvim.sh @@ -0,0 +1,21 @@ +#!/bin/bash +echo "Setting up Vim Sensible" +trash ~/.vim/ +mkdir -p ~/.vim/pack/tpope/start +git clone https://tpope.io/vim/sensible.git ~/.vim/pack/tpope/start + +echo "Install Neovim" +mkdir -v ~/bin +if [[ -f "/usr/bin/neovim" ]]; then + trash ~/bin/nvim + curl -L https://github.com/neovim/neovim/releases/download/v0.11.2/nvim-linux-x86_64.appimage -o ~/bin/nvim + chmod u+x ~/bin/nvim +fi + +echo "Install Lazyvim" +# https://nvchad.com/docs/quickstart/install +trash ~/.config/nvim/ +trash ~/.local/state/nvim/ +trash ~/.local/share/nvim/ +trash ~/.cache/nvim +git clone https://github.com/LazyVim/starter ~/.config/nvim diff --git a/scripts/server_bin/special_twitt.sh b/scripts/server_bin/special_twitt.sh index c149e5f..e98aa73 100755 --- a/scripts/server_bin/special_twitt.sh +++ b/scripts/server_bin/special_twitt.sh @@ -52,3 +52,4 @@ gallery-dl --sleep 4 --abort 3 https://x.com/DoggoStahl gallery-dl --sleep 4 --abort 3 https://x.com/AidanEnormouse gallery-dl --sleep 4 --abort 3 https://x.com/SmileyBots gallery-dl --sleep 4 --abort 3 https://x.com/Aquafighter_Dai +gallery-dl --sleep 4 --abort 3 https://x.com/acethefurri diff --git a/scripts/server_bin/update_onlyfans.sh b/scripts/server_bin/update_onlyfans.sh index 4f42b83..2a29a0b 100755 --- a/scripts/server_bin/update_onlyfans.sh +++ b/scripts/server_bin/update_onlyfans.sh @@ -1,6 +1,12 @@ #!/bin/bash # docker pull ghcr.io/datawhores/of-scraper:latest + +export OF_DYNAMIC_GENERIC_URL="https://raw.githubusercontent.com/rafa-9/dynamic-rules/main/rules.json" +#export OF_DEVIINT_URL="" test -t 1 && USE_TTY="-it" -docker run ${USE_TTY} --rm --name=ofscraper -u 1000:1000 -v /home/stev/.config/ofscraper:/home/ofscraper/.config/ -v /home/stev/gallery-dl/onlyfans:/home/ofscraper/data \ + +docker run ${USE_TTY} --rm --name=ofscraper --env-file /home/stev/.config/ofscraper/ofscraper/env \ + -v /home/stev/.config/ofscraper:/home/ofscraper/.config/ -v /home/stev/gallery-dl/onlyfans:/home/ofscraper/data \ ghcr.io/datawhores/of-scraper:latest \ - ofscraper --output normal --action download --sort subscribed --post timeline,streams,messages,purchased -ts --username ALL + ofscraper --output NORMAL --log NORMAL --action download --sort subscribed --post timeline,streams,messages,purchased -ts --username ALL + diff --git a/scripts/server_bin/update_ytmusic.sh b/scripts/server_bin/update_ytmusic.sh new file mode 100755 index 0000000..287f388 --- /dev/null +++ b/scripts/server_bin/update_ytmusic.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd "/home/stev/Pictures/Music/Liked Music/" +yt-dlp --embed-metadata --parse-metadata "playlist_index:%(track_number)s" -x --audio-format mp3 --audio-quality 5 --embed-thumbnail --cookies-from-browser firefox --download-archive index.txt --break-on-existing 'https://music.youtube.com/playlist?list=LM' diff --git a/udeps.sh b/udeps.sh index b85a3b3..07b7848 100755 --- a/udeps.sh +++ b/udeps.sh @@ -6,60 +6,78 @@ function dpkg_url() { local args=${@:2} wget -q --show-progress -O $tmp_deb $src_url && - sudo dpkg -i $tmp_deb $args && - { rm -f $tmp_deb; true; } || # commands above succeeded, remove tmp file - { rm -f $tmp_deb; false; } # commands above failed, remove tmp file anyway + sudo dpkg -i $tmp_deb $args && + { + rm -f $tmp_deb + true + } || # commands above succeeded, remove tmp file + { + rm -f $tmp_deb + false + } # commands above failed, remove tmp file anyway } # installing base dependencies sudo apt -my install \ - git \ - vim \ - stow \ - etckeeper \ - tmux \ - zsh \ - powerline\ - htop \ - mc \ - curl \ - aptitude \ - nnn \ ack \ + aptitude \ + curl \ + etckeeper \ fzf \ - ripgrep \ + git \ grc \ - fd-find \ - ncdu \ - tree \ - trash-cli \ - nala \ + htop \ libfuse2 \ + lua5.1 \ + luarocks \ make \ + mc \ + nala \ + ncdu \ + nnn \ + powerline \ + ripgrep \ shellcheck \ - lua5.2 + stow \ + tmux \ + trash-cli \ + tree \ + vim \ + wget \ + zsh -release=`lsb_release -cs` +release=$(lsb_release -cs) if [[ $release == jammy || $release == noble ]]; then sudo apt install \ - bat \ duf \ btop fi read -n1 -p $'Does this system need a ssh server?\n' REPLY - if [[ $REPLY == [Yy] ]]; then - sudo apt install openssh-server fail2ban - fi +if [[ $REPLY == [Yy] ]]; then + sudo apt install openssh-server fail2ban +fi read -n1 -p $'\nDoes this system have a GUI?\n' REPLY - if [[ $REPLY == [Yy] ]]; then - sudo apt install synaptic flatpak - flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - fi +if [[ $REPLY == [Yy] ]]; then + sudo apt install synaptic flatpak + flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo +fi #This section installs software outside apt dpkg_url https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb -dpkg_url https://github.com/bootandy/dust/releases/download/v1.1.2/du-dust_1.1.2-1_amd64.deb -dpkg_url https://github.com/charmbracelet/glow/releases/download/v2.1.0/glow_2.1.0_amd64.deb -dpkg_url https://github.com/ClementTsang/bottom/releases/download/0.10.2/bottom_0.10.2-1_amd64.deb +git config --global core.pager delta +git config --global interactive.diffFilter 'delta --color-only' +git config --global delta.navigate true +git config --global merge.conflictStyle zdiff3 +dpkg_url https://github.com/bootandy/dust/releases/download/v1.2.3/du-dust_1.2.3-1_amd64.deb +dpkg_url https://github.com/charmbracelet/glow/releases/download/v2.1.1/glow_2.1.1_amd64.deb +dpkg_url https://github.com/ClementTsang/bottom/releases/download/0.11.1/bottom_0.11.1-1_amd64.deb +dpkg_url https://github.com/sharkdp/bat/releases/download/v0.25.0/bat_0.25.0_amd64.tmp_deb +dpkg_url https://github.com/sharkdp/fd/releases/download/v10.3.0/fd_10.3.0_amd64.deb +echo "Install lazygit" +LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | \grep -Po '"tag_name": *"v\K[^"]*') +curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" +tar xf lazygit.tar.gz lazygit +sudo install lazygit -D -t /usr/local/bin/ +trash lazygit lazygit.tar.gz