commit 874fc2096cdc12c099a1aa9796029067bc6bfbef
parent 61b00080997491f4b377523888bc42b6a3e4b168
Author: William Casarin <jb55@jb55.com>
Date: Mon, 7 Nov 2022 13:32:22 -0800
bleh
Diffstat:
9 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/bin/cs b/bin/cs
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-exec curl cheat.sh/$1
+exec curl -s cheat.sh/$1 | less
diff --git a/bin/fuzz-run-hist b/bin/fuzz-run-hist
@@ -2,6 +2,6 @@
set -e
fuzz-compress-hist
-export FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac --sync -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m"
-cmd=$(<$HOME/.fuzzhist fzf)
+export FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac --sync -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m +s"
+cmd=$(<$HOME/.fuzzhist fzf; fuzz-compress-hist)
echo $cmd
diff --git a/bin/fuzz-show-hist b/bin/fuzz-show-hist
@@ -2,6 +2,6 @@
set -e
fuzz-compress-hist
-export FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac --sync -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m"
+export FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS --tac --sync -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m +s"
cmd_=$(<$HOME/.fuzzhist $FUZZER)
echo "$cmd_"
diff --git a/bin/general-status b/bin/general-status
@@ -15,9 +15,8 @@ if [ "$USER" != "jb55" ]; then
USR="$USER "
fi
-printf "%s%s %s %s\n" \
+printf "%s%s %s\n" \
"$USR" \
- "$HOSTNAME" \
"$PWD" \
"$(git_status)"
diff --git a/bin/howdoi b/bin/howdoi
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/home/jb55/.nix-profile/bin/howdoi "$@" 2>/dev/null
diff --git a/bin/search-files b/bin/search-files
@@ -11,4 +11,4 @@ res=$(fzf --bind "change:reload:$RG_PREFIX {q} || true" --ansi --phony --query "
file=$(cut -d: -f1 <<<"$res")
line=$(cut -d: -f2 <<<"$res")
-echo +$line \"$file\" #"# $(cut -d: -f4- <<<"$res")"
+echo +$line \"$file\" "# $(cut -d: -f4- <<<"$res")"
diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
@@ -15,17 +15,18 @@ export NIX_PATH="dotfiles=$HOME/dotfiles:$NIX_PATH"
# If not running interactively, don't do anything
#[ -z "$PS1" ] && return
+export HOST=$(hostname)
export LONG_RUNNING_COMMAND_TIMEOUT=3
-export PS1='$(printf "\x01\033[30;1m\x02%3.*s\x01\033[0m\x02> \x01\033[33m\x02" $? $?)'
+export PS1='$(printf "\x01\033[30;1m\x02%3.*s\x01\033[0m\x02 %s> \x01\033[33m\x02" $? $? $HOST)'
export PS0='\033[0m'
#export PS1='$(printf "\x01\033[30;1m\x02%3.*s\x01\033[0m\x02> " $? $?)'
# don't put duplicate lines in the history. See bash(1) for more options
export HISTSIZE=50000
-export HISTCONTROL=ignoredups
+#export HISTCONTROL=ignoredups
# ... and ignore same sucessive entries.
-#export HISTCONTROL=ignoreboth
+export HISTCONTROL=ignoreboth
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
diff --git a/dotfiles/commands b/dotfiles/commands
@@ -5,6 +5,7 @@ afe app > edit feeds echo edit ~/dotfiles/rssfeeds
aff app > feeds fuzz-rss "grep -v @busy"
afp app > feeds > podcasts fuzz-rss "grep @pod"
afu app > update feeds echo rssfeeds
+ada app > direnv > allow echo direnv allow
afs app > feeds > busy fuzz-rss
afa app > feeds > arxiv fuzz-rss "grep @arxiv"
afy app > feeds > youtube fuzz-rss "grep @yt"
diff --git a/nix-config/configuration.nix b/nix-config/configuration.nix
@@ -90,6 +90,7 @@ in {
nixpkgs.config = import ./nixpkgs/config.nix;
nix.useSandbox = machine != "charon";
+ nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.trustedUsers = [ "root" "jb55" ];
boot.blacklistedKernelModules = [ "pcspkr" ]; # STOP THE BEEPING
