From 8551e367d23a7ec5082392115eafeb659892e7af Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sun, 23 May 2021 15:29:42 +0300 Subject: [PATCH] Various changes - emacs: bye freenode - nwg-bar: back to elogind (bug: can't use polkit) - Wayland: start pulseaudio server in config (instead of system config) - Update README --- README.md | 47 +++++----------------- home/.config/amfora/config.toml | 4 +- home/.config/doom/config.el | 6 +-- home/.config/hikari/autostart | 1 + home/.config/mako/config | 2 +- home/.config/nwg-launchers/nwgbar/bar.json | 4 +- home/.config/river/init | 1 + home/.config/sway/config | 1 + home/.config/wayfire.ini | 4 +- 9 files changed, 23 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index a9cbd66..161911f 100644 --- a/README.md +++ b/README.md @@ -19,66 +19,37 @@ - Run `deploy.sh` to deploy the dotfiles. - `setup/` directory contains installers for additional packages. -- Stuff I use: - - **Text editor:** [Emacs](http://www.gnu.org/software/emacs/) + [Neovim](https://github.com/neovim/neovim) - - **Fonts:** [Sarasa Gothic](https://github.com/be5invis/Sarasa-Gothic), [Iosevka Nerd Font](https://github.com/ryanoasis/nerd-fonts), [Iosevka](https://github.com/be5invis/Iosevka), [ComicMono](https://github.com/dtinth/comic-mono-font), [Comic Relief](https://fontlibrary.org/en/font/comic-relief) - - **Backlight control:** [light](https://github.com/haikarainen/light) / [brightnessctl](https://github.com/Hummer12007/brightnessctl) / [brillo](https://gitlab.com/cameronnemo/brillo) - - **Notification daemon:** [mako](https://github.com/emersion/mako) / [dunst](https://github.com/dunst-project/dunst) - - **Clipboard manager:** [greenclip](https://github.com/erebe/greenclip) / [clipman](https://github.com/yory8/clipman) - - **Mixer:** [pulsemixer](https://github.com/GeorgeFilipkin/pulsemixer) - - **mpris:** [mpDris2](https://github.com/eonpatapon/mpDris2), [mpv-mpris](https://github.com/hoyon/mpv-mpris), [playerctl](https://github.com/altdesktop/playerctl) - - **Music:** [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp), [mpd](https://github.com/MusicPlayerDaemon/MPD), [cava](https://github.com/karlstav/cava) - - **Launchers:** [nwg-launchers](https://github.com/nwg-piotr/nwg-launchers) / [wofi](https://hg.sr.ht/~scoopta/wofi) / [bemenu](https://github.com/Cloudef/bemenu), [rofi](https://github.com/davatorium/rofi) / [dmenu](https://git.disroot.org/FollieHiyuki/dmenu) - - **Status bar:** [polybar](https://github.com/polybar/polybar), [waybar](https://github.com/Alexays/Waybar) - - **Terminal**: [alacritty](https://github.com/alacritty/alacritty), [foot](https://codeberg.org/dnkl/foot) - - **File manager:** [ranger](https://github.com/ranger/ranger), [vifm](https://github.com/vifm/vifm), [nnn](https://github.com/jarun/nnn) - - **Web browser:** [qutebrowser](https://github.com/qutebrowser/qutebrowser) - - **Image viewer:** [feh](https://github.com/derf/feh), [imv](https://github.com/eXeC64/imv) / [pqiv](https://github.com/phillipberndt/pqiv) / [qimgv](https://github.com/easymodo/qimgv) - - **Wayland wallpaper setter:** [swaybg](https://github.com/swaywm/swaybg) / [oguri](https://github.com/vilhalmer/oguri) / [mpvpaper](https://github.com/GhostNaN/mpvpaper) - - **Video player:** [mpv](https://github.com/mpv-player/mpv) - - **Book viewer:** [zathura](https://git.pwmt.org/pwmt/zathura.git) - - **Screenshot tools:** [grim](https://github.com/emersion/grim) + [slurp](https://github.com/emersion/slurp), [scrot](https://github.com/dreamer/scrot) - - **Mail client:** [aerc](https://aerc-mail.org), [neomutt](https://neomutt.org) - - **Shell:** [fish](https://github.com/fish-shell/fish-shell) - - **Shell prompt:** [starship](https://starship.rs/) - - **Anime/Manga/Wallpaper:** [gallery-dl](https://github.com/mikf/gallery-dl) / [mangadl-bash](https://github.com/Akianonymus/mangadl-bash), [anime-downloader](https://github.com/anime-dl/anime-downloader) + [trackma](https://github.com/z411/trackma) + [adl](https://github.com/RaitaroH/adl) / [anigrab](https://github.com/ngomile/anigrab) - - **CLI/TUI for the Internet:** [translate-shell](https://github.com/soimort/translate-shell) / [argos-translate](https://github.com/argosopentech/argos-translate), [ddgr](https://github.com/jarun/ddgr), [howdoi](https://github.com/gleitz/howdoi), [amfora](https://github.com/makeworld-the-better-one/amfora), [cointop](https://github.com/miguelmota/cointop), [newsboat](https://github.com/newsboat/newsboat), [youtube-dl](https://github.com/ytdl-org/youtube-dl) + [ytmdl](https://github.com/deepjyoti30/ytmdl) / [pipe-viewer](https://github.com/trizen/pipe-viewer), [github-cli](https://github.com/cli/cli), [pup](https://github.com/ericchiang/pup), [weechat](https://github.com/weechat/weechat), [curl](https://curl.haxx.se) / [wget](https://www.gnu.org/software/wget/wget.html) / [aria2](https://github.com/aria2/aria2), [tremc](https://github.com/tremc/tremc) + [transmission](https://github.com/transmission/transmission) / [rtorrent](https://github.com/rakshasa/rtorrent), [goaccess](https://github.com/allinurl/goaccess) - - **CLI/TUI for other things:** [tt](https://github.com/runrin/tt), [forgit](https://github.com/wfxr/forgit), [borg](https://github.com/borgbackup/borg), [wendy](https://git.z3bra.org/wendy/log.html), [tokei](https://github.com/XAMPPRocky/tokei), [onefetch](https://github.com/o2sh/onefetch), [calcurse](https://github.com/lfos/calcurse), [qalculate](https://github.com/Qalculate/libqalculate), [fzf](https://github.com/junegunn/fzf), [fd](https://github.com/sharkdp/fd), [ripgrep](https://github.com/BurntSushi/ripgrep), [atool](http://www.nongnu.org/atool/), [rsync](https://rsync.samba.org/), [bottom](https://github.com/clementtsang/bottom), [hyperfine](https://github.com/sharkdp/hyperfine), [delta](https://github.com/dandavison/delta), [bat](https://github.com/sharkdp/bat), [glow](https://github.com/charmbracelet/glow) / [mdcat](https://github.com/lunaryorn/mdcat) / [mdr](https://github.com/MichaelMure/mdr), [exa](https://github.com/ogham/exa), [pandoc](https://github.com/jgm/pandoc), [csview](https://github.com/wfxr/csview), [libsixel](https://github.com/saitoha/libsixel), [buku](https://github.com/jarun/buku), [jq](https://github.com/stedolan/jq), [zoxide](https://github.com/ajeetdsouza/zoxide) / [z.lua](https://github.com/skywind3000/z.lua), [xlsx2csv](https://github.com/dilshod/xlsx2csv), [qrencode](https://github.com/fukuchi/libqrencode), [hledger](https://github.com/simonmichael/hledger), sysstat, psmisc, wireless_tools, tree, renameutils - - **Selfhosted service:** [LibreTranslate](https://github.com/uav4geo/LibreTranslate), [searx](https://github.com/searx/searx), [yacy](https://github.com/yacy/yacy_search_server), [synapse](https://github.com/matrix-org/synapse), [mastodon](https://github.com/tootsuite/mastodon), [gitea](https://gitea.io/) - -> `Emacs` deserves its own set of dependencies listed, but I'm lazy -> Check my Doom config for details > zsh requires adding `export ZDOTDIR=$HOME/.config/zsh` to **/etc/zsh/zshenv** -> Refer to [this gist](https://gist.github.com/st3r4g/6c681a28b0403b3b02636f510ff68039) for making `pipewire` work on Void Linux. The dotfiles works with `alsa` and `pulseaudio` too with some slightly changes. - ### :clipboard: TODO - [ ] ~~[Material](https://material-theme.site/) / [Ayu](https://github.com/ayu-theme/ayu-colors) palette~~ - [ ] ~~[dotdrop](https://github.com/deadc0de6/dotdrop)~~ - [x] Migrate zsh to [zinit](https://github.com/zdharma/zinit) - [x] Wayland compositors -- [ ] ~~ion~~ / oksh / nushell / osh / xonsh / ~~elvish~~ / oh +- [ ] ~~ion~~ / oksh / nushell / oil / xonsh / ~~elvish~~ / oh - [ ] NixOS / Guix / Gentoo / FreeBSD -- [ ] New Neovim's config in Lua +- [ ] New Neovim config in Lua - [ ] Independent ~/.emacs.d -- [ ] Org Babel / ansible to manage dotfiles +- [ ] [kakoune](https://github.com/mawww/kakoune) / [lite-xl](https://github.com/franko/lite-xl) +- [ ] ~~Org Babel~~ / Ansible ### :star2: Credits & License -- [@ChristianChiarulli](https://github.com/ChristianChiarulli) for the Neovim's config +- [@ChristianChiarulli](https://github.com/ChristianChiarulli)'s Neovim config -- [@hlissner](https://github.com/hlissner) for a detailed zsh config (and Doom Emacs) +- [@hlissner](https://github.com/hlissner)'s zsh config - [@daviwil](https://github.com/daviwil)'s Emacs streams - [@tecosaur](https://tecosaur.github.io/emacs-config/config.html)'s Emacs configuration -- My Waybar config is heavily inspired by [@begs](https://git.sr.ht/~begs/dotfiles) +- [@begs](https://git.sr.ht/~begs/dotfiles)'s Waybar config -- The weechat's theme is "stolen" from [@nathanielevan](https://github.com/nathanielevan/dotfiles) +- [@nathanielevan](https://github.com/nathanielevan/dotfiles)'s weechat config -- I use [some fzf scripts](https://github.com/DanielFGray/fzf-scripts) +- [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 diff --git a/home/.config/amfora/config.toml b/home/.config/amfora/config.toml index 4a818bb..008bd90 100644 --- a/home/.config/amfora/config.toml +++ b/home/.config/amfora/config.toml @@ -35,8 +35,8 @@ auto_redirect = false http = 'qutebrowser' # Any URL that will accept a query string can be put here -search = "gemini://gus.guru/search" -# search = "gemini://geminispace.info/search" +# search = "gemini://gus.guru/search" +search = "gemini://geminispace.info/search" # Whether colors will be used in the terminal color = true diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el index 557ce1a..1728b52 100644 --- a/home/.config/doom/config.el +++ b/home/.config/doom/config.el @@ -299,12 +299,12 @@ (funcall secret) secret)) (error "Password not found for %S" params)))) -(set-irc-server! "chat.freenode.net" +(set-irc-server! "irc.libera.chat" '(:tls t :port 6697 :nick "FollieHiyuki" - :sasl-password (my-fetch-password :user "FollieHiyuki" :host "irc.freenode.net") - :channels ("#voidlinux" "#river" "#archlinux" "#nixos"))) + :sasl-password (my-fetch-password :user "FollieHiyuki" :host "irc.libera.chat") + :channels ("#river"))) ;; Cheatsheet (use-package! tldr diff --git a/home/.config/hikari/autostart b/home/.config/hikari/autostart index 4fcf725..f19ccdf 100755 --- a/home/.config/hikari/autostart +++ b/home/.config/hikari/autostart @@ -8,6 +8,7 @@ gsettings set org.gnome.desktop.interface cursor-size '24' # Autostart pipewire & +pipewire-pulse & mpd & start_notify & wl-paste -t text --watch clipman store & diff --git a/home/.config/mako/config b/home/.config/mako/config index bed5a3e..31b9da9 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -1,5 +1,5 @@ font=Sarasa Mono J 12 -border-size=4 +border-size=2 border-radius=10 margin=20,20,10 width=300 diff --git a/home/.config/nwg-launchers/nwgbar/bar.json b/home/.config/nwg-launchers/nwgbar/bar.json index 0e0d2fa..c4a870b 100644 --- a/home/.config/nwg-launchers/nwgbar/bar.json +++ b/home/.config/nwg-launchers/nwgbar/bar.json @@ -11,12 +11,12 @@ }, { "name": "Reboot", - "exec": "pkexec /usr/bin/reboot", + "exec": "loginctl reboot", "icon": "system-reboot" }, { "name": "Shutdown", - "exec": "pkexec /usr/bin/poweroff", + "exec": "loginctl poweroff", "icon": "system-shutdown" } ] diff --git a/home/.config/river/init b/home/.config/river/init index 27b121f..c1d9207 100755 --- a/home/.config/river/init +++ b/home/.config/river/init @@ -7,6 +7,7 @@ riverctl spawn 'wlr-randr --output DP-2 --mode 1920x1080@60.000000Hz --pos -1920 # Startup commands ───────────────────────────────────────────────────────────── riverctl spawn 'pipewire' +riverctl spawn 'pipewire-pulse' riverctl spawn 'mpd' riverctl spawn 'start_notify' riverctl spawn 'wl-paste -t text --watch clipman store' diff --git a/home/.config/sway/config b/home/.config/sway/config index ac3e30b..8726a74 100644 --- a/home/.config/sway/config +++ b/home/.config/sway/config @@ -79,6 +79,7 @@ input type:keyboard { # /_/ |_\__,_/ \__/ \____//____/ \__/ \__,_/ /_/ \__/ # exec pipewire +exec pipewire-pulse exec mpd exec start_notify exec wl-paste -t text --watch clipman store diff --git a/home/.config/wayfire.ini b/home/.config/wayfire.ini index 37c05f1..33c3556 100644 --- a/home/.config/wayfire.ini +++ b/home/.config/wayfire.ini @@ -123,9 +123,11 @@ idle = swayidle -w before-sleep swaylock # XDG desktop portal # Needed by some GTK applications -portal = /usr/libexec/xdg-desktop-portal +# portal = /usr/libexec/xdg-desktop-portal +# Sound server pipewire = pipewire +pulseaudio = pipewire-pulse # Music mpd = mpd