From 1691b89d9f2369a8237bf640d128510a8db32d6d Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Mon, 3 Jul 2023 11:15:10 +0300 Subject: [PATCH] feat(console): fix aliases & add openssl --- .bashrc | 9 ++++++--- .config/fish/config.fish | 17 ++++++++++------- .config/guix/manifests/console.scm | 1 + Console.org | 23 +++++++++++++++++++---- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.bashrc b/.bashrc index 6e59a73..f0c48cc 100644 --- a/.bashrc +++ b/.bashrc @@ -107,9 +107,12 @@ HISTFILESIZE= # [[file:Console.org::*Aliases][Aliases:1]] alias v="vim" -alias gg="lazygit" -alias ls="exa --icons" -alias ll="exa -lah --icons" +if command -v exa > /dev/null; then + alias ls="exa --icons" + alias ll="exa -lah --icons" +else + alias ll='ls -lah' +fi alias q="exit" alias c="clear" alias ci="init_mamba" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 6487ffd..a74d923 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -7,15 +7,14 @@ end # [[file:../../Console.org::*Fish][Fish:2]] fish_vi_key_bindings -alias v="vim" -alias gg="lazygit" -alias ls="exa --icons" -alias ll="exa -lah --icons" alias q="exit" alias c="clear" -alias ci="init_mamba" -alias ca="micromamba activate" -alias cii="export INIT_MAMBA=true && init_mamba" +if type -q exa + alias ls="exa --icons" + alias ll="exa -lah --icons" +else + alias ll="ls -h" +end # Fish:2 ends here # [[file:../../Console.org::*Fish][Fish:3]] @@ -38,6 +37,10 @@ end if test -n "$INIT_MAMBA"; init_mamba end + +alias ca="micromamba activate" +alias ci="init_mamba" +alias cii="export INIT_MAMBA=true && init_mamba" # Micromamba:1 ends here # [[file:../../Console.org::*Micromamba][Micromamba:2]] diff --git a/.config/guix/manifests/console.scm b/.config/guix/manifests/console.scm index 3dad623..0ba0959 100644 --- a/.config/guix/manifests/console.scm +++ b/.config/guix/manifests/console.scm @@ -1,5 +1,6 @@ (specifications->manifest '( + "openssl" "ncdu" "megacmd" "jless-bin" diff --git a/Console.org b/Console.org index d2d69b0..5bd1fc7 100644 --- a/Console.org +++ b/Console.org @@ -369,9 +369,12 @@ fi *** Aliases #+begin_src bash :noweb yes :noweb-ref shell-aliases alias v="vim" -alias gg="lazygit" -alias ls="exa --icons" -alias ll="exa -lah --icons" +if command -v exa > /dev/null; then + alias ls="exa --icons" + alias ll="exa -lah --icons" +else + alias ll='ls -lah' +fi alias q="exit" alias c="clear" alias ci="init_mamba" @@ -453,7 +456,14 @@ Enable vi keybindings & aliases. The alias syntax is the same as in bash, so it' #+begin_src fish :noweb yes fish_vi_key_bindings -<> +alias q="exit" +alias c="clear" +if type -q exa + alias ls="exa --icons" + alias ll="exa -lah --icons" +else + alias ll="ls -h" +end #+end_src @@ -484,6 +494,10 @@ end if test -n "$INIT_MAMBA"; init_mamba end + +alias ca="micromamba activate" +alias ci="init_mamba" +alias cii="export INIT_MAMBA=true && init_mamba" #+end_src Then, check if launched from Emacs with environment activated. @@ -838,6 +852,7 @@ key_bindings: | jless-bin | JSON viewer | | megacmd | mega.nz client | | ncdu | disk usage analyzer | +| openssl | | ** ripgrep config Occasionally I can't exclude certain files from ripgrep via the VCS settings, so here is a simple config to ignore certain files globally.