fix terminal

This commit is contained in:
Anish Lakhwara 2022-12-27 14:25:43 +10:00
parent 8ab9339e9b
commit 5f5c2491b1

View file

@ -51,7 +51,6 @@
gdb gdb
xxd xxd
taskwarrior taskwarrior
yt-dlp
gnupg gnupg
syncthing syncthing
dijo dijo
@ -60,7 +59,7 @@
pandoc pandoc
(pkgs.writeScriptBin "jq-repl" '' (pkgs.writeScriptBin "jq-repl" ''
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ -z $1 ]] || [[ $1 == "-" ]] then if [[ -z $1 ]] || [[ $1 == "-" ]]; then
input=$(mktemp) input=$(mktemp)
trap "rm -f $input" EXIT trap "rm -f $input" EXIT
cat /dev/stdin > $input cat /dev/stdin > $input
@ -70,27 +69,29 @@
echo "" \ | fzf --phony --preview-window="up:90%" --print-query --preview "jq --color-output -r {q} $input" echo "" \ | fzf --phony --preview-window="up:90%" --print-query --preview "jq --color-output -r {q} $input"
'') '')
(pkgs.writeScriptBin "flakify" ''
#!/usr/bin/env zsh
if [ ! -e flake.nix ]; then
nix flake new -t github:nix-community/nix-direnv .
elif [ ! -e .envrc ]; then
echo "use flake" > .envrc
direnv allow
fi
vim flake.nix
'')
(pkgs.writeScriptBin "mx" ''
#!/usr/bin/env bash
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix
'')
]; ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = true; enableAutosuggestions = false;
initExtra = '' initExtra = ''
bindkey -v bindkey -v
flakify() {
if [ ! -e flake.nix ]; then
nix flake new -t github:nix-community/nix-direnv .
elif [ ! -e .envrc ]; then
echo "use flake" > .envrc
direnv allow
fi
vim flake.nix
}
mx() {
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix
}
autopair-init autopair-init
''; '';
sessionVariables = { sessionVariables = {
@ -137,16 +138,16 @@
}; };
file = "zsh-autoquoter.zsh"; file = "zsh-autoquoter.zsh";
} }
{ # {
name = "zsh-nix-shell"; # name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh"; # file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub { # src = pkgs.fetchFromGitHub {
owner = "chisui"; # owner = "chisui";
repo = "zsh-nix-shell"; # repo = "zsh-nix-shell";
rev = "v0.5.0"; # rev = "v0.5.0";
sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91"; # sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91";
}; # };
} # }
]; ];
}; };
@ -164,7 +165,6 @@
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
nix-direnv.enable = true; nix-direnv.enable = true;
# nix-direnv.enableFlakes = true; always enabled
}; };
programs.zoxide = { programs.zoxide = {
@ -182,7 +182,9 @@
"....." = "cd ../../../.."; "....." = "cd ../../../..";
# kitaab recents # kitaab recents
kr = "cd /home/anish/kitaab/vimwiki; ls --sort=modified --reverse | fzf --preview 'bat --style=numbers --color=always --terminal-width -1 {}'"; kr = "cd /home/anish/kitaab/vimwiki; exa --sort=modified --reverse | fzf --preview 'bat --style=numbers --color=always --terminal-width -1 ./{}'";
icat = "kitty +kitten icat";
yt = "ytfzf -T kitty -t ";
# modern cli tools # modern cli tools
ls = "exa --icons"; ls = "exa --icons";
@ -235,7 +237,7 @@
nf = "n flake"; nf = "n flake";
nfl = "nf lock"; nfl = "nf lock";
nepl = "n repl '<nixpkgs>'"; nepl = "n repl '<nixpkgs>'";
srch = "ns nixos"; srch = "ns nixpkgs";
orch = "ns override"; orch = "ns override";
nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/etc/nixos/#curve'; cd $OLDPWD"; nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/etc/nixos/#curve'; cd $OLDPWD";
nrt = "cd /tmp; sudo nixos-rebuild test --flake '/etc/nixos/#curve'; cd $OLDPWD"; nrt = "cd /tmp; sudo nixos-rebuild test --flake '/etc/nixos/#curve'; cd $OLDPWD";