From 1c0e61cb2fe7d6adb547ffff7cc9d3f7f69d343c Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sat, 5 Jun 2021 22:00:25 +0300 Subject: [PATCH] setup: revive nnn.sh setup script Update READE, delete youbest shell alias --- README.md | 14 ++++++++------ deploy.sh | 6 +++--- home/.bashrc-bloated | 3 +-- home/.config/fish/conf.d/aliases.fish | 3 +-- home/.config/gallery-dl/config.json | 15 --------------- home/.config/zsh/aliases.zsh | 3 +-- home/.local/share/zsh/abbreviations | 3 +-- setup/nnn.sh | 17 +++++++++++++++++ 8 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 setup/nnn.sh diff --git a/README.md b/README.md index 161911f..96d9b25 100644 --- a/README.md +++ b/README.md @@ -24,18 +24,17 @@ ### :clipboard: TODO -- [ ] ~~[Material](https://material-theme.site/) / [Ayu](https://github.com/ayu-theme/ayu-colors) palette~~ -- [ ] ~~[dotdrop](https://github.com/deadc0de6/dotdrop)~~ +- [ ] ~~Additional palette: [Material](https://material-theme.site/) / [Ayu](https://github.com/ayu-theme/ayu-colors)~~ +- [ ] ~~[dotdrop](https://github.com/deadc0de6/dotdrop)~~ / ~~Org Babel~~ / Ansible - [x] Migrate zsh to [zinit](https://github.com/zdharma/zinit) - [x] Wayland compositors -- [ ] ~~ion~~ / oksh / nushell / oil / xonsh / ~~elvish~~ / oh +- [ ] ~~[ion](https://github.com/redox-os/ion)~~ / [oksh](https://github.com/ibara/oksh) / [nushell](https://www.nushell.sh/) / [oil](https://www.oilshell.org/) / [xonsh](https://xon.sh/) / ~~[elvish](https://elv.sh/)~~ / [oh](https://github.com/michaelmacinnis/oh) - [ ] NixOS / Guix / Gentoo / FreeBSD - [ ] New Neovim config in Lua - [ ] Independent ~/.emacs.d - [ ] [kakoune](https://github.com/mawww/kakoune) / [lite-xl](https://github.com/franko/lite-xl) -- [ ] ~~Org Babel~~ / Ansible -### :star2: Credits & License +### :star2: Credits - [@ChristianChiarulli](https://github.com/ChristianChiarulli)'s Neovim config @@ -52,4 +51,7 @@ - [some fzf scripts](https://github.com/DanielFGray/fzf-scripts) - Artists for **kawaii** wallpapers: [@rimuu](https://rimuu.com/), [@hiten](https://www.pixiv.net/users/490219/artworks), [@Tiv](https://www.pixiv.net/en/users/35081), [@mery](https://www.pixiv.net/en/users/2750098), [@Mashima_saki](https://www.pixiv.net/en/users/18403608), [@Yuuki_Tatsuya](https://www.pixiv.net/en/users/27691), [@Bison倉鼠](https://www.pixiv.net/en/users/333556/artworks), [@Dana](https://twitter.com/hapong07), [@gomzi](https://twitter.com/gcmzi), [@Rella](https://twitter.com/Rellakinoko), [@dnwls3010](https://twitter.com/dnwls3010), [@Shigure_Ui](https://www.pixiv.net/en/users/431873), [@QuAn_](https://www.pixiv.net/en/users/6657532/artworks), [@杉87](https://twitter.com/k_su_keke1121), [@fuzichoco](https://twitter.com/fuzichoco), [@Astero](https://twitter.com/asteroid_ill), [@shin556](https://www.pixiv.net/en/users/642762), [@kaynimatic](https://twitter.com/kaynimatic) -- Others are under MIT license + +### :label: License + +MIT diff --git a/deploy.sh b/deploy.sh index b095aab..e462623 100755 --- a/deploy.sh +++ b/deploy.sh @@ -81,8 +81,8 @@ echo " " # Assests mkdir -pv ~/Pictures -cp -rfv ./home/Pictures/Animated/ ~/Pictures/Animated/ -cp -rfv ./home/Pictures/Wallpapers/ ~/Pictures/Wallpapers/ +cp -rfv ./home/Pictures/Animated/ ~/Pictures/Animated/ +cp -rfv ./home/Pictures/Wallpapers/ ~/Pictures/Wallpapers/ cp -rfv ./home/.local/share/fonts/ ~/.local/share/fonts/ # Scripts cp -rfv ./home/.local/bin/ ~/.local/bin/ @@ -120,7 +120,7 @@ cp -rfv ./home/.config/nvim/ ~/.config/nvim/ cp -rfv ./home/.config/pipe-viewer/ ~/.config/pipe-viewer/ cp -rfv ./home/.config/qutebrowser/ ~/.config/qutebrowser/ cp -rfv ./home/.config/ranger/ ~/.config/ranger/ -cp -rfv ./home/.config/tg/ ~/.config/tg/ +# cp -rfv ./home/.config/tg/ ~/.config/tg/ cp -rfv ./home/.config/tmux/ ~/.config/tmux/ cp -rfv ./home/.config/translate-shell/ ~/.config/translate-shell/ # cp -rfv ./home/.config/tridactyl/ ~/.config/tridactyl/ diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated index 24acd89..dc331cd 100644 --- a/home/.bashrc-bloated +++ b/home/.bashrc-bloated @@ -408,8 +408,7 @@ alias rsyncdir="rsync -avP --delete-after" # youtube-dl alias yoump3="youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail" alias youflac="youtube-dl --extract-audio --audio-format flac" -alias youbest="youtube-dl -f bestvideo+bestaudio" -alias youlist="youtube-dl -f bestvideo+bestaudio --yes-playlist" +alias youlist="youtube-dl --yes-playlist" # Lazy cd-ing alias ..='cd ..' diff --git a/home/.config/fish/conf.d/aliases.fish b/home/.config/fish/conf.d/aliases.fish index ec7fcc5..f07d9ea 100644 --- a/home/.config/fish/conf.d/aliases.fish +++ b/home/.config/fish/conf.d/aliases.fish @@ -38,8 +38,7 @@ abbr rsyncdir "rsync -avP --delete-after" # youtube-dl abbr yoump3 'youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail' abbr youflac 'youtube-dl --extract-audio --audio-format flac' -abbr youbest 'youtube-dl -f bestvideo+bestaudio' -abbr youlist 'youtube-dl -f bestvideo+bestaudio --yes-playlist' +abbr youlist 'youtube-dl --yes-playlist' # nnn if command -v nnn >/dev/null alias ncp="cat $XDG_CONFIG_HOME/nnn/.selection | tr '\0' '\n'" diff --git a/home/.config/gallery-dl/config.json b/home/.config/gallery-dl/config.json index e4df11a..d4c0519 100644 --- a/home/.config/gallery-dl/config.json +++ b/home/.config/gallery-dl/config.json @@ -77,21 +77,6 @@ } ] }, - "mangakakalot": { - "directory": [ - "Manga", - "{manga}", - "c{chapter} - {title}" - ], - "postprocessors": [ - { - "name": "zip", - "compression": "store", - "extension": "cbz", - "keep-files": false - } - ] - }, "manganelo": { "directory": [ "Manga", diff --git a/home/.config/zsh/aliases.zsh b/home/.config/zsh/aliases.zsh index 0af5cab..9e90c3c 100644 --- a/home/.config/zsh/aliases.zsh +++ b/home/.config/zsh/aliases.zsh @@ -31,8 +31,7 @@ alias rsyncdir="rsync -avP --delete-after" # youtube-dl alias yoump3="youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail" alias youflac="youtube-dl --extract-audio --audio-format flac" -alias youbest="youtube-dl -f bestvideo+bestaudio" -alias youlist="youtube-dl -f bestvideo+bestaudio --yes-playlist" +alias youlist="youtube-dl --yes-playlist" # Lazy cd-ing alias ..='cd ..' diff --git a/home/.local/share/zsh/abbreviations b/home/.local/share/zsh/abbreviations index d1eb0c6..6c8dbe6 100644 --- a/home/.local/share/zsh/abbreviations +++ b/home/.local/share/zsh/abbreviations @@ -11,7 +11,6 @@ abbr v="nvim" abbr vi='nvim -o "$(fzf)"' abbr e='emacs -nw' abbr em="emacsclient -c -a 'emacs'" -abbr youbest="youtube-dl -f bestvideo+bestaudio" abbr youflac="youtube-dl --extract-audio --audio-format flac" -abbr youlist="youtube-dl -f bestvideo+bestaudio --yes-playlist" +abbr youlist="youtube-dl --yes-playlist" abbr yoump3="youtube-dl --extract-audio --audio-format mp3 --embed-thumbnail" diff --git a/setup/nnn.sh b/setup/nnn.sh new file mode 100644 index 0000000..4ddb86f --- /dev/null +++ b/setup/nnn.sh @@ -0,0 +1,17 @@ +#!/bin/sh -e + +# Needs musl-fts, ncurses + +git clone https://github.com/FollieHiyuki/nnn.git +cd nnn + +export LDLIBS=-lfts + +if command -v doas >/dev/null +then + doas -- make O_NERD=1 O_NOBATCH=1 O_GITSTATUS=1 PREFIX=/usr install +else + sudo make O_NERD=1 O_NOBATCH=1 O_GITSTATUS=1 PREFIX=/usr install +fi + +cd ..