From 631422d096bbfb8d7edaea3a35febe3f59c990b9 Mon Sep 17 00:00:00 2001
From: Hau Nguyen <hauvipapro@gmail.com>
Date: Sun, 24 Mar 2024 02:11:00 +0700
Subject: [PATCH] chore: use pyenv

Add xz to brew, see https://stackoverflow.com/a/69517932
---
 data/newsboat/config    |  3 +++
 data/zsh/bottom-zshrc   | 15 +++++++++++----
 scripts/brew_init.sh    |  2 +-
 scripts/nix_init.sh     |  2 +-
 scripts/nix_maintain.sh |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/data/newsboat/config b/data/newsboat/config
index 2b1346f..0c48279 100644
--- a/data/newsboat/config
+++ b/data/newsboat/config
@@ -12,3 +12,6 @@ unbind-key g
 unbind-key G
 bind-key g home
 bind-key G end
+
+unbind-key j
+unbind-key k
diff --git a/data/zsh/bottom-zshrc b/data/zsh/bottom-zshrc
index a4b88f7..f9e64f4 100644
--- a/data/zsh/bottom-zshrc
+++ b/data/zsh/bottom-zshrc
@@ -110,6 +110,12 @@ if command -v zoxide &>/dev/null; then
     eval "$(zoxide init zsh)"
 fi
 
+# https://github.com/walles/moar
+if command -v moar &>/dev/null; then
+    export MOAR="-no-linenumbers -no-statusbar -quit-if-one-screen -wrap"
+    export PAGER=moar
+fi
+
 # https://github.com/atuinsh/atuin
 if command -v atuin &>/dev/null; then
     eval "$(atuin init zsh --disable-up-arrow)"
@@ -120,10 +126,11 @@ if command -v fnm &>/dev/null; then
     eval "$(fnm env --use-on-cd)"
 fi
 
-# https://github.com/walles/moar
-if command -v moar &>/dev/null; then
-    export MOAR="-no-linenumbers -no-statusbar -quit-if-one-screen -wrap"
-    export PAGER=moar
+# https://github.com/pyenv/pyenv
+if command -v pyenv &>/dev/null; then
+    export PYENV_ROOT="$HOME/.pyenv"
+    [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init -)"
 fi
 
 # Depend on your company
diff --git a/scripts/brew_init.sh b/scripts/brew_init.sh
index 12c213e..9b8603b 100755
--- a/scripts/brew_init.sh
+++ b/scripts/brew_init.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-brew install libgit2 pcre2
+brew install libgit2 pcre2 xz
diff --git a/scripts/nix_init.sh b/scripts/nix_init.sh
index c5a13d8..af4af05 100755
--- a/scripts/nix_init.sh
+++ b/scripts/nix_init.sh
@@ -8,5 +8,5 @@ nix-env -iA \
     nixpkgs.fdupes nixpkgs.rsync nixpkgs.rclone nixpkgs.restic nixpkgs.taskwarrior \
     nixpkgs.ffmpegthumbnailer nixpkgs.asciinema-agg nixpkgs.yt-dlp nixpkgs.libjxl nixpkgs.newsboat \
     nixpkgs.btop nixpkgs.cpufetch nixpkgs.onefetch \
-    nixpkgs.clang-tools nixpkgs.python3 nixpkgs.pipx nixpkgs.gh nixpkgs.moar \
+    nixpkgs.clang-tools nixpkgs.pipx nixpkgs.gh nixpkgs.moar \
     nixpkgs.qmk
diff --git a/scripts/nix_maintain.sh b/scripts/nix_maintain.sh
index 8176acb..5dbe360 100755
--- a/scripts/nix_maintain.sh
+++ b/scripts/nix_maintain.sh
@@ -10,7 +10,7 @@ nix-env -uA \
     nixpkgs.fdupes nixpkgs.rsync nixpkgs.rclone nixpkgs.restic nixpkgs.taskwarrior \
     nixpkgs.ffmpegthumbnailer nixpkgs.asciinema-agg nixpkgs.yt-dlp nixpkgs.libjxl nixpkgs.newsboat \
     nixpkgs.btop nixpkgs.cpufetch nixpkgs.onefetch \
-    nixpkgs.clang-tools nixpkgs.python3 nixpkgs.pipx nixpkgs.gh nixpkgs.moar \
+    nixpkgs.clang-tools nixpkgs.pipx nixpkgs.gh nixpkgs.moar \
     nixpkgs.qmk
 
 nix-collect-garbage -d --quiet