diff --git a/.gitmodules b/.gitmodules index 2b80f9d..3ee8c7f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "fish/.config/fish/nvm-wrapper"] - path = fish/.config/fish/nvm-wrapper - url = https://github.com/passcod/nvm-fish-wrapper - [submodule "vim/.vim/bundle/quick-scope"] path = vim/.vim/bundle/quick-scope url = https://github.com/unblevable/quick-scope @@ -17,18 +13,12 @@ [submodule "vim/.vim/bundle/vim-gitgutter"] path = vim/.vim/bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter -[submodule "fzf/.fzf"] - path = fzf/.fzf - url = https://github.com/junegunn/fzf [submodule "vim/.vim/bundle/vim-lastplace"] path = vim/.vim/bundle/vim-lastplace url = https://github.com/farmergreg/vim-lastplace [submodule "vim/.vim/bundle/vim-fish"] path = vim/.vim/bundle/vim-fish url = https://github.com/dag/vim-fish -[submodule "lf/lf"] - path = lf/lf - url = https://github.com/gokcehan/lf [submodule "vim/.vim/bundle/vim-airline"] path = vim/.vim/bundle/vim-airline url = https://github.com/vim-airline/vim-airline diff --git a/Makefile b/Makefile index 7bb60c8..ab4b509 100644 --- a/Makefile +++ b/Makefile @@ -51,12 +51,6 @@ fish: @printf "$(YELLOW)--- fish -----------------------------------------------\n$(RESET)" stow -t "$$HOME" fish -fzf: fish - @printf "$(YELLOW)--- fzf ------------------------------------------------\n$(RESET)" - git submodule update --remote --init -- fzf/.fzf - stow -t "$$HOME" fzf - ~/.fzf/install --no-bash --no-zsh --no-completion --no-update-rc --key-bindings --64 - git: @printf "$(YELLOW)--- git ------------------------------------------------\n$(RESET)" stow -t "$$HOME" git @@ -67,13 +61,6 @@ gnupg: chmod 700 "$$HOME/.gnupg" stow -t "$$HOME" gnupg -lf: - @printf "$(YELLOW)--- lf --------------------------------------------------\n$(RESET)" - git submodule update --remote --init -- lf/lf - cd lf/lf; CGO_ENABLED=0 go build -ldflags="-s -w" -o ../../bin/bin/lf - mkdir -p ~/.trash - stow -t "$$HOME" lf - mutt: @printf "$(YELLOW)--- mutt -----------------------------------------------\n$(RESET)" stow -t "$$HOME" mutt @@ -97,4 +84,4 @@ nuke: @printf "$(RED)--- nuking existing files ------------------------------\n$(RESET)" rm -rf ~/.byobu ~/.config/fish ~/.fzf ~/.bash* -.PHONY: bash fzf fish git vim nvim lf mutt byobu weechat gnupg bin clean install nuke Windows Linux Other +.PHONY: bash fish git vim nvim mutt byobu weechat gnupg bin clean install nuke Windows Linux Other diff --git a/README.md b/README.md index 9507ee9..4a001e0 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,6 @@ it includes configs for my most frequently used tools. ### steps to install on debian and derivatives -1. `apt install make stow fish git byobu vim` +1. `apt install make stow fish git byobu vim ripgrep fzf` 1. `make nuke install` - note that nuke removes existing files in your $HOME diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index d16de53..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -DISTRO="$1" -RELEASE="$2" -PKGLIST="${DISTRO}.pkglist" - -[ -z $DISTRO -o -z $RELEASE ] && \ - printf "usage: sudo %s \n" "$0" && exit 1 - -[[ $(id -u) != 0 ]] && \ - printf "re-run this as root\n" && exit 1 - -# make sure we have sources -printf "deb https://mirror.bhh.sh/syncthing/ syncthing stable\n" \ - > /etc/apt/sources.list.d/syncthing.list -printf "deb https://mirror.bhh.sh/weechat/%s %s main \n" "${DISTRO}" "${RELEASE}" \ - > /etc/apt/sources.list.d/weechat.list - -apt update -apt upgrade -y -apt full-upgrade -y - -apt install -y $(xargs < ${PKGLIST}) - - -printf "install makefiles? [y/n]" -read answer - -[[ "$answer" = "y" ]] && \ - make nuke install - diff --git a/debian.pkglist b/debian.pkglist deleted file mode 100644 index 79c0f5c..0000000 --- a/debian.pkglist +++ /dev/null @@ -1,265 +0,0 @@ -adduser -ansible -apt -apt-listchanges -apt-utils -avahi-daemon -base-files -base-passwd -bash -bash-completion -bsdgames -bsdmainutils -bsdutils -build-essential -busybox -byobu -bzip2 -cloc -console-setup -coreutils -cpio -cron -curl -dash -dbus -debconf -debconf-i18n -debian-archive-keyring -debian-faq -debianutils -desktop-base -diffutils -discover -dmidecode -dmsetup -dnsutils -doc-debian -dpkg -e2fslibs -e2fsprogs -erlang -file -file-roller -findutils -firmware-iwlwifi -fish -gcc-6-base -gedit-plugins -gettext-base -gimp -git -gnupgv2 -gnupg-agent -gpgv -grep -groff-base -gzip -hdparm -hostname -ifupdown -init -initramfs-tools -init-system-helpers -inkscape -installation-report -iproute2 -iptables -iputils-ping -isc-dhcp-client -isc-dhcp-common -keepassxc -keyboard-configuration -kmod -krb5-locales -laptop-detect -less -libacl1 -libapparmor1 -libapt-inst2.0 -libapt-pkg5.0 -libassuan0 -libattr1 -libaudit1 -libaudit-common -libblkid1 -libbsd0 -libbz2-1.0 -libc6 -libcap2 -libcap-ng0 -libc-bin -libclass-isa-perl -libcomerr2 -libcryptsetup4 -libdb5.3 -libdebconfclient0 -libdevmapper1.02.1 -libdns-export162 -libelf1 -libestr0 -libfastjson4 -libfdisk1 -libffi6 -libgcc1 -libgcrypt20 -libgdbm3 -libgmp10 -libgnutls30 -libgpg-error0 -libgsf-bin -libgtk2-perl -libhogweed4 -libidn11 -libidn2-0 -libip4tc0 -libip6tc0 -libiptc0 -libisc-export160 -libkmod2 -libksba8 -liblocale-gettext-perl -liblockfile-bin -liblogging-stdlog0 -liblognorm5 -liblz4-1 -liblzma5 -libmnl0 -libmount1 -libncurses5 -libncursesw5 -libnetfilter-conntrack3 -libnettle6 -libnewt0.52 -libnfnetlink0 -libnpth0 -libp11-kit0 -libpam0g -libpam-modules -libpam-modules-bin -libpam-runtime -libpam-systemd -libpcre3 -libpipeline1 -libpopt0 -libprocps6 -libproxy1-plugin-networkmanager -libpsl5 -libreadline7 -libseccomp2 -libselinux1 -libsemanage1 -libsemanage-common -libsepol1 -libslang2 -libsmartcols1 -libsqlite3-0 -libss2 -libssl1.0.2 -libssl1.1 -libstdc++6 -libswitch-perl -libsystemd0 -libtasn1-6 -libtext-charwidth-perl -libtext-iconv-perl -libtext-wrapi18n-perl -libtinfo5 -libudev1 -libunistring0 -libustr-1.0-1 -libuuid1 -libxapian30 -libxtables12 -linux-image-amd64 -locales -login -logrotate -lsb-base -lsof -make -man-db -manpages -mawk -mime-support -minetest -mosh -mount -mtr -mumble -mutt -nano -ncurses-base -ncurses-bin -ncurses-term -neofetch -neovim -netbase -netcat-traditional -network-manager-gnome -nodejs -npm -nvidia-driver -openssh-client -orca -passwd -pciutils -perl -perl-base -perl-modules-5.24 -pinentry-curses -procps -python -python2.7 -python3-pip -python3-reportbug -python3-uno -python-minimal -python-pip -readline-common -reportbug -rhythmbox -rhythmbox-plugin-cdrecorder -rhythmbox-plugins -rsyslog -rustc -scdaemon -seahorse -sed -sensible-utils -shotwell -simple-scan -snapd -stow -syncthing -systemd -systemd-sysv -sysvinit-utils -tar -task-desktop -task-english -tasksel -tasksel-data -telnet -thunderbird -totem-plugins -traceroute -transmission-gtk -tzdata -ucf -udev -usbutils -util-linux -vim -vim-common -vim-tiny -vinagre -vino -wamerican -wget -whiptail -xdg-user-dirs-gtk -xxd -xz-utils -yubikey-personalization -zlib1g diff --git a/fzf/.fzf b/fzf/.fzf deleted file mode 160000 index 08a6fd4..0000000 --- a/fzf/.fzf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 08a6fd4ad4334b00a08427b335caa5476b8d789f diff --git a/lf/lf b/lf/lf deleted file mode 160000 index 50dd374..0000000 --- a/lf/lf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50dd374f77049c167952ca917148bd357f5731e8 diff --git a/ubuntu.pkglist b/ubuntu.pkglist deleted file mode 100644 index 54a6ad9..0000000 --- a/ubuntu.pkglist +++ /dev/null @@ -1,153 +0,0 @@ -apt-transport-https -base-passwd -bison -build-essential -byobu -clang-7 -composer -curl -dash -devscripts -diffutils -docker.io -figlet -findutils -finger -firefox-locale-en -fish -flex -fonts-indic -fonts-ipafont-gothic -fonts-ipafont-mincho -git -gnome-tweak-tool -gperf -gpg -grep -grub-common -grub-efi-amd64-signed -grub-gfxpayload-lists -grub-pc -grub-pc-bin -grub2-common -gsettings-desktop-schemas-dev -gzip -hostname -htop -init -keepassxc -language-pack-en -language-pack-en-base -language-pack-gnome-en -language-pack-gnome-en-base -libasound2-dev -libavcodec-dev -libavformat-dev -libavutil-dev -libcap-dev -libcups2-dev -libdebconfclient0 -libdrm-dev -libegl1-mesa-dev -libelf-dev -libevent-dev -libexif-dev -libffi-dev -libflac-dev -libgbm-dev -libgcrypt20-dev -libgl1-mesa-dev -libgles2-mesa-dev -libglew-dev -libglib2.0-dev -libglu1-mesa-dev -libgtk-3-dev -libhunspell-dev -libicu-dev -libjpeg-dev -libjs-jquery-flot -libjsoncpp-dev -libkrb5-dev -liblcms2-dev -libminizip-dev -libmodpbase64-dev -libnspr4-dev -libnss3-dev -libopenjp2-7-dev -libopus-dev -libpam0g-dev -libpci-dev -libpng-dev -libpulse-dev -libre2-dev -libsnappy-dev -libspeechd-dev -libsrtp0-dev -libudev-dev -libusb-1.0-0-dev -libva-dev -libvpx-dev -libwebp-dev -libxml2-dev -libxslt1-dev -libxss-dev -libxt-dev -libxtst-dev -linux-generic -linux-headers-generic -linux-signed-generic -lld-7 -llvm-7-dev -login -lxd -make -mesa-common-dev -mokutil -mosh -ncdu -ncurses-base -ncurses-bin -neovim -ninja-build -nodejs -npm -nvidia-driver-415 -os-prober -packaging-dev -php-cli -python-jinja2 -python3 -python3-pip -python3-virtualenv -rename -scdaemon -shim-signed -sqlite3 -steam:i386 -stow -syncthing -thunderbird -ubuntu-desktop -ubuntu-minimal -ubuntu-restricted-addons -ubuntu-standard -ubuntu-wallpapers -ungoogled-chromium -ungoogled-chromium-common -ungoogled-chromium-driver -ungoogled-chromium-l10n -ungoogled-chromium-sandbox -ungoogled-chromium-shell -valgrind -vim -vlc -vscodium -weechat-curses -weechat-perl -weechat-plugins -weechat-python -weechat-ruby -xclip -xvfb -yasm -yubikey-personalization