From 82f5e44d5b94c4c78c5c24079ebb678fd0c80a9c Mon Sep 17 00:00:00 2001 From: Andre Henriques Date: Mon, 27 Nov 2023 12:04:59 +0000 Subject: [PATCH] fixed some things --- alias.fish | 15 +++++++++++---- completions/bun.fish | 38 ++++++++++++++++++++++++++------------ config.fish | 16 +++++++++++++--- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/alias.fish b/alias.fish index b867646..9ea5cba 100644 --- a/alias.fish +++ b/alias.fish @@ -1,8 +1,15 @@ function cclear - if test -e '/nix' - /run/current-system/sw/bin/clear + /bin/clear +# if test -e '/nix' +# /run/current-system/sw/bin/clear +# else +# /bin/clear +# end +end +function clear + /bin/clear + if test -e $NOT_SAFE + hyfetch else - /bin/clear end end -alias clear "cclear && hyfetch" diff --git a/completions/bun.fish b/completions/bun.fish index db2ac60..2158790 100644 --- a/completions/bun.fish +++ b/completions/bun.fish @@ -53,14 +53,17 @@ end set -l bun_install_boolean_flags yarn production optional development no-save dry-run force no-cache silent verbose global set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't install devDependencies" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependenices" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder" -set -l bun_builtin_cmds dev create help bun upgrade discord run install remove add -set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add -set -l bun_builtin_cmds_without_bun dev create help upgrade run discord install remove add -set -l bun_builtin_cmds_without_create dev help bun upgrade discord run install remove add -set -l bun_builtin_cmds_without_install create dev help bun upgrade discord run remove add -set -l bun_builtin_cmds_without_remove create dev help bun upgrade discord run install add -set -l bun_builtin_cmds_without_add create dev help bun upgrade discord run remove install -set -l bun_builtin_cmds_without_pm create dev help bun upgrade discord run +set -l bun_builtin_cmds dev create help bun upgrade discord run install remove add init link unlink pm x +set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add init pm x +set -l bun_builtin_cmds_without_bun dev create help upgrade run discord install remove add init pm x +set -l bun_builtin_cmds_without_create dev help bun upgrade discord run install remove add init pm x +set -l bun_builtin_cmds_without_install create dev help bun upgrade discord run remove add init pm x +set -l bun_builtin_cmds_without_remove create dev help bun upgrade discord run install add init pm x +set -l bun_builtin_cmds_without_add create dev help bun upgrade discord run remove install init pm x +set -l bun_builtin_cmds_without_pm create dev help bun upgrade discord run init pm x + +# clear +complete -e -c bun complete -c bun \ -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '(__fish__get_bun_scripts)' -d 'script' @@ -75,17 +78,20 @@ complete -c bun \ complete -c bun \ -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'u' -l 'origin' -r -d 'Server URL. Rewrites import paths' complete -c bun \ --n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'p' -l 'port' -r -d 'Port number to start server from' + -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'p' -l 'port' -r -d 'Port number to start server from' complete -c bun \ -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'd' -l 'define' -r -d 'Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\"' complete -c bun \ -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'e' -l 'external' -r -d 'Exclude module from transpilation (can use * wildcards). ex: -e react' complete -c bun \ -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'use' -r -d 'Use a framework (ex: next)' +complete -c bun \ + -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'hot' -r -d 'Enable hot reloading in Bun\'s JavaScript runtime' + complete -c bun \ -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'dev' -d 'Start dev server' complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'create' -f -d 'Create a new project' + -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'create' -f -d 'Create a new project from a template' complete -c bun \ -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'next' -d 'new Next.js project' @@ -99,7 +105,7 @@ complete -c bun \ -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '--help' -d 'See all commands and flags' -x complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -l "version" -s "v" -a '--version' -d 'bun\'s version' -x + -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -l "version" -s "v" -a '--version' -d 'Bun\'s version' -x complete -c bun \ -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'discord' -d 'Open bun\'s Discord server' -x @@ -115,6 +121,8 @@ complete -c bun \ -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create; and not __fish_seen_subcommand_from (__fish__get_bun_bins); and not __fish_seen_subcommand_from (__fish__get_bun_scripts); and __fish_seen_subcommand_from react; or __fish_seen_subcommand_from next" -F -d "Create in directory" +complete -c bun \ + -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'init' -F -d 'Start an empty Bun project' complete -c bun \ -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'install' -f -d 'Install packages from package.json' @@ -145,5 +153,11 @@ complete -c bun \ complete -c bun \ -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'History' -a '(__history_completions)' + +complete -c bun \ + -n "__fish_seen_subcommand_from pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) cache;" -a 'bin ls cache hash hash-print hash-string' -f -complete -c bun --no-files \ No newline at end of file +complete -c bun \ + -n "__fish_seen_subcommand_from pm; and __fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts);" -a 'rm' -f + +complete -c bun -n "not __fish_seen_subcommand_from $bun_builtin_cmds (__fish__get_bun_bins) (__fish__get_bun_scripts)" -a "$bun_builtin_cmds" -f \ No newline at end of file diff --git a/config.fish b/config.fish index b107cec..05eec9d 100644 --- a/config.fish +++ b/config.fish @@ -29,7 +29,7 @@ alias rust-musl-builder='docker run --rm -it -v "$(pwd)":/home/rust/src messense set EDITOR "nvim" set _JAVA_AWT_WM_NONREPARENTING "1" -set JAVA_HOME /usr/lib/jvm/java-8-openjdk +# set JAVA_HOME /usr/lib/jvm/java-8-openjdk set XDG_CONFIG_HOME "$HOME/.config" set -g FZF_DEFAULT_COMMAND 'rg --files --follow --ignore-vcs --hidden -g "!{node_modules/*,.git/*}"' export FZF_DEFAULT_COMMAND='rg --files --follow --ignore-vcs --hidden -g "!{node_modules/*,.git/*}"' @@ -48,7 +48,7 @@ function ssh if [ $TERM = "xterm-kitty" ] kitty +kitten ssh $argv else - /run/current-system/sw/bin/ssh $argv + /bin/ssh $argv end end @@ -76,6 +76,11 @@ function sshot grim -g "$(slurp)" - | wl-copy end +function sshottof + grim -g "$(slurp)" -t png - > ./$argv +end + + source ~/.config/fish/completions/bun.fish source ~/.config/fish/completions/nvm.fish source ~/.config/fish/other.fish @@ -98,7 +103,12 @@ source /home/andr3/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true if status is-interactive if ! test $NOT_SAFE if ! test -n "$IN_NIX_SHELL" - hyfetch + #hyfetch end end end + +# bun +set --export BUN_INSTALL "$HOME/.bun" +set --export PATH $BUN_INSTALL/bin $PATH +set --export NOT_SAFE 1