From 23d7dc817488a1549f1897133f64269973115bfd Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 25 Sep 2024 19:52:11 -0700 Subject: fortune: eolie i2p browser mode --- home/ebisu/fortune/multimedia/browser/default.nix | 1 + home/ebisu/fortune/system/shell/fish.nix | 127 +++++++++++----------- 2 files changed, 67 insertions(+), 61 deletions(-) diff --git a/home/ebisu/fortune/multimedia/browser/default.nix b/home/ebisu/fortune/multimedia/browser/default.nix index 7c3d879..cc4b626 100644 --- a/home/ebisu/fortune/multimedia/browser/default.nix +++ b/home/ebisu/fortune/multimedia/browser/default.nix @@ -13,5 +13,6 @@ tor-browser-bundle-bin inputs.tsutsumi.packages.${pkgs.system}.zen-browser-bin epiphany + eolie ]; } diff --git a/home/ebisu/fortune/system/shell/fish.nix b/home/ebisu/fortune/system/shell/fish.nix index bc699b5..4b94210 100644 --- a/home/ebisu/fortune/system/shell/fish.nix +++ b/home/ebisu/fortune/system/shell/fish.nix @@ -111,66 +111,71 @@ } ]; - shellAliases = { - # Verbosity - cp = "cp -iv"; - mv = "mv -iv"; - # rm = "rm -vI"; - bc = "bc -ql"; - rsync = "rsync -vrPlu"; - mkd = "mkdir -pv"; - yt = "yt-dlp --embed-metadata -i"; - yta = "yt -x -f bestaudio/best"; - ytt = "yt --skip-download --write-thumbnail"; - ffmpeg = "ffmpeg -hide_banner"; - wdic = "wdic --homophones --kanji --color --pager"; - hakuneko = "hakuneko-desktop --no-sandbox"; - fastfetch = "clear && /usr/bin/env fastfetch"; - wget = "wget --hsts-file=${config.xdg.dataHome}/wget-hsts"; - mosh = "mosh --predirect=experimental"; - - # Modern Alternatives & Alias Rewrites - unzip = "ripunzip unzip-file"; - nvim = "lvim"; - vim = "lvim"; - vimdiff = "lvim -d"; - rm = "rip"; - - # Colourise - ls = "exa -h --no-quotes --color=auto --group-directories-first"; - grep = "grep --color=auto"; - diff = "diff --color=auto"; - ccat = "highlight --out-format=ansi"; - ip = "ip -color=auto"; - - # Abbreviations - ka = "killall"; - g = "git"; - sdn = "shutdown -h now"; - e = "$EDITOR"; - v = "$EDITOR"; - ff = "fastfetch"; - - # Other - chan = "chan-downloader -c 10"; - rotd = "systemctl --user restart opentabledriver.service"; - ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'"; - def = "myougiden"; - suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ${config.home.homeDirectory}/Documents/Code/Git/Fuwn/suzuri/suzuri"; - "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow"; - shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && feh /tmp/shinobu"; - auto_subtitle = "source ${config.home.homeDirectory}/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True"; - steamy = "mangohud gamemoderun steam-runtime"; - koix = "koi -f"; - seamonkey = "${config.home.homeDirectory}/.local/src/seamonkey/seamonkey-bin"; - doom = "${config.xdg.configHome}/emacs/bin/doom"; - epiphany-i2p = "http_proxy=$(cat ${config.sops.secrets."proxy/i2p/http".path}) HTTP_PROXY=$(cat ${ - config.sops.secrets."proxy/i2p/http".path - }) https_proxy=$(cat ${config.sops.secrets."proxy/i2p/https".path}) HTTPS_PROXY=$(cat ${ - config.sops.secrets."proxy/i2p/https".path - }) socks_proxy=$(cat ${config.sops.secrets."proxy/i2p/socks5".path}) SOCKS_PROXY=$(cat ${ - config.sops.secrets."proxy/i2p/socks5".path - }) epiphany"; - }; + shellAliases = + let + proxyEnvironment = "http_proxy=$(cat ${ + config.sops.secrets."proxy/i2p/http".path + }) HTTP_PROXY=$(cat ${config.sops.secrets."proxy/i2p/http".path}) https_proxy=$(cat ${ + config.sops.secrets."proxy/i2p/https".path + }) HTTPS_PROXY=$(cat ${config.sops.secrets."proxy/i2p/https".path}) socks_proxy=$(cat ${ + config.sops.secrets."proxy/i2p/socks5".path + }) SOCKS_PROXY=$(cat ${config.sops.secrets."proxy/i2p/socks5".path})"; + in + { + # Verbosity + cp = "cp -iv"; + mv = "mv -iv"; + # rm = "rm -vI"; + bc = "bc -ql"; + rsync = "rsync -vrPlu"; + mkd = "mkdir -pv"; + yt = "yt-dlp --embed-metadata -i"; + yta = "yt -x -f bestaudio/best"; + ytt = "yt --skip-download --write-thumbnail"; + ffmpeg = "ffmpeg -hide_banner"; + wdic = "wdic --homophones --kanji --color --pager"; + hakuneko = "hakuneko-desktop --no-sandbox"; + fastfetch = "clear && /usr/bin/env fastfetch"; + wget = "wget --hsts-file=${config.xdg.dataHome}/wget-hsts"; + mosh = "mosh --predirect=experimental"; + + # Modern Alternatives & Alias Rewrites + unzip = "ripunzip unzip-file"; + nvim = "lvim"; + vim = "lvim"; + vimdiff = "lvim -d"; + rm = "rip"; + + # Colourise + ls = "exa -h --no-quotes --color=auto --group-directories-first"; + grep = "grep --color=auto"; + diff = "diff --color=auto"; + ccat = "highlight --out-format=ansi"; + ip = "ip -color=auto"; + + # Abbreviations + ka = "killall"; + g = "git"; + sdn = "shutdown -h now"; + e = "$EDITOR"; + v = "$EDITOR"; + ff = "fastfetch"; + + # Other + chan = "chan-downloader -c 10"; + rotd = "systemctl --user restart opentabledriver.service"; + ks = "kaguya stream --user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'"; + def = "myougiden"; + suzuri = "SUZURI_MINIMAL=1 SUZURI_REVERSE=1 ${config.home.homeDirectory}/Documents/Code/Git/Fuwn/suzuri/suzuri"; + "5ch" = "html2md -i 'https://ff5ch.syoboi.jp/' -s section | glow"; + shinobu = "curl --silent https://shinobu.fuwn.workers.dev/shinobu -o /tmp/shinobu && feh /tmp/shinobu"; + auto_subtitle = "source ${config.home.homeDirectory}/Documents/Code/Git/Random/auto-subtitle/venv/bin/activate && auto_subtitle --model medium --task translate --srt_only True"; + steamy = "mangohud gamemoderun steam-runtime"; + koix = "koi -f"; + seamonkey = "${config.home.homeDirectory}/.local/src/seamonkey/seamonkey-bin"; + doom = "${config.xdg.configHome}/emacs/bin/doom"; + epiphany-i2p = "${proxyEnvironment} epiphany"; + eolie-i2p = "${proxyEnvironment} eolie"; + }; }; } -- cgit v1.2.3