mirror of
https://github.com/js0ny/dotfiles.git
synced 2025-12-21 08:43:00 +00:00
Merge remote-tracking branch 'refs/remotes/github/master'
This commit is contained in:
commit
6a84917074
12 changed files with 301 additions and 291 deletions
|
|
@ -129,8 +129,8 @@ if command_exists fzf; then
|
||||||
# Check shell type to determine how to set environment variables
|
# Check shell type to determine how to set environment variables
|
||||||
if [ -n "${FISH_VERSION:-}" ] || command_exists fish; then
|
if [ -n "${FISH_VERSION:-}" ] || command_exists fish; then
|
||||||
# For Fish shell
|
# For Fish shell
|
||||||
fish -c 'set -U FZF_DEFAULT_OPTS "--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi"' ||
|
fish -c 'set -U FZF_DEFAULT_OPTS "--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi"' \
|
||||||
echo "WARNING: Failed to set FZF options for Fish shell" >&2
|
|| echo "WARNING: Failed to set FZF options for Fish shell" >&2
|
||||||
else
|
else
|
||||||
# For Bash/Zsh - add to both .bashrc and .zshrc if they exist
|
# For Bash/Zsh - add to both .bashrc and .zshrc if they exist
|
||||||
FZF_CONFIG="export FZF_DEFAULT_OPTS=\"--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi\""
|
FZF_CONFIG="export FZF_DEFAULT_OPTS=\"--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc --color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 --color=selected-bg:#45475a --multi\""
|
||||||
|
|
|
||||||
|
|
@ -123,10 +123,10 @@ fi
|
||||||
# TODO: Add this part
|
# TODO: Add this part
|
||||||
read -p "[ACTION] Do you want to use other package managers? (y/N) " -r choice
|
read -p "[ACTION] Do you want to use other package managers? (y/N) " -r choice
|
||||||
case "$choice" in
|
case "$choice" in
|
||||||
y | Y)
|
y | Y)
|
||||||
:
|
:
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
:
|
:
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -1,4 +1,15 @@
|
||||||
-- Debugger setups
|
-- Debugger setups
|
||||||
return {
|
return {
|
||||||
{ import = "plugins.mod.dap-setup" },
|
{ "mfussenegger/nvim-dap" },
|
||||||
|
{
|
||||||
|
"rcarriga/nvim-dap-ui",
|
||||||
|
dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }
|
||||||
|
},
|
||||||
|
{ "theHamsta/nvim-dap-virtual-text" },
|
||||||
|
{
|
||||||
|
"mfussenegger/nvim-dap-python",
|
||||||
|
config = function()
|
||||||
|
require("dap-python").setup("uv")
|
||||||
|
end
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ require("lazy").setup({
|
||||||
{ import = "plugins.completion" },
|
{ import = "plugins.completion" },
|
||||||
{ import = "plugins.fileutils" },
|
{ import = "plugins.fileutils" },
|
||||||
{ import = "plugins.lsp" },
|
{ import = "plugins.lsp" },
|
||||||
|
{ import = "plugins.dap" },
|
||||||
{ import = "plugins.edit" },
|
{ import = "plugins.edit" },
|
||||||
{ import = "plugins.misc" },
|
{ import = "plugins.misc" },
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1 @@
|
||||||
return {
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
# Author: js0ny
|
# Author: js0ny
|
||||||
# Sourced by user's zshrc 在用户的 zshrc 中被引用
|
# Sourced by user's zshrc 在用户的 zshrc 中被引用
|
||||||
|
|
||||||
|
|
||||||
# Define __CD_CMD as "cd" by default
|
# Define __CD_CMD as "cd" by default
|
||||||
__CD_CMD="cd"
|
__CD_CMD="cd"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue