From f65d81fcf6d356be689ad95b4b757d24b48e77b2 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 7 Oct 2022 02:37:49 +0900 Subject: [PATCH 1/6] add: install_ubuntu.sh and fd link --- bin/install_ubuntu.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bin/install_ubuntu.sh diff --git a/bin/install_ubuntu.sh b/bin/install_ubuntu.sh new file mode 100644 index 0000000..44d8094 --- /dev/null +++ b/bin/install_ubuntu.sh @@ -0,0 +1,3 @@ +#!/usr/bin/bash -euo + +ln -s $(which fdfind) ~/.local/bin/fd From 9222bb5b08be81fc41533af8ba4414cc6bdc87dd Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 7 Oct 2022 02:45:36 +0900 Subject: [PATCH 2/6] add: bat symln to setup_ubuntu.sh --- bin/install_ubuntu.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/install_ubuntu.sh b/bin/install_ubuntu.sh index 44d8094..46d0777 100644 --- a/bin/install_ubuntu.sh +++ b/bin/install_ubuntu.sh @@ -1,3 +1,4 @@ #!/usr/bin/bash -euo -ln -s $(which fdfind) ~/.local/bin/fd +ln -sf $(which batcat) ~/.local/bin/bat +ln -sf $(which fdfind) ~/.local/bin/fd From 48f76c89913b5571d4088aa9b587e8d3200a391a Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 7 Oct 2022 02:59:00 +0900 Subject: [PATCH 3/6] remove: bat, fd symlinks for ubuntu reason:: removed apt packages for bat, fd, since they are too old for PatrickF1/fzf.fish plugin --- bin/install_ubuntu.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/install_ubuntu.sh b/bin/install_ubuntu.sh index 46d0777..b11fb91 100644 --- a/bin/install_ubuntu.sh +++ b/bin/install_ubuntu.sh @@ -1,4 +1,2 @@ #!/usr/bin/bash -euo -ln -sf $(which batcat) ~/.local/bin/bat -ln -sf $(which fdfind) ~/.local/bin/fd From 05147b5aeaf8c385d8dfbf4ddd47a8f9cd4441ab Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 12 Oct 2022 08:45:23 +0900 Subject: [PATCH 4/6] update fish config & init.lua --- dotfiles/fish/config.fish | 37 +++++++++++++++++++++---------------- dotfiles/neovim/init.lua | 1 + 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dotfiles/fish/config.fish b/dotfiles/fish/config.fish index 09b6f19..b93a205 100644 --- a/dotfiles/fish/config.fish +++ b/dotfiles/fish/config.fish @@ -2,23 +2,28 @@ # bass source ~/.bashrc if status is-interactive - # starship - starship init fish | source - - function set_win_title - echo -ne "\033]0; (basename "$PWD") \007" - end - set starship_precmd_uesr_func "set_win_title" - - # keychain - set -x SHELL fish - keychain --eval --quiet -Q id_rsa, id_ed25519 | source - set -x SHELL bash - - # opam - # source ~/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true end +# starship +starship init fish | source + +function set_win_title + echo -ne "\033]0; (basename "$PWD") \007" +end +set starship_precmd_uesr_func "set_win_title" + +# keychain +set -x SHELL fish +keychain --eval --quiet -Q id_rsa, id_ed25519 | source +set -x SHELL bash + +# opam +# source ~/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true +opam env --shell fish | source # key bindings -bind \b backward-kill-word \ No newline at end of file +bind \b backward-kill-word + + +# env +set -x LESS '-i -r -M -R -S -W -z-4 -x4' diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index d7bdd8e..4819b76 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -1,3 +1,4 @@ +--print("init.lua loaded") ----------------------------------------------------------- -- basic configurations vim.o.number = true From ef2d9a239d70b0d711020cb451870bf112253e2a Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 12 Oct 2022 10:26:59 +0900 Subject: [PATCH 5/6] update: sh: install script --- bin/install.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/bin/install.sh b/bin/install.sh index cabc0ff..6870622 100644 --- a/bin/install.sh +++ b/bin/install.sh @@ -1 +1,22 @@ -ln -s (pwd)/dotfiles/fish/config.fish ~/.config/fish/config.fish +#!/usr/bin/bash +set -eu + +# ========================================================= +# check executing location +# ========================================================= +if [ ! -d "bin" -a ! -d "dotfiles" ]; then + echo "Wrong execution location" + echo "Please run this script on dotfiles root folder." + exit 1 +fi + + +# ========================================================= +# links +# ========================================================= +ln -sf (pwd)/dotfiles/fish/config.fish ~/.config/fish/config.fish +ln -sf (pwd)/dotfiles/starship/starship.toml ~/.config/starship.toml +ln -sf (pwd)/dotfiles/tmux.conf ~/.tmux.conf + + +ln -sf (pwd)/dotfiles/nvim/init.lua ~/.config/nvim/init.lua From 90de93e9fabf6aff076e1b2604d13bd658ec128b Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 12 Oct 2022 11:21:48 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20fish=E3=81=AB=E6=85=A3=E3=82=8C?= =?UTF-8?q?=E3=81=99=E3=81=8E=E3=81=9F=E5=BC=8A=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 bin/install.sh diff --git a/bin/install.sh b/bin/install.sh old mode 100644 new mode 100755 index 6870622..d33bc00 --- a/bin/install.sh +++ b/bin/install.sh @@ -14,9 +14,9 @@ fi # ========================================================= # links # ========================================================= -ln -sf (pwd)/dotfiles/fish/config.fish ~/.config/fish/config.fish -ln -sf (pwd)/dotfiles/starship/starship.toml ~/.config/starship.toml -ln -sf (pwd)/dotfiles/tmux.conf ~/.tmux.conf +ln -sf $(pwd)/dotfiles/fish/config.fish ~/.config/fish/config.fish +ln -sf $(pwd)/dotfiles/starship/starship.toml ~/.config/starship.toml +ln -sf $(pwd)/dotfiles/tmux.conf ~/.tmux.conf -ln -sf (pwd)/dotfiles/nvim/init.lua ~/.config/nvim/init.lua +ln -sf $(pwd)/dotfiles/nvim/init.lua ~/.config/nvim/init.lua