diff options
| author | Nicholas Moore <nicholasvmoore@gmail.com> | 2025-10-29 07:40:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-29 07:40:12 -0500 |
| commit | 3a3666a08b47121fb84b7b5f8d9514941be34760 (patch) | |
| tree | d0e0b9ad67cd89478776e8d0118037f780504ac4 | |
| parent | 45f088bb6c322ec6b9cfe2b07ff3230b20114280 (diff) | |
| parent | 24019c96aac25f5bc71f464a175905bed500d14e (diff) | |
Merge pull request #1 from nicholasvmoore/feature/refactoring
Feature/refactoring
56 files changed, 888 insertions, 241 deletions
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml new file mode 100644 index 0000000..e1ab1b0 --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml @@ -0,0 +1,47 @@ +[font] +size = 10 + +[font.normal] +family = "Dejavu Sans Mono" +style = "Regular" + +[window] +opacity = 0.95 + +[window.padding] +x = 5 +y = 5 + +[selection] +save_to_clipboard = true + +# Colors (Doom One) + +# Default colors +[colors.primary] +foreground = '#bbc2cf' +background ='#282c34' + +[colors.cursor] +cursor = '#51afef' +text = '#282c34' + +[colors.normal] +black = '#282c34' +red = '#ff6c6b' +green = '#98be65' +yellow = '#ecbe7b' +blue = '#51afef' +magenta = '#a9a1e1' +cyan = '#46d9ff' +white = '#bbc2cf' + +[colors.bright] +black = '#3f444a' +red = '#ff6c6b' +green = '#98be65' +yellow = '#da8548' +blue = '#51afef' +magenta = '#a9a1e1' +cyan = '#46d9ff' +white = '#efefef' diff --git a/alacritty/.config/alacritty/alacritty.toml.bak b/alacritty/.config/alacritty/alacritty.toml.bak new file mode 100644 index 0000000..7523299 --- /dev/null +++ b/alacritty/.config/alacritty/alacritty.toml.bak @@ -0,0 +1,34 @@ +[font] +size = 10 + +[font.normal] +family = "Dejavu Sans Mono" +style = "Regular" + +[window] +opacity = 0.95 + +[window.padding] +x = 5 +y = 5 + +[selection] +save_to_clipboard = true + +# Colors (Doom One) + +# Default colors +[colors.primary] +background = '#282c34' +foreground = '#bbc2cf' + +# Normal colors +[colors.normal] +black = '#282c34' +red = '#ff6c6b' +green = '#98be65' +yellow = '#ecbe7b' +blue = '#51afef' +magenta = '#c678dd' +cyan = '#46d9ff' +white = '#bbc2cf' diff --git a/fish/.config/fish/completions/nvm.fish b/fish/.config/fish/completions/nvm.fish new file mode 100644 index 0000000..14be1b7 --- /dev/null +++ b/fish/.config/fish/completions/nvm.fish @@ -0,0 +1,21 @@ +complete --command nvm --exclusive +complete --command nvm --exclusive --long version --description "Print version" +complete --command nvm --exclusive --long help --description "Print help" +complete --command nvm --long silent --description "Suppress standard output" + +complete --command nvm --exclusive --condition __fish_use_subcommand --arguments install --description "Download and activate the specified Node version" +complete --command nvm --exclusive --condition __fish_use_subcommand --arguments use --description "Activate the specified Node version in the current shell" +complete --command nvm --exclusive --condition __fish_use_subcommand --arguments list --description "List installed Node versions" +complete --command nvm --exclusive --condition __fish_use_subcommand --arguments list-remote --description "List available Node versions to install" +complete --command nvm --exclusive --condition __fish_use_subcommand --arguments current --description "Print the currently-active Node version" +complete --command nvm --exclusive --condition "__fish_seen_subcommand_from install" --arguments "( + test -e $nvm_data && string split ' ' <$nvm_data/.index +)" +complete --command nvm --exclusive --condition "__fish_seen_subcommand_from use" --arguments "(_nvm_list | string split ' ')" +complete --command nvm --exclusive --condition __fish_use_subcommand --arguments uninstall --description "Uninstall the specified Node version" +complete --command nvm --exclusive --condition "__fish_seen_subcommand_from uninstall" --arguments "( + _nvm_list | string split ' ' | string replace system '' +)" +complete --command nvm --exclusive --condition "__fish_seen_subcommand_from use uninstall" --arguments "( + set --query nvm_default_version && echo default +)" diff --git a/fish/.config/fish/conf.d/nvm.fish b/fish/.config/fish/conf.d/nvm.fish new file mode 100644 index 0000000..7545699 --- /dev/null +++ b/fish/.config/fish/conf.d/nvm.fish @@ -0,0 +1,28 @@ +set --query XDG_DATA_HOME || set --local XDG_DATA_HOME ~/.local/share +set --query nvm_mirror || set --global nvm_mirror https://nodejs.org/dist +set --query nvm_data || set --global nvm_data $XDG_DATA_HOME/nvm + +function _nvm_install --on-event nvm_install + test ! -d $nvm_data && command mkdir -p $nvm_data + echo "Downloading the Node distribution index..." 2>/dev/null + _nvm_index_update +end + +function _nvm_update --on-event nvm_update + set --query --universal nvm_data && set --erase --universal nvm_data + set --query --universal nvm_mirror && set --erase --universal nvm_mirror + set --query nvm_mirror || set --global nvm_mirror https://nodejs.org/dist +end + +function _nvm_uninstall --on-event nvm_uninstall + command rm -rf $nvm_data + + set --query nvm_current_version && _nvm_version_deactivate $nvm_current_version + + set --names | string replace --filter --regex -- "^nvm" "set --erase nvm" | source + functions --erase (functions --all | string match --entire --regex -- "^_nvm_") +end + +if status is-interactive && set --query nvm_default_version && ! set --query nvm_current_version + nvm use --silent $nvm_default_version +end diff --git a/fish/.config/fish/conf.d/pyenv.fish b/fish/.config/fish/conf.d/pyenv.fish new file mode 100644 index 0000000..ff9549c --- /dev/null +++ b/fish/.config/fish/conf.d/pyenv.fish @@ -0,0 +1,16 @@ +while set pyenv_index (contains -i -- "/home/nicholas/.pyenv/shims" $PATH) +set -eg PATH[$pyenv_index]; end; set -e pyenv_index +set -gx PATH '/home/nicholas/.pyenv/shims' $PATH +set -gx PYENV_SHELL fish +command pyenv rehash 2>/dev/null +function pyenv + set command $argv[1] + set -e argv[1] + + switch "$command" + case activate deactivate rehash shell + source (pyenv "sh-$command" $argv|psub) + case "*" + command pyenv "$command" $argv + end +end diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish new file mode 100644 index 0000000..04961c8 --- /dev/null +++ b/fish/.config/fish/config.fish @@ -0,0 +1,17 @@ +source /usr/share/cachyos-fish-config/cachyos-config.fish +set fish_function_path $fish_function_path "/usr/share/powerline/bindings/fish" +source /usr/share/powerline/bindings/fish/powerline-setup.fish +powerline-setup + +# overwrite greeting +# potentially disabling fastfetch +#function fish_greeting +# # smth smth +#end +fish_add_path $HOME/.local/bin + +# Added by LM Studio CLI (lms) +set -gx PATH $PATH /home/nicholas/.lmstudio/bin +# End of LM Studio CLI section + +alias vi /usr/local/bin/nvim diff --git a/fish/.config/fish/fish_plugins b/fish/.config/fish/fish_plugins new file mode 100644 index 0000000..aea2aa0 --- /dev/null +++ b/fish/.config/fish/fish_plugins @@ -0,0 +1 @@ +jorgebucaran/nvm.fish diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables new file mode 100644 index 0000000..1bb5feb --- /dev/null +++ b/fish/.config/fish/fish_variables @@ -0,0 +1,104 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __done_min_cmd_duration:10000 +SETUVAR __done_notification_urgency_level:low +SETUVAR __fish_initialized:3800 +SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_list\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e\x7e/\x2econfig/fish/functions/nvm\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e\x7e/\x2econfig/fish/completions/nvm\x2efish +SETUVAR _fisher_plugins:jorgebucaran/nvm\x2efish +SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR fish_color_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:normal +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2di +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR fish_user_paths:/home/nicholas/\x2elocal/bin +SETUVAR nvm_default_version:lts +SETUVAR pure_begin_prompt_with_current_directory:true +SETUVAR pure_check_for_new_release:false +SETUVAR pure_color_at_sign:pure_color_mute +SETUVAR pure_color_aws_profile:pure_color_warning +SETUVAR pure_color_command_duration:pure_color_warning +SETUVAR pure_color_current_directory:pure_color_primary +SETUVAR pure_color_danger:red +SETUVAR pure_color_dark:black +SETUVAR pure_color_git_branch:pure_color_mute +SETUVAR pure_color_git_dirty:pure_color_mute +SETUVAR pure_color_git_stash:pure_color_info +SETUVAR pure_color_git_unpulled_commits:pure_color_info +SETUVAR pure_color_git_unpushed_commits:pure_color_info +SETUVAR pure_color_hostname:pure_color_mute +SETUVAR pure_color_info:cyan +SETUVAR pure_color_jobs:pure_color_normal +SETUVAR pure_color_k8s_context:pure_color_success +SETUVAR pure_color_k8s_namespace:pure_color_primary +SETUVAR pure_color_k8s_prefix:pure_color_info +SETUVAR pure_color_light:white +SETUVAR pure_color_mute:brblack +SETUVAR pure_color_nixdevshell_prefix:pure_color_info +SETUVAR pure_color_nixdevshell_symbol:pure_color_mute +SETUVAR pure_color_normal:normal +SETUVAR pure_color_prefix_root_prompt:pure_color_danger +SETUVAR pure_color_primary:blue +SETUVAR pure_color_prompt_on_error:pure_color_danger +SETUVAR pure_color_prompt_on_success:pure_color_success +SETUVAR pure_color_success:magenta +SETUVAR pure_color_system_time:pure_color_mute +SETUVAR pure_color_username_normal:pure_color_mute +SETUVAR pure_color_username_root:pure_color_light +SETUVAR pure_color_virtualenv:pure_color_mute +SETUVAR pure_color_warning:yellow +SETUVAR pure_enable_aws_profile:true +SETUVAR pure_enable_container_detection:true +SETUVAR pure_enable_git:true +SETUVAR pure_enable_k8s:false +SETUVAR pure_enable_nixdevshell:false +SETUVAR pure_enable_single_line_prompt:false +SETUVAR pure_enable_virtualenv:true +SETUVAR pure_reverse_prompt_symbol_in_vimode:true +SETUVAR pure_separate_prompt_on_error:false +SETUVAR pure_shorten_prompt_current_directory_length:0 +SETUVAR pure_shorten_window_title_current_directory_length:0 +SETUVAR pure_show_jobs:false +SETUVAR pure_show_prefix_root_prompt:false +SETUVAR pure_show_subsecond_command_duration:false +SETUVAR pure_show_system_time:false +SETUVAR pure_symbol_aws_profile_prefix: +SETUVAR pure_symbol_container_prefix: +SETUVAR pure_symbol_git_dirty:\x2a +SETUVAR pure_symbol_git_stash:\u2261 +SETUVAR pure_symbol_git_unpulled_commits:\u21e3 +SETUVAR pure_symbol_git_unpushed_commits:\u21e1 +SETUVAR pure_symbol_k8s_prefix:\u2638 +SETUVAR pure_symbol_nixdevshell_prefix:\u2744\ufe0f +SETUVAR pure_symbol_prefix_root_prompt:\x23 +SETUVAR pure_symbol_prompt:\u276f +SETUVAR pure_symbol_reverse_prompt:\u276e +SETUVAR pure_symbol_ssh_prefix: +SETUVAR pure_symbol_title_bar_separator:\x2d +SETUVAR pure_symbol_virtualenv_prefix: +SETUVAR pure_threshold_command_duration:5 +SETUVAR pure_truncate_prompt_current_directory_keeps:\x2d1 +SETUVAR pure_truncate_window_title_current_directory_keeps:\x2d1 diff --git a/fish/.config/fish/functions/_nvm_index_update.fish b/fish/.config/fish/functions/_nvm_index_update.fish new file mode 100644 index 0000000..c66753d --- /dev/null +++ b/fish/.config/fish/functions/_nvm_index_update.fish @@ -0,0 +1,20 @@ +function _nvm_index_update + test ! -d $nvm_data && command mkdir -p $nvm_data + + set --local index $nvm_data/.index + + if not command curl -q --location --silent $nvm_mirror/index.tab >$index.temp + command rm -f $index.temp + echo "nvm: Can't update index, host unavailable: \"$nvm_mirror\"" >&2 + return 1 + end + + command awk -v OFS=\t ' + /v0.9.12/ { exit } # Unsupported + NR > 1 { + print $1 (NR == 2 ? " latest" : $10 != "-" ? " lts/" tolower($10) : "") + } + ' $index.temp >$index + + command rm -f $index.temp +end diff --git a/fish/.config/fish/functions/_nvm_list.fish b/fish/.config/fish/functions/_nvm_list.fish new file mode 100644 index 0000000..1623bb8 --- /dev/null +++ b/fish/.config/fish/functions/_nvm_list.fish @@ -0,0 +1,14 @@ +function _nvm_list + set --local versions $nvm_data/* + + set --query versions[1] && + string match --entire --regex -- ( + string replace --all -- $nvm_data/ "" $versions | + string match --regex -- "v\d.+" | + string escape --style=regex | + string join "|" + ) <$nvm_data/.index + + command --all node | + string match --quiet --invert --regex -- "^$nvm_data" && echo system +end diff --git a/fish/.config/fish/functions/_nvm_version_activate.fish b/fish/.config/fish/functions/_nvm_version_activate.fish new file mode 100644 index 0000000..f7dfef7 --- /dev/null +++ b/fish/.config/fish/functions/_nvm_version_activate.fish @@ -0,0 +1,4 @@ +function _nvm_version_activate --argument-names ver + set --global --export nvm_current_version $ver + set --prepend PATH $nvm_data/$ver/bin +end diff --git a/fish/.config/fish/functions/_nvm_version_deactivate.fish b/fish/.config/fish/functions/_nvm_version_deactivate.fish new file mode 100644 index 0000000..24dd36e --- /dev/null +++ b/fish/.config/fish/functions/_nvm_version_deactivate.fish @@ -0,0 +1,5 @@ +function _nvm_version_deactivate --argument-names ver + test "$nvm_current_version" = "$ver" && set --erase nvm_current_version + set --local index (contains --index -- $nvm_data/$ver/bin $PATH) && + set --erase PATH[$index] +end diff --git a/fish/.config/fish/functions/nvm.fish b/fish/.config/fish/functions/nvm.fish new file mode 100644 index 0000000..64d94c5 --- /dev/null +++ b/fish/.config/fish/functions/nvm.fish @@ -0,0 +1,237 @@ +function nvm --description "Node version manager" + for silent in --silent -s + if set --local index (contains --index -- $silent $argv) + set --erase argv[$index] && break + end + set --erase silent + end + + set --local cmd $argv[1] + set --local ver $argv[2] + + if set --query silent && ! set --query cmd[1] + echo "nvm: Version number not specified (see nvm -h for usage)" >&2 + return 1 + end + + if ! set --query ver[1] && contains -- "$cmd" install use + for file in .nvmrc .node-version + set file (_nvm_find_up $PWD $file) && read ver <$file && break + end + + if ! set --query ver[1] + echo "nvm: Invalid version or missing \".nvmrc\" file" >&2 + return 1 + end + end + + set --local their_version $ver + + switch "$cmd" + case -v --version + echo "nvm, version 2.2.18" + case "" -h --help + echo "Usage: nvm install <version> Download and activate the specified Node version" + echo " nvm install Install the version specified in the nearest .nvmrc file" + echo " nvm use <version> Activate the specified Node version in the current shell" + echo " nvm use Activate the version specified in the nearest .nvmrc file" + echo " nvm list List installed Node versions" + echo " nvm list-remote List available Node versions to install" + echo " nvm list-remote <regex> List Node versions matching a given regex pattern" + echo " nvm current Print the currently-active Node version" + echo " nvm uninstall <version> Uninstall the specified Node version" + echo "Options:" + echo " -s, --silent Suppress standard output" + echo " -v, --version Print the version of nvm" + echo " -h, --help Print this help message" + echo "Variables:" + echo " nvm_arch Override architecture, e.g. x64-musl" + echo " nvm_mirror Use a mirror for downloading Node binaries" + echo " nvm_default_version Set the default version for new shells" + echo " nvm_default_packages Install a list of packages every time a Node version is installed" + echo " nvm_data Set a custom directory for storing nvm data" + echo "Examples:" + echo " nvm install latest Install the latest version of Node" + echo " nvm use 14.15.1 Use Node version 14.15.1" + echo " nvm use system Activate the system's Node version" + + case install + _nvm_index_update + + string match --entire --regex -- (_nvm_version_match $ver) <$nvm_data/.index | read ver alias + + if ! set --query ver[1] + echo "nvm: Invalid version number or alias: \"$their_version\"" >&2 + return 1 + end + + if test ! -e $nvm_data/$ver + set --local os (command uname -s | string lower) + set --local ext tar.gz + set --local arch (command uname -m) + set --local tarcmd tar + + switch $os + case aix + set arch ppc64 + case sunos + case linux + case darwin + case {msys_nt,mingw\*_nt}\* + set os win + set ext zip + set tarcmd bsdtar + case \* + echo "nvm: Unsupported operating system: \"$os\"" >&2 + return 1 + end + + switch $arch + case i\*86 + set arch x86 + case x86_64 + set arch x64 + case arm64 + string match --regex --quiet "v(?<major>\d+)" $ver + if test "$os" = darwin -a $major -lt 16 + set arch x64 + end + case armv6 armv6l + set arch armv6l + case armv7 armv7l + set arch armv7l + case armv8 armv8l aarch64 + set arch arm64 + end + + set --query nvm_arch && set arch $nvm_arch + + set --local dir "node-$ver-$os-$arch" + set --local url $nvm_mirror/$ver/$dir.$ext + + command mkdir -p $nvm_data/$ver + + if ! set --query silent + echo -e "Installing Node \x1b[1m$ver\x1b[22m $alias" + echo -e "Fetching \x1b[4m$url\x1b[24m\x1b[7m" + end + + if ! command curl -q $silent --progress-bar --location $url | + command $tarcmd --extract --gzip --directory $nvm_data/$ver 2>/dev/null + command rm -rf $nvm_data/$ver + echo -e "\033[F\33[2K\x1b[0mnvm: Invalid mirror or host unavailable: \"$url\"" >&2 + return 1 + end + + set --query silent || echo -en "\033[F\33[2K\x1b[0m" + + if test "$os" = win + command mv $nvm_data/$ver/$dir $nvm_data/$ver/bin + else + command mv $nvm_data/$ver/$dir/* $nvm_data/$ver + command rm -rf $nvm_data/$ver/$dir + end + end + + if test $ver != "$nvm_current_version" + set --query nvm_current_version && _nvm_version_deactivate $nvm_current_version + _nvm_version_activate $ver + + set --query nvm_default_packages[1] && npm install --global $silent $nvm_default_packages + end + + set --query silent || printf "Now using Node %s (npm %s) %s\n" (_nvm_node_info) + case use + test $ver = default && set ver $nvm_default_version + _nvm_list | string match --entire --regex -- (_nvm_version_match $ver) | read ver __ + + if ! set --query ver[1] + echo "nvm: Can't use Node \"$their_version\", version must be installed first" >&2 + return 1 + end + + if test $ver != "$nvm_current_version" + set --query nvm_current_version && _nvm_version_deactivate $nvm_current_version + test $ver != system && _nvm_version_activate $ver + end + + set --query silent || printf "Now using Node %s (npm %s) %s\n" (_nvm_node_info) + case uninstall + if test -z "$ver" + echo "nvm: Not enough arguments for command: \"$cmd\"" >&2 + return 1 + end + + test $ver = default && test ! -z "$nvm_default_version" && set ver $nvm_default_version + + _nvm_list | string match --entire --regex -- (_nvm_version_match $ver) | read ver __ + + if ! set -q ver[1] + echo "nvm: Node version not installed or invalid: \"$their_version\"" >&2 + return 1 + end + + set --query silent || printf "Uninstalling Node %s %s\n" $ver (string replace ~ \~ "$nvm_data/$ver/bin/node") + + _nvm_version_deactivate $ver + + command rm -rf $nvm_data/$ver + case current + _nvm_current + case ls list + _nvm_list | _nvm_list_format (_nvm_current) $argv[2] + case lsr {ls,list}-remote + _nvm_index_update || return + _nvm_list | command awk ' + FILENAME == "-" && (is_local[$1] = FNR == NR) { next } { + print $0 (is_local[$1] ? " ✓" : "") + } + ' - $nvm_data/.index | _nvm_list_format (_nvm_current) $argv[2] + case \* + echo "nvm: Unknown command or option: \"$cmd\" (see nvm -h for usage)" >&2 + return 1 + end +end + +function _nvm_find_up --argument-names path file + test -e "$path/$file" && echo $path/$file || begin + test ! -z "$path" || return + _nvm_find_up (string replace --regex -- '/[^/]*$' "" $path) $file + end +end + +function _nvm_version_match --argument-names ver + string replace --regex -- '^v?(\d+|\d+\.\d+)$' 'v$1.' $ver | + string replace --filter --regex -- '^v?(\d+)' 'v$1' | + string escape --style=regex || string lower '\b'$ver'(?:/\w+)?$' +end + +function _nvm_list_format --argument-names current regex + command awk -v current="$current" -v regex="$regex" ' + $0 ~ regex { + aliases[versions[i++] = $1] = $2 " " $3 + pad = (n = length($1)) > pad ? n : pad + } + END { + if (!i) exit 1 + while (i--) + printf((current == versions[i] ? " ▶ " : " ") "%"pad"s %s\n", + versions[i], aliases[versions[i]]) + } + ' +end + +function _nvm_current + command --search --quiet node || return + set --query nvm_current_version && echo $nvm_current_version || echo system +end + +function _nvm_node_info + set --local npm_path (string replace bin/npm-cli.js "" (realpath (command --search npm))) + test -f $npm_path/package.json || set --local npm_version_default (command npm --version) + command node --eval " + console.log(process.version) + console.log('$npm_version_default' ? '$npm_version_default': require('$npm_path/package.json').version) + console.log(process.execPath) + " | string replace -- ~ \~ +end diff --git a/hypr/conf/environments.conf b/hypr/conf/environments.conf index a0f6146..8d77d8f 100644 --- a/hypr/conf/environments.conf +++ b/hypr/conf/environments.conf @@ -17,6 +17,7 @@ env = MOZ_ENABLE_WAYLAND,1 # Set the cursor size for xcursor env = XCURSOR_SIZE,24 +env = XCURSOR_THEME,rose-pine-hyprcursor # Disable appimage launcher by default env = APPIMAGELAUNCHER_DISABLE,1 diff --git a/hypr/conf/monitor.conf b/hypr/conf/monitor.conf index 8bb498e..96234be 100644 --- a/hypr/conf/monitor.conf +++ b/hypr/conf/monitor.conf @@ -1,3 +1,4 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=eDP-1,2880x1920@60,auto,2 +monitor=eDP-1,2880x1920@60,0x0,2 monitor=DP-1,3440x1440@60,auto,1 +monitor=DP-2,3440x1440@59.97,-960x-1440,1 diff --git a/hypr/conf/windowrules.conf b/hypr/conf/windowrules.conf index 1da6531..30e2810 100644 --- a/hypr/conf/windowrules.conf +++ b/hypr/conf/windowrules.conf @@ -1 +1,2 @@ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
\ No newline at end of file +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +#windowrule= fullscreen, class:Alacritty diff --git a/nvim/.config/nvim/.nvmrc b/nvim/.config/nvim/.nvmrc new file mode 100644 index 0000000..1a2f5bd --- /dev/null +++ b/nvim/.config/nvim/.nvmrc @@ -0,0 +1 @@ +lts/*
\ No newline at end of file diff --git a/nvim/.stylua.toml b/nvim/.config/nvim/.stylua.toml index 139e939..139e939 100644 --- a/nvim/.stylua.toml +++ b/nvim/.config/nvim/.stylua.toml diff --git a/nvim/.config/nvim/AGENTS.md b/nvim/.config/nvim/AGENTS.md new file mode 100644 index 0000000..9a4708c --- /dev/null +++ b/nvim/.config/nvim/AGENTS.md @@ -0,0 +1,27 @@ +# Agent Guidelines for Neovim Configuration + +## Build/Test/Lint Commands +- No build commands - this is a Neovim configuration +- Format Lua code: `stylua .` (uses `.stylua.toml` config) +- No test suite - configuration only + +## Code Style & Conventions +- **Language**: Lua for all configuration files +- **Formatting**: Use `stylua` with 2-space indentation, Unix line endings +- **Imports**: Use `require('module')` syntax, prefer local assignments +- **Comments**: Use `--` for single-line, `--[[]]` for multi-line blocks +- **Naming**: snake_case for variables/functions, prefer descriptive names +- **Plugin loading**: Use lazy.nvim format with proper dependencies +- **Settings**: Use `vim.opt` for options, `vim.keymap.set` for keymaps + +## Project Structure +- `init.lua`: Main configuration entry point (single-file approach) +- `lua/custom/plugins/`: Custom plugin configurations +- `lua/kickstart/plugins/`: Kickstart-provided plugin configs +- `.stylua.toml`: Lua formatting configuration + +## Key Patterns +- Leader key is `<space>` (vim.g.mapleader) +- Plugin specs in table format with dependencies/opts/config +- LSP configuration via mason + lspconfig pattern +- Autocommands use `nvim_create_autocmd` with proper groups
\ No newline at end of file diff --git a/nvim/LICENSE.md b/nvim/.config/nvim/LICENSE.md index 9cf1062..9cf1062 100644 --- a/nvim/LICENSE.md +++ b/nvim/.config/nvim/LICENSE.md diff --git a/nvim/README.md b/nvim/.config/nvim/README.md index 8ace8b9..8ace8b9 100644 --- a/nvim/README.md +++ b/nvim/.config/nvim/README.md diff --git a/nvim/doc/kickstart.txt b/nvim/.config/nvim/doc/kickstart.txt index cb87ac3..cb87ac3 100644 --- a/nvim/doc/kickstart.txt +++ b/nvim/.config/nvim/doc/kickstart.txt diff --git a/nvim/doc/tags b/nvim/.config/nvim/doc/tags index 687ae77..687ae77 100644 --- a/nvim/doc/tags +++ b/nvim/.config/nvim/doc/tags diff --git a/nvim/init.lua b/nvim/.config/nvim/init.lua index eb9e9f5..39c445a 100644 --- a/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,87 +1,5 @@ --[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== -======== .-----. ======== -======== .----------------------. | === | ======== -======== |.-""""""""""""""""""-.| |-----| ======== -======== || || | === | ======== -======== || KICKSTART.NVIM || |-----| ======== -======== || || | === | ======== -======== || || |-----| ======== -======== ||:Tutor || |:::::| ======== -======== |'-..................-'| |____o| ======== -======== `"")----------------(""` ___________ ======== -======== /::::::::::| |::::::::::\ \ no mouse \ ======== -======== /:::========| |==hjkl==:::\ \ required \ ======== -======== '""""""""""""' '""""""""""""' '""""""""""' ======== -======== ======== -===================================================================== -===================================================================== - -What is Kickstart? - - Kickstart.nvim is *not* a distribution. - - Kickstart.nvim is a starting point for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you can start exploring, configuring and tinkering to - make Neovim your own! That might mean leaving Kickstart just the way it is for a while - or immediately breaking it into modular pieces. It's up to you! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example which will only take 10-15 minutes: - - https://learnxinyminutes.com/docs/lua/ - - After understanding a bit more about Lua, you can use `:help lua-guide` as a - reference for how Neovim integrates Lua. - - :help lua-guide - - (or HTML version): https://neovim.io/doc/user/lua-guide.html - -Kickstart Guide: - - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. - - If you don't know what this means, type the following: - - <escape key> - - : - - Tutor - - <enter key> - - (If you already know the Neovim basics, you can skip this step.) - - Once you've completed that, you can continue working through **AND READING** the rest - of the kickstart init.lua. - - Next, run AND READ `:help`. - This will open up a help window with some basic information - about reading, navigating and searching the builtin help documentation. - - This should be the first place you go to look when you're stuck or confused - with something. It's one of my favorite Neovim features. - - MOST IMPORTANTLY, we provide a keymap "<space>sh" to [s]earch the [h]elp documentation, - which is very useful when you're not exactly sure of what you're looking for. - - I have left several `:help X` comments throughout the init.lua - These are hints about where to find more information about the relevant settings, - plugins or Neovim features used in Kickstart. - - NOTE: Look for lines like this - - Throughout the file. These are for you, the reader, to help you understand what is happening. - Feel free to delete them once you know what you're doing, but they should serve as a guide - for when you are first encountering a few different constructs in your Neovim config. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now! :) +-- Setup initial configuration --]] -- Set <space> as the leader key @@ -161,6 +79,9 @@ vim.opt.scrolloff = 10 -- See `:help 'confirm'` vim.opt.confirm = true +-- Set the column width to 80 to match coding conventions +vim.opt.colorcolumn = '120' + -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` @@ -194,12 +115,6 @@ vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right win vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' }) --- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes --- vim.keymap.set("n", "<C-S-h>", "<C-w>H", { desc = "Move window to the left" }) --- vim.keymap.set("n", "<C-S-l>", "<C-w>L", { desc = "Move window to the right" }) --- vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" }) --- vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" }) - -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -239,8 +154,9 @@ vim.opt.rtp:prepend(lazypath) -- NOTE: Here is where you install your plugins. require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - 'ThePrimeagen/vim-be-good', + -- 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + -- 'ThePrimeagen/vim-be-good', + -- { 'akinsho/toggleterm.nvim', version = '*', config = true }, -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following -- keys can be used to configure plugin behavior/loading/etc. @@ -399,12 +315,18 @@ require('lazy').setup({ -- You can put your default mappings / updates / etc. in here -- All the info you're looking for is in `:help telescope.setup()` -- - -- defaults = { - -- mappings = { - -- i = { ['<c-enter>'] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} + defaults = { + vimgrep_arguments = { + 'rg', + '--color=never', + '--no-heading', + '--with-filename', + '--line-number', + '--column', + '--smart-case', + '--hidden', + }, + }, extensions = { ['ui-select'] = { require('telescope.themes').get_dropdown(), @@ -420,7 +342,9 @@ require('lazy').setup({ local builtin = require 'telescope.builtin' vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', '<leader>sf', function() + builtin.find_files { hidden = true } + end, { desc = '[S]earch [F]iles' }) vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) @@ -715,6 +639,7 @@ require('lazy').setup({ 'pylsp', 'bashls', 'jinja_lsp', + 'clangd', }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } @@ -875,34 +800,6 @@ require('lazy').setup({ signature = { enabled = true }, }, }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'rose-pine/neovim', - name = 'rose-pine', - config = function() - -- vim.cmd 'colorscheme rose-pine-moon' - end, - }, - { - 'catppuccin/nvim', - name = 'catppuccin', - priority = 1000, - config = function() - require('catppuccin').setup { - flavour = 'macchiato', - transparent_background = true, - integrations = { - notify = true, - }, - } - vim.cmd 'colorscheme catppuccin' - end, - }, - -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, @@ -949,7 +846,7 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'python', 'go' }, -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -989,7 +886,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! @@ -1017,19 +914,5 @@ require('lazy').setup({ }, }) -vim.filetype.add { - extension = { - yml = 'yaml.ansible', - }, -} - -vim.filetype.add { - extension = { - jinja = 'jinja', - jinja2 = 'jinja', - j2 = 'jinja', - }, -} - -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..1b9afbf --- /dev/null +++ b/nvim/.config/nvim/lazy-lock.json @@ -0,0 +1,30 @@ +{ + "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "conform.nvim": { "branch": "master", "commit": "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081" }, + "doom-one.nvim": { "branch": "main", "commit": "beae92173315c7282f6897e666cfd67fbf0f3ac9" }, + "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, + "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" }, + "lazydev.nvim": { "branch": "main", "commit": "c2dfe354571a8255c5d3e96a9a4c297c89ce2347" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "35ec9e1425c2f9a36f556893336af4f302c63214" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "mini.nvim": { "branch": "main", "commit": "ee4a4a4abed25e3d108d985b0553c5271f2f71aa" }, + "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, + "nvim-lspconfig": { "branch": "master", "commit": "cbd1e91296189a765094810de1b71a04e2597579" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "tinygo.nvim": { "branch": "main", "commit": "5c097bba3e6dd5ebb5b52001e1e9cfba0c81849d" }, + "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } +} diff --git a/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua b/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua new file mode 100644 index 0000000..ef3d14a --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/doom-nvim.lua @@ -0,0 +1,37 @@ +return { + 'NTBBloodbath/doom-one.nvim', + config = function() + -- Add color to cursor + vim.g.doom_one_cursor_coloring = true + -- Set :terminal colors + vim.g.doom_one_terminal_colors = true + -- Enable italic comments + vim.g.doom_one_italic_comments = false + -- Enable TS support + vim.g.doom_one_enable_treesitter = true + -- Color whole diagnostic text or only underline + vim.g.doom_one_diagnostics_text_color = false + -- Enable transparent background + vim.g.doom_one_transparent_background = false + + -- Pumblend transparency + vim.g.doom_one_pumblend_enable = false + vim.g.doom_one_pumblend_transparency = 20 + + -- Plugins integration + vim.g.doom_one_plugin_neorg = true + vim.g.doom_one_plugin_barbar = false + vim.g.doom_one_plugin_telescope = false + vim.g.doom_one_plugin_neogit = true + vim.g.doom_one_plugin_nvim_tree = true + vim.g.doom_one_plugin_dashboard = true + vim.g.doom_one_plugin_startify = true + vim.g.doom_one_plugin_whichkey = true + vim.g.doom_one_plugin_indent_blankline = true + vim.g.doom_one_plugin_vim_illuminate = true + vim.g.doom_one_plugin_lspsaga = false + + -- Load the colorscheme + vim.cmd.colorscheme 'doom-one' + end, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/filetypes.lua b/nvim/.config/nvim/lua/custom/plugins/filetypes.lua new file mode 100644 index 0000000..73c99f2 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/filetypes.lua @@ -0,0 +1,15 @@ +return { + vim.filetype.add { + extension = { + yml = 'yaml.ansible', + }, + }, + + vim.filetype.add { + extension = { + jinja = 'jinja', + jinja2 = 'jinja', + j2 = 'jinja', + }, + }, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/harppon.lua b/nvim/.config/nvim/lua/custom/plugins/harppon.lua new file mode 100644 index 0000000..1fc29bb --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/harppon.lua @@ -0,0 +1,37 @@ +return { + { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local harpoon = require 'harpoon' + harpoon:setup() + vim.keymap.set('n', '<leader>a', function() + harpoon:list():add() + end) + vim.keymap.set('n', '<C-e>', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end) + vim.keymap.set('n', '<leader>1', function() + harpoon:list():select(1) + end) + vim.keymap.set('n', '<leader>2', function() + harpoon:list():select(2) + end) + vim.keymap.set('n', '<leader>3', function() + harpoon:list():select(3) + end) + vim.keymap.set('n', '<leader>4', function() + harpoon:list():select(4) + end) + + -- Toggle previous & next buffers stored within Harpoon list + vim.keymap.set('n', '<C-S-P>', function() + harpoon:list():prev() + end) + vim.keymap.set('n', '<C-S-N>', function() + harpoon:list():next() + end) + end, + }, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/headlines.lua b/nvim/.config/nvim/lua/custom/plugins/headlines.lua new file mode 100644 index 0000000..9555327 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/headlines.lua @@ -0,0 +1,5 @@ +return { + 'lukas-reineke/headlines.nvim', + dependencies = 'nvim-treesitter/nvim-treesitter', + config = true, -- or `opts = {}` +} diff --git a/nvim/lua/custom/plugins/init.lua b/nvim/.config/nvim/lua/custom/plugins/init.lua index be0eb9d..be0eb9d 100644 --- a/nvim/lua/custom/plugins/init.lua +++ b/nvim/.config/nvim/lua/custom/plugins/init.lua diff --git a/nvim/.config/nvim/lua/custom/plugins/lualine.lua b/nvim/.config/nvim/lua/custom/plugins/lualine.lua new file mode 100644 index 0000000..23ea0a0 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/lualine.lua @@ -0,0 +1,16 @@ +return { + { + 'nvim-lualine/lualine.nvim', + dependencies = { + 'nvim-tree/nvim-web-devicons', + }, + config = function() + require('lualine').setup { + options = { + icons_enabled = true, + theme = 'moonfly', + }, + } + end, + }, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/remap.lua b/nvim/.config/nvim/lua/custom/plugins/remap.lua new file mode 100644 index 0000000..367d21c --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/remap.lua @@ -0,0 +1,5 @@ +return { + -- Scroll by half page and keep cursor in middle + vim.keymap.set('n', '<C-d>', '<C-d>zz'), + vim.keymap.set('n', '<C-u>', '<C-u>zz'), +} diff --git a/nvim/.config/nvim/lua/custom/plugins/tinygo.lua b/nvim/.config/nvim/lua/custom/plugins/tinygo.lua new file mode 100644 index 0000000..8115326 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/tinygo.lua @@ -0,0 +1,8 @@ +return { + { + 'pcolladosoto/tinygo.nvim', + config = function() + require('tinygo').setup() + end, + }, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/toggleterm.lua b/nvim/.config/nvim/lua/custom/plugins/toggleterm.lua new file mode 100644 index 0000000..c5a32c0 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/toggleterm.lua @@ -0,0 +1,21 @@ +return { + { + 'akinsho/toggleterm.nvim', + version = '*', + opts = { + start_in_insert = true, + persistent_mode = false, + shell = vim.o.shell, + auto_scroll = true, + + -- Float options + float_opts = { + border = 'single', + title_pos = 'center', + }, + + -- Bindings + vim.keymap.set('n', '<leader>`', ':ToggleTerm direction=float<cr>', { desc = 'Open a floating terminal' }), + }, + }, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/vim-be-good.lua b/nvim/.config/nvim/lua/custom/plugins/vim-be-good.lua new file mode 100644 index 0000000..7e5c709 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/vim-be-good.lua @@ -0,0 +1,5 @@ +return { + { + 'ThePrimeagen/vim-be-good', + }, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/vim-sleuth.lua b/nvim/.config/nvim/lua/custom/plugins/vim-sleuth.lua new file mode 100644 index 0000000..123ac6a --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/vim-sleuth.lua @@ -0,0 +1,3 @@ +return { + { 'tpope/vim-sleuth' }, -- Detect tabstop and shiftwidth automatically +} diff --git a/nvim/.config/nvim/lua/custom/plugins/which-key.lua b/nvim/.config/nvim/lua/custom/plugins/which-key.lua new file mode 100644 index 0000000..1f73adc --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/which-key.lua @@ -0,0 +1,3 @@ +return { + -- { 'folke/which-key.nvim' }, +} diff --git a/nvim/lua/kickstart/health.lua b/nvim/.config/nvim/lua/kickstart/health.lua index b59d086..b59d086 100644 --- a/nvim/lua/kickstart/health.lua +++ b/nvim/.config/nvim/lua/kickstart/health.lua diff --git a/nvim/lua/kickstart/plugins/autopairs.lua b/nvim/.config/nvim/lua/kickstart/plugins/autopairs.lua index 386d392..386d392 100644 --- a/nvim/lua/kickstart/plugins/autopairs.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/autopairs.lua diff --git a/nvim/lua/kickstart/plugins/debug.lua b/nvim/.config/nvim/lua/kickstart/plugins/debug.lua index 753cb0c..753cb0c 100644 --- a/nvim/lua/kickstart/plugins/debug.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/debug.lua diff --git a/nvim/lua/kickstart/plugins/gitsigns.lua b/nvim/.config/nvim/lua/kickstart/plugins/gitsigns.lua index cbbd22d..cbbd22d 100644 --- a/nvim/lua/kickstart/plugins/gitsigns.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/gitsigns.lua diff --git a/nvim/lua/kickstart/plugins/indent_line.lua b/nvim/.config/nvim/lua/kickstart/plugins/indent_line.lua index ed7f269..ed7f269 100644 --- a/nvim/lua/kickstart/plugins/indent_line.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/indent_line.lua diff --git a/nvim/lua/kickstart/plugins/lint.lua b/nvim/.config/nvim/lua/kickstart/plugins/lint.lua index 907c6bf..907c6bf 100644 --- a/nvim/lua/kickstart/plugins/lint.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/lint.lua diff --git a/nvim/lua/kickstart/plugins/neo-tree.lua b/nvim/.config/nvim/lua/kickstart/plugins/neo-tree.lua index bd44226..bd44226 100644 --- a/nvim/lua/kickstart/plugins/neo-tree.lua +++ b/nvim/.config/nvim/lua/kickstart/plugins/neo-tree.lua diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json deleted file mode 100644 index 26a1357..0000000 --- a/nvim/lazy-lock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, - "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, - "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "d600d3922c1d001422689319a8f915136bb64e1e" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.nvim": { "branch": "main", "commit": "a8b1d74f45dadf3554c0eed784c6ccd8ade67883" }, - "nvim-lint": { "branch": "master", "commit": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63" }, - "nvim-lspconfig": { "branch": "master", "commit": "c40a2dca6e4a4f4af262375dcb71692882b6122c" }, - "nvim-treesitter": { "branch": "master", "commit": "684eeac91ed8e297685a97ef70031d19ac1de25a" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, - "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } -} diff --git a/tmux/.config/tmux/plugins/tmux b/tmux/.config/tmux/plugins/tmux new file mode 160000 +Subproject d85b2658c4f199720408f91f869591ae3a0704b diff --git a/tmux/.config/tmux/plugins/tmux-resurrect b/tmux/.config/tmux/plugins/tmux-resurrect new file mode 160000 +Subproject cff343cf9e81983d3da0c8562b01616f12e8d54 diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible new file mode 160000 +Subproject 25cb91f42d020f675bb0a2ce3fbd3a5d96119ef diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm new file mode 160000 +Subproject 99469c4a9b1ccf77fade25842dc7bafbc8ce994 diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf new file mode 100644 index 0000000..479dfb9 --- /dev/null +++ b/tmux/.config/tmux/tmux.conf @@ -0,0 +1,69 @@ +# Set terminal colors +set-option -sa terminal-overrides ",xterm*:Tc" + +#set-option -g status-style bg=default +#set-option -g status-justify left +#set-option -g status-left-length 50 +#set-option -g status-interval 2 +#set-option -g status-left '[ #[fg=white,bright]#h ] #[default]' +#set-option -g status-right-length 80 +#set-option -g status-right '[ #($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -a 1 --interval 2) | #{battery_percentage} #{battery_remain} | #[fg=white,bright]%m/%d %H:%M #[fg=default]]' +#set-window-option -g window-status-current-format '#[fg=red,bg=default]( #[fg=white,bright,bg=default]#I:#W#[fg=red,nobright,bg=default] )#[fg=default]' +set -as terminal-features ",alacritty*:RGB" +source /usr/share/powerline/bindings/tmux/powerline.conf + +set -g mouse on +set -g base-index 1 +set -g pane-base-index 1 + +# Map prefix to A +unbind C-b +set-option -g prefix C-a +bind-key C-a send-prefix + +unbind % +bind | split-window -h + +unbind '"' +bind - split-window -v + +set-window-option -g mode-keys vi +bind -T copy-mode-vi v send-keys -X begin-selection +bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' + +# vim-like pane switching +bind -r ^ last-window +bind -r k select-pane -U +bind -r j select-pane -D +bind -r h select-pane -L +bind -r l select-pane -R + +# vim-linke pane resizing +bind -r K resize-pane -U 5 +bind -r J resize-pane -D 5 +bind -r H resize-pane -L 5 +bind -r L resize-pane -R 5 +bind -r m resize-pane -Z + +bind-key -T copy-mode-vi 'v' send -X begin-selection # start selecting text with "v" +bind-key -T copy-mode-vi 'y' send -X copy-selection # copy text with "y" + +unbind -T copy-mode-vi MouseDragEnd1Pane # don't exit copy mode when dragging with mouse + +# List of plugins +set -g @tpm_plugins ' \ + tmux-plugins/tpm \ + tmux-plugins/tmux-sensible \ + tmux-plugins/tmux-resurrect \ + git@github.com:dracula/tmux \ + ' + # thewtex/tmux-mem-cpu-load \ + # tmux-plugins/tmux-battery \ +#' + +set -g @dracula-plugins "cpu-usage battery time" +set -g @dracula-show-powerline true +set -g @dracula-battery-label " " +set -g @dracula-refresh-rate 1 + +run '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm' diff --git a/tmux/plugins/tmux-battery b/tmux/plugins/tmux-battery deleted file mode 160000 -Subproject 48fae59ba4503cf345d25e4e66d79685aa3ceb7 diff --git a/tmux/tmux.conf b/tmux/tmux.conf deleted file mode 100644 index 2acbb83..0000000 --- a/tmux/tmux.conf +++ /dev/null @@ -1,60 +0,0 @@ -# Set terminal colors -set-option -sa terminal-overrides ",xterm*:Tc" - -set-option -g status-style bg=default -set-option -g status-justify left -set-option -g status-left-length 50 -set-option -g status-interval 2 -set-option -g status-left '[ #[fg=white,bright]#h ] #[default]' -set-option -g status-right-length 80 -set-option -g status-right '[ #($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load -a 1 --interval 2) | #{battery_percentage} #{battery_remain} | #[fg=white,bright]%m/%d %H:%M #[fg=default]]' -set-window-option -g window-status-current-format '#[fg=red,bg=default]( #[fg=white,bright,bg=default]#I:#W#[fg=red,nobright,bg=default] )#[fg=default]' - -set -g mouse on -set -g base-index 1 -set -g pane-base-index 1 - -# Map prefix to A -unbind C-b -set-option -g prefix C-a -bind-key C-a send-prefix - -unbind % -bind | split-window -h - -unbind '"' -bind - split-window -v - -set-window-option -g mode-keys vi -bind -T copy-mode-vi v send-keys -X begin-selection -bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' - -# vim-like pane switching -bind -r ^ last-window -bind -r k select-pane -U -bind -r j select-pane -D -bind -r h select-pane -L -bind -r l select-pane -R - -# vim-linke pane resizing -bind -r K resize-pane -U 5 -bind -r J resize-pane -D 5 -bind -r H resize-pane -L 5 -bind -r L resize-pane -R 5 -bind -r m resize-pane -Z - -bind-key -T copy-mode-vi 'v' send -X begin-selection # start selecting text with "v" -bind-key -T copy-mode-vi 'y' send -X copy-selection # copy text with "y" - -unbind -T copy-mode-vi MouseDragEnd1Pane # don't exit copy mode when dragging with mouse - -# List of plugins -set -g @tpm_plugins ' \ - tmux-plugins/tpm \ - tmux-plugins/tmux-sensible \ - tmux-plugins/tmux-resurrect \ - thewtex/tmux-mem-cpu-load \ - tmux-plugins/tmux-battery \ -' - -run '$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm' diff --git a/waybar/config b/waybar/config index 1296a1b..6bc1e84 100644 --- a/waybar/config +++ b/waybar/config @@ -20,6 +20,7 @@ "modules-center": [ ], "modules-right": [ + "bluetooth", "mpd", "pulseaudio", "network", diff --git a/waybar/modules.json.bak b/waybar/modules.json.bak index 5f68b50..9c6eeee 100644 --- a/waybar/modules.json.bak +++ b/waybar/modules.json.bak @@ -137,7 +137,7 @@ "tooltip-format-ethernet": " {ifname} ({ipaddr}/{cidr})", "tooltip-format-disconnected": "Disconnected", "max-length": 50, - "on-click": "alacritty -e nmtui" + "on-click": "alacritty -e nmtui-connect" }, // Battery diff --git a/waybar/modules.jsonc b/waybar/modules.jsonc index 4a655a2..a2aa2f0 100644 --- a/waybar/modules.jsonc +++ b/waybar/modules.jsonc @@ -8,10 +8,10 @@ "clock" ], "modules-right": [ + "network", "pulseaudio", "backlight", "battery", - "network", "cpu", "memory", "tray", @@ -26,8 +26,8 @@ } }, "tray": { - "icon-size": 21, - "spacing": 10 + "icon-size": 42, + "spacing": 30 }, "custom/music": { "format": " {}", @@ -43,12 +43,21 @@ "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "format": "{:%m/%d/%Y - %H:%M}" }, + "bluetooth": { + "on-click": "alacritty -e bluetui" + }, "network": { "format-wifi": " {signalStrength}%", - "format-ethernet": " {bandwidthDownBits}", + "format-ethernet": "", "format-disconnected": " No Network", "interval": 5, - "tooltip": false + "tooltip": true, + "family": "ipv4", + "tooltip-format": " {ifname} via {gwaddri}", + "tooltip-format-wifi": " {essid} ({signalStrength}%) \n {ifname}: {ipaddr}/{cidr}", + "tooltip-format-ethernet": " {ifname} ({ipaddr}/{cidr})", + "tooltip-format-disconnected": "Disconnected", + "on-click": "alacritty -e nmtui-connect" }, "cpu": { "interval": 1, @@ -56,7 +65,9 @@ }, "memory": { "interval": 30, - "format": "{used:0.1f}G / {total:0.1f}G" + "format": "{used:0.1f}G / {total:0.1f}G", + "on-click": "alacritty -e btop", + "tooltip": true }, "pulseaudio": { "format": "{icon} {volume}%", diff --git a/waybar/style.css b/waybar/style.css index 6041450..7db2f56 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,6 +1,6 @@ * { font-family: JetbrainsMono Nerd Font; - font-size: 10px; + font-size: 12px; min-height: 0; padding-right: 2px; padding-left: 2px; @@ -36,13 +36,13 @@ border-radius: 5px; } +#network, #custom-music, #tray, #backlight, #clock, #battery, #pulseaudio, -#network, #cpu, #memory, #custom-lock, @@ -53,7 +53,7 @@ } #memory { - border-radius: 0px 5px 5px 0px; + border-radius: 0px 0px 0px 0px; } #clock { @@ -83,9 +83,14 @@ border-radius: 0; } +#bluetooth, #bluetooth.on, #bluetooth.connected #bluetooth.disabled #bluetooth.off { + border-radius: 0px 0px 0px 0%; + margin-left: 1rem; +} + #pulseaudio { color: #ea999c; - border-radius: 5px 0px 0px 5%; + border-radius: 0px 0px 0px 0%; margin-left: 1rem; } |
