diff --git a/.gitmodules b/.gitmodules index 143b022..c799a52 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "dot-config/tmux/tpm"] path = dot-config/tmux/tpm url = https://github.com/tmux-plugins/tpm +[submodule "dot-config/nvim"] + path = dot-config/nvim + url = ssh://git@git.timoxa0.su:22222/timoxa0/dotfiles-nvim.git +[submodule "dot-config/fish"] + path = dot-config/fish + url = ssh://git@git.timoxa0.su:22222/timoxa0/dotfiles-fish.git diff --git a/dot-config/fish b/dot-config/fish new file mode 160000 index 0000000..7443f9a --- /dev/null +++ b/dot-config/fish @@ -0,0 +1 @@ +Subproject commit 7443f9a2bc5acd9f521be6ca1e68e22bb614b756 diff --git a/dot-config/fish/completions/lon-tool.fish b/dot-config/fish/completions/lon-tool.fish deleted file mode 100644 index 868f810..0000000 --- a/dot-config/fish/completions/lon-tool.fish +++ /dev/null @@ -1,235 +0,0 @@ -# fish completion for lon-tool -*- shell-script -*- - -function __lon_tool_debug - set -l file "$BASH_COMP_DEBUG_FILE" - if test -n "$file" - echo "$argv" >> $file - end -end - -function __lon_tool_perform_completion - __lon_tool_debug "Starting __lon_tool_perform_completion" - - # Extract all args except the last one - set -l args (commandline -opc) - # Extract the last arg and escape it in case it is a space - set -l lastArg (string escape -- (commandline -ct)) - - __lon_tool_debug "args: $args" - __lon_tool_debug "last arg: $lastArg" - - # Disable ActiveHelp which is not supported for fish shell - set -l requestComp "LON_TOOL_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg" - - __lon_tool_debug "Calling $requestComp" - set -l results (eval $requestComp 2> /dev/null) - - # Some programs may output extra empty lines after the directive. - # Let's ignore them or else it will break completion. - # Ref: https://github.com/spf13/cobra/issues/1279 - for line in $results[-1..1] - if test (string trim -- $line) = "" - # Found an empty line, remove it - set results $results[1..-2] - else - # Found non-empty line, we have our proper output - break - end - end - - set -l comps $results[1..-2] - set -l directiveLine $results[-1] - - # For Fish, when completing a flag with an = (e.g., -n=) - # completions must be prefixed with the flag - set -l flagPrefix (string match -r -- '-.*=' "$lastArg") - - __lon_tool_debug "Comps: $comps" - __lon_tool_debug "DirectiveLine: $directiveLine" - __lon_tool_debug "flagPrefix: $flagPrefix" - - for comp in $comps - printf "%s%s\n" "$flagPrefix" "$comp" - end - - printf "%s\n" "$directiveLine" -end - -# this function limits calls to __lon_tool_perform_completion, by caching the result behind $__lon_tool_perform_completion_once_result -function __lon_tool_perform_completion_once - __lon_tool_debug "Starting __lon_tool_perform_completion_once" - - if test -n "$__lon_tool_perform_completion_once_result" - __lon_tool_debug "Seems like a valid result already exists, skipping __lon_tool_perform_completion" - return 0 - end - - set --global __lon_tool_perform_completion_once_result (__lon_tool_perform_completion) - if test -z "$__lon_tool_perform_completion_once_result" - __lon_tool_debug "No completions, probably due to a failure" - return 1 - end - - __lon_tool_debug "Performed completions and set __lon_tool_perform_completion_once_result" - return 0 -end - -# this function is used to clear the $__lon_tool_perform_completion_once_result variable after completions are run -function __lon_tool_clear_perform_completion_once_result - __lon_tool_debug "" - __lon_tool_debug "========= clearing previously set __lon_tool_perform_completion_once_result variable ==========" - set --erase __lon_tool_perform_completion_once_result - __lon_tool_debug "Successfully erased the variable __lon_tool_perform_completion_once_result" -end - -function __lon_tool_requires_order_preservation - __lon_tool_debug "" - __lon_tool_debug "========= checking if order preservation is required ==========" - - __lon_tool_perform_completion_once - if test -z "$__lon_tool_perform_completion_once_result" - __lon_tool_debug "Error determining if order preservation is required" - return 1 - end - - set -l directive (string sub --start 2 $__lon_tool_perform_completion_once_result[-1]) - __lon_tool_debug "Directive is: $directive" - - set -l shellCompDirectiveKeepOrder 32 - set -l keeporder (math (math --scale 0 $directive / $shellCompDirectiveKeepOrder) % 2) - __lon_tool_debug "Keeporder is: $keeporder" - - if test $keeporder -ne 0 - __lon_tool_debug "This does require order preservation" - return 0 - end - - __lon_tool_debug "This doesn't require order preservation" - return 1 -end - - -# This function does two things: -# - Obtain the completions and store them in the global __lon_tool_comp_results -# - Return false if file completion should be performed -function __lon_tool_prepare_completions - __lon_tool_debug "" - __lon_tool_debug "========= starting completion logic ==========" - - # Start fresh - set --erase __lon_tool_comp_results - - __lon_tool_perform_completion_once - __lon_tool_debug "Completion results: $__lon_tool_perform_completion_once_result" - - if test -z "$__lon_tool_perform_completion_once_result" - __lon_tool_debug "No completion, probably due to a failure" - # Might as well do file completion, in case it helps - return 1 - end - - set -l directive (string sub --start 2 $__lon_tool_perform_completion_once_result[-1]) - set --global __lon_tool_comp_results $__lon_tool_perform_completion_once_result[1..-2] - - __lon_tool_debug "Completions are: $__lon_tool_comp_results" - __lon_tool_debug "Directive is: $directive" - - set -l shellCompDirectiveError 1 - set -l shellCompDirectiveNoSpace 2 - set -l shellCompDirectiveNoFileComp 4 - set -l shellCompDirectiveFilterFileExt 8 - set -l shellCompDirectiveFilterDirs 16 - - if test -z "$directive" - set directive 0 - end - - set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2) - if test $compErr -eq 1 - __lon_tool_debug "Received error directive: aborting." - # Might as well do file completion, in case it helps - return 1 - end - - set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2) - set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2) - if test $filefilter -eq 1; or test $dirfilter -eq 1 - __lon_tool_debug "File extension filtering or directory filtering not supported" - # Do full file completion instead - return 1 - end - - set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2) - set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2) - - __lon_tool_debug "nospace: $nospace, nofiles: $nofiles" - - # If we want to prevent a space, or if file completion is NOT disabled, - # we need to count the number of valid completions. - # To do so, we will filter on prefix as the completions we have received - # may not already be filtered so as to allow fish to match on different - # criteria than the prefix. - if test $nospace -ne 0; or test $nofiles -eq 0 - set -l prefix (commandline -t | string escape --style=regex) - __lon_tool_debug "prefix: $prefix" - - set -l completions (string match -r -- "^$prefix.*" $__lon_tool_comp_results) - set --global __lon_tool_comp_results $completions - __lon_tool_debug "Filtered completions are: $__lon_tool_comp_results" - - # Important not to quote the variable for count to work - set -l numComps (count $__lon_tool_comp_results) - __lon_tool_debug "numComps: $numComps" - - if test $numComps -eq 1; and test $nospace -ne 0 - # We must first split on \t to get rid of the descriptions to be - # able to check what the actual completion will be. - # We don't need descriptions anyway since there is only a single - # real completion which the shell will expand immediately. - set -l split (string split --max 1 \t $__lon_tool_comp_results[1]) - - # Fish won't add a space if the completion ends with any - # of the following characters: @=/:., - set -l lastChar (string sub -s -1 -- $split) - if not string match -r -q "[@=/:.,]" -- "$lastChar" - # In other cases, to support the "nospace" directive we trick the shell - # by outputting an extra, longer completion. - __lon_tool_debug "Adding second completion to perform nospace directive" - set --global __lon_tool_comp_results $split[1] $split[1]. - __lon_tool_debug "Completions are now: $__lon_tool_comp_results" - end - end - - if test $numComps -eq 0; and test $nofiles -eq 0 - # To be consistent with bash and zsh, we only trigger file - # completion when there are no other completions - __lon_tool_debug "Requesting file completion" - return 1 - end - end - - return 0 -end - -# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves -# so we can properly delete any completions provided by another script. -# Only do this if the program can be found, or else fish may print some errors; besides, -# the existing completions will only be loaded if the program can be found. -if type -q "lon-tool" - # The space after the program name is essential to trigger completion for the program - # and not completion of the program name itself. - # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish. - complete --do-complete "lon-tool " > /dev/null 2>&1 -end - -# Remove any pre-existing completions for the program since we will be handling all of them. -complete -c lon-tool -e - -# this will get called after the two calls below and clear the $__lon_tool_perform_completion_once_result global -complete -c lon-tool -n '__lon_tool_clear_perform_completion_once_result' -# The call to __lon_tool_prepare_completions will setup __lon_tool_comp_results -# which provides the program's completion choices. -# If this doesn't require order preservation, we don't use the -k flag -complete -c lon-tool -n 'not __lon_tool_requires_order_preservation && __lon_tool_prepare_completions' -f -a '$__lon_tool_comp_results' -# otherwise we use the -k flag -complete -k -c lon-tool -n '__lon_tool_requires_order_preservation && __lon_tool_prepare_completions' -f -a '$__lon_tool_comp_results' diff --git a/dot-config/fish/completions/poetry.fish b/dot-config/fish/completions/poetry.fish deleted file mode 100644 index 6f8a493..0000000 --- a/dot-config/fish/completions/poetry.fish +++ /dev/null @@ -1,257 +0,0 @@ -function __fish_poetry_9cf82bc144790825_complete_no_subcommand - for i in (commandline -opc) - if contains -- $i about add build cache check config debug env export help init install list lock new publish remove run search self shell show source update version - return 1 - end - end - return 0 -end - -# global options -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l ansi -d 'Force ANSI output.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l directory -d 'The working directory for the Poetry command (defaults to the current working directory).' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l help -d 'Display help for the given command. When no command is given display help for the list command.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l no-ansi -d 'Disable ANSI output.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l no-cache -d 'Disables Poetry source caches.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l no-interaction -d 'Do not ask any interactive question.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l no-plugins -d 'Disables plugins.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l quiet -d 'Do not output any message.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l verbose -d 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.' -complete -c poetry -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -l version -d 'Display this application version.' - -# commands -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a about -d 'Shows information about Poetry.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a add -d 'Adds a new dependency to pyproject.toml and installs it.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a build -d 'Builds a package, as a tarball and a wheel by default.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a cache -complete -c poetry -f -n '__fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from clear list' -a clear -d 'Clears a Poetry cache by name.' -complete -c poetry -f -n '__fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from clear list' -a list -d 'List Poetry\'s caches.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a check -d 'Validates the content of the pyproject.toml file and its consistency with the poetry.lock file.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a config -d 'Manages configuration settings.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a debug -complete -c poetry -f -n '__fish_seen_subcommand_from debug; and not __fish_seen_subcommand_from info resolve' -a info -d 'Shows debug information.' -complete -c poetry -f -n '__fish_seen_subcommand_from debug; and not __fish_seen_subcommand_from info resolve' -a resolve -d 'Debugs dependency resolution.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a env -complete -c poetry -f -n '__fish_seen_subcommand_from env; and not __fish_seen_subcommand_from info list remove use' -a info -d 'Displays information about the current environment.' -complete -c poetry -f -n '__fish_seen_subcommand_from env; and not __fish_seen_subcommand_from info list remove use' -a list -d 'Lists all virtualenvs associated with the current project.' -complete -c poetry -f -n '__fish_seen_subcommand_from env; and not __fish_seen_subcommand_from info list remove use' -a remove -d 'Remove virtual environments associated with the project.' -complete -c poetry -f -n '__fish_seen_subcommand_from env; and not __fish_seen_subcommand_from info list remove use' -a use -d 'Activates or creates a new virtualenv for the current project.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a export -d 'Exports the lock file to alternative formats.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a help -d 'Displays help for a command.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a init -d 'Creates a basic pyproject.toml file in the current directory.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a install -d 'Installs the project dependencies.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a list -d 'Lists commands.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a lock -d 'Locks the project dependencies.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a new -d 'Creates a new Python project at .' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a publish -d 'Publishes a package to a remote repository.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a remove -d 'Removes a package from the project dependencies.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a run -d 'Runs a command in the appropriate environment.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a search -d 'Searches for packages on remote repositories.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a self -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a add -d 'Add additional packages to Poetry\'s runtime environment.' -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a install -d 'Install locked packages (incl. addons) required by this Poetry installation.' -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a lock -d 'Lock the Poetry installation\'s system requirements.' -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a remove -d 'Remove additional packages from Poetry\'s runtime environment.' -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a show -d 'Show packages from Poetry\'s runtime environment.' -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a plugins -d 'Shows information about the currently installed plugins.' -complete -c poetry -f -n '__fish_seen_subcommand_from self; and not __fish_seen_subcommand_from add install lock remove update show' -a update -d 'Updates Poetry to the latest version.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a shell -d 'Spawns a shell within the virtual environment.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a show -d 'Shows information about packages.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a source -complete -c poetry -f -n '__fish_seen_subcommand_from source; and not __fish_seen_subcommand_from add remove show' -a add -d 'Add source configuration for project.' -complete -c poetry -f -n '__fish_seen_subcommand_from source; and not __fish_seen_subcommand_from add remove show' -a remove -d 'Remove source configured for the project.' -complete -c poetry -f -n '__fish_seen_subcommand_from source; and not __fish_seen_subcommand_from add remove show' -a show -d 'Show information about sources configured for the project.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a update -d 'Update the dependencies as according to the pyproject.toml file.' -complete -c poetry -f -n '__fish_poetry_9cf82bc144790825_complete_no_subcommand' -a version -d 'Shows the version of the project or bumps it when a valid bump rule is provided.' - -# command options - -# about - -# add -complete -c poetry -n '__fish_seen_subcommand_from add' -l allow-prereleases -d 'Accept prereleases.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l dev -d 'Add as a development dependency. (Deprecated) Use --group=dev instead.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from add' -l editable -d 'Add vcs/path dependencies as editable.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l extras -d 'Extras to activate for the dependency.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l group -d 'The group to add the dependency to.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l lock -d 'Do not perform operations (only update the lockfile).' -complete -c poetry -n '__fish_seen_subcommand_from add' -l optional -d 'Add as an optional dependency.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l platform -d 'Platforms for which the dependency must be installed.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l python -d 'Python version for which the dependency must be installed.' -complete -c poetry -n '__fish_seen_subcommand_from add' -l source -d 'Name of the source to use to install the package.' - -# build -complete -c poetry -n '__fish_seen_subcommand_from build' -l format -d 'Limit the format to either sdist or wheel.' -complete -c poetry -n '__fish_seen_subcommand_from build' -l output -d 'Set output directory for build artifacts. Default is `dist`.' - -# cache clear -complete -c poetry -n '__fish_seen_subcommand_from cache; and __fish_seen_subcommand_from clear' -l all -d 'Clear all entries in the cache.' - -# cache list - -# check -complete -c poetry -n '__fish_seen_subcommand_from check' -l lock -d 'Checks that poetry.lock exists for the current version of pyproject.toml.' - -# config -complete -c poetry -n '__fish_seen_subcommand_from config' -l list -d 'List configuration settings.' -complete -c poetry -n '__fish_seen_subcommand_from config' -l local -d 'Set/Get from the project\'s local configuration.' -complete -c poetry -n '__fish_seen_subcommand_from config' -l unset -d 'Unset configuration setting.' - -# debug info - -# debug resolve -complete -c poetry -n '__fish_seen_subcommand_from debug; and __fish_seen_subcommand_from resolve' -l extras -d 'Extras to activate for the dependency.' -complete -c poetry -n '__fish_seen_subcommand_from debug; and __fish_seen_subcommand_from resolve' -l install -d 'Show what would be installed for the current system.' -complete -c poetry -n '__fish_seen_subcommand_from debug; and __fish_seen_subcommand_from resolve' -l python -d 'Python version(s) to use for resolution.' -complete -c poetry -n '__fish_seen_subcommand_from debug; and __fish_seen_subcommand_from resolve' -l tree -d 'Display the dependency tree.' - -# env info -complete -c poetry -n '__fish_seen_subcommand_from env; and __fish_seen_subcommand_from info' -l executable -d 'Only display the environment\'s python executable path.' -complete -c poetry -n '__fish_seen_subcommand_from env; and __fish_seen_subcommand_from info' -l path -d 'Only display the environment\'s path.' - -# env list -complete -c poetry -n '__fish_seen_subcommand_from env; and __fish_seen_subcommand_from list' -l full-path -d 'Output the full paths of the virtualenvs.' - -# env remove -complete -c poetry -n '__fish_seen_subcommand_from env; and __fish_seen_subcommand_from remove' -l all -d 'Remove all managed virtual environments associated with the project.' - -# env use - -# export -complete -c poetry -n '__fish_seen_subcommand_from export' -l all-extras -d 'Include all sets of extra dependencies.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l dev -d 'Include development dependencies. (Deprecated)' -complete -c poetry -n '__fish_seen_subcommand_from export' -l extras -d 'Extra sets of dependencies to include.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l format -d 'Format to export to. Currently, only constraints.txt and requirements.txt are supported.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l only -d 'The only dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l output -d 'The name of the output file.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l with -d 'The optional dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l with-credentials -d 'Include credentials for extra indices.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l without -d 'The dependency groups to ignore.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l without-hashes -d 'Exclude hashes from the exported file.' -complete -c poetry -n '__fish_seen_subcommand_from export' -l without-urls -d 'Exclude source repository urls from the exported file.' - -# help - -# init -complete -c poetry -n '__fish_seen_subcommand_from init' -l author -d 'Author name of the package.' -complete -c poetry -n '__fish_seen_subcommand_from init' -l dependency -d 'Package to require, with an optional version constraint, e.g. requests:^2.10.0 or requests=2.11.1.' -complete -c poetry -n '__fish_seen_subcommand_from init' -l description -d 'Description of the package.' -complete -c poetry -n '__fish_seen_subcommand_from init' -l dev-dependency -d 'Package to require for development, with an optional version constraint, e.g. requests:^2.10.0 or requests=2.11.1.' -complete -c poetry -n '__fish_seen_subcommand_from init' -l license -d 'License of the package.' -complete -c poetry -n '__fish_seen_subcommand_from init' -l name -d 'Name of the package.' -complete -c poetry -n '__fish_seen_subcommand_from init' -l python -d 'Compatible Python versions.' - -# install -complete -c poetry -n '__fish_seen_subcommand_from install' -l all-extras -d 'Install all extra dependencies.' -complete -c poetry -n '__fish_seen_subcommand_from install' -l compile -d 'Compile Python source files to bytecode. (This option has no effect if modern-installation is disabled because the old installer always compiles.)' -complete -c poetry -n '__fish_seen_subcommand_from install' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from install' -l extras -d 'Extra sets of dependencies to install.' -complete -c poetry -n '__fish_seen_subcommand_from install' -l no-dev -d 'Do not install the development dependencies. (Deprecated)' -complete -c poetry -n '__fish_seen_subcommand_from install' -l no-directory -d 'Do not install any directory path dependencies; useful to install dependencies without source code, e.g. for caching of Docker layers)' -complete -c poetry -n '__fish_seen_subcommand_from install' -l no-root -d 'Do not install the root package (the current project).' -complete -c poetry -n '__fish_seen_subcommand_from install' -l only -d 'The only dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from install' -l only-root -d 'Exclude all dependencies.' -complete -c poetry -n '__fish_seen_subcommand_from install' -l remove-untracked -d 'Removes packages not present in the lock file. (Deprecated)' -complete -c poetry -n '__fish_seen_subcommand_from install' -l sync -d 'Synchronize the environment with the locked packages and the specified groups.' -complete -c poetry -n '__fish_seen_subcommand_from install' -l with -d 'The optional dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from install' -l without -d 'The dependency groups to ignore.' - -# list - -# lock -complete -c poetry -n '__fish_seen_subcommand_from lock' -l check -d 'Check that the poetry.lock file corresponds to the current version of pyproject.toml. (Deprecated) Use poetry check --lock instead.' -complete -c poetry -n '__fish_seen_subcommand_from lock' -l no-update -d 'Do not update locked versions, only refresh lock file.' - -# new -complete -c poetry -n '__fish_seen_subcommand_from new' -l name -d 'Set the resulting package name.' -complete -c poetry -n '__fish_seen_subcommand_from new' -l readme -d 'Specify the readme file format. Default is md.' -complete -c poetry -n '__fish_seen_subcommand_from new' -l src -d 'Use the src layout for the project.' - -# publish -complete -c poetry -n '__fish_seen_subcommand_from publish' -l build -d 'Build the package before publishing.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l cert -d 'Certificate authority to access the repository.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l client-cert -d 'Client certificate to access the repository.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l dist-dir -d 'Dist directory where built artifact are stored. Default is `dist`.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l dry-run -d 'Perform all actions except upload the package.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l password -d 'The password to access the repository.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l repository -d 'The repository to publish the package to.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l skip-existing -d 'Ignore errors from files already existing in the repository.' -complete -c poetry -n '__fish_seen_subcommand_from publish' -l username -d 'The username to access the repository.' - -# remove -complete -c poetry -n '__fish_seen_subcommand_from remove' -l dev -d 'Remove a package from the development dependencies. (Deprecated) Use --group=dev instead.' -complete -c poetry -n '__fish_seen_subcommand_from remove' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from remove' -l group -d 'The group to remove the dependency from.' -complete -c poetry -n '__fish_seen_subcommand_from remove' -l lock -d 'Do not perform operations (only update the lockfile).' - -# run - -# search - -# self add -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from add' -l allow-prereleases -d 'Accept prereleases.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from add' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from add' -l editable -d 'Add vcs/path dependencies as editable.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from add' -l extras -d 'Extras to activate for the dependency.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from add' -l source -d 'Name of the source to use to install the package.' - -# self install -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from install' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from install' -l sync -d 'Synchronize the environment with the locked packages and the specified groups.' - -# self lock -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from lock' -l check -d 'Check that the poetry.lock file corresponds to the current version of pyproject.toml. (Deprecated) Use poetry check --lock instead.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from lock' -l no-update -d 'Do not update locked versions, only refresh lock file.' - -# self remove -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from remove' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' - -# self show -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from show' -l addons -d 'List only add-on packages installed.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from show' -l latest -d 'Show the latest version.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from show' -l outdated -d 'Show the latest version but only for packages that are outdated.' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from show' -l tree -d 'List the dependencies as a tree.' - -# self show plugins - -# self update -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from update' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from self; and __fish_seen_subcommand_from update' -l preview -d 'Allow the installation of pre-release versions.' - -# shell - -# show -complete -c poetry -n '__fish_seen_subcommand_from show' -l all -d 'Show all packages (even those not compatible with current system).' -complete -c poetry -n '__fish_seen_subcommand_from show' -l latest -d 'Show the latest version.' -complete -c poetry -n '__fish_seen_subcommand_from show' -l no-dev -d 'Do not list the development dependencies. (Deprecated)' -complete -c poetry -n '__fish_seen_subcommand_from show' -l only -d 'The only dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from show' -l outdated -d 'Show the latest version but only for packages that are outdated.' -complete -c poetry -n '__fish_seen_subcommand_from show' -l top-level -d 'Show only top-level dependencies.' -complete -c poetry -n '__fish_seen_subcommand_from show' -l tree -d 'List the dependencies as a tree.' -complete -c poetry -n '__fish_seen_subcommand_from show' -l why -d 'When showing the full list, or a --tree for a single package, display whether they are a direct dependency or required by other packages' -complete -c poetry -n '__fish_seen_subcommand_from show' -l with -d 'The optional dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from show' -l without -d 'The dependency groups to ignore.' - -# source add -complete -c poetry -n '__fish_seen_subcommand_from source; and __fish_seen_subcommand_from add' -l default -d 'Set this source as the default (disable PyPI). A default source will also be the fallback source if you add other sources. (Deprecated, use --priority)' -complete -c poetry -n '__fish_seen_subcommand_from source; and __fish_seen_subcommand_from add' -l priority -d 'Set the priority of this source. One of: default, primary, secondary, supplemental, explicit. Defaults to primary.' -complete -c poetry -n '__fish_seen_subcommand_from source; and __fish_seen_subcommand_from add' -l secondary -d 'Set this source as secondary. (Deprecated, use --priority)' - -# source remove - -# source show - -# update -complete -c poetry -n '__fish_seen_subcommand_from update' -l dry-run -d 'Output the operations but do not execute anything (implicitly enables --verbose).' -complete -c poetry -n '__fish_seen_subcommand_from update' -l lock -d 'Do not perform operations (only update the lockfile).' -complete -c poetry -n '__fish_seen_subcommand_from update' -l no-dev -d 'Do not update the development dependencies. (Deprecated)' -complete -c poetry -n '__fish_seen_subcommand_from update' -l only -d 'The only dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from update' -l sync -d 'Synchronize the environment with the locked packages and the specified groups.' -complete -c poetry -n '__fish_seen_subcommand_from update' -l with -d 'The optional dependency groups to include.' -complete -c poetry -n '__fish_seen_subcommand_from update' -l without -d 'The dependency groups to ignore.' - -# version -complete -c poetry -n '__fish_seen_subcommand_from version' -l dry-run -d 'Do not update pyproject.toml file' -complete -c poetry -n '__fish_seen_subcommand_from version' -l next-phase -d 'Increment the phase of the current version' -complete -c poetry -n '__fish_seen_subcommand_from version' -l short -d 'Output the version number only' diff --git a/dot-config/fish/config.fish b/dot-config/fish/config.fish deleted file mode 100644 index 8075fcb..0000000 --- a/dot-config/fish/config.fish +++ /dev/null @@ -1,94 +0,0 @@ -set fish_greeting "" - -function filesize - for file in $argv - if [ -f "$file" ] - echo "$file: $(stat -c %s "$file" | numfmt --to=iec)" - else - echo "$file: not found" - end - end -end - -function _fetch - if [ $(tput lines) -le 10 ] - return - end - if which ufetch > /dev/null 2>&1 && [ "$VSCODE_INJECTION" != "1" ] - ufetch - end -end - -function _set_env - if [ "$TERM" = "foot" ] || [ "$TERM" = "xterm-kitty" ] - alias ssh="TERM=xterm-256color $(which ssh)" - alias gg="TERM=xterm-256color $(which gg)" - end - set -x VIRTUAL_ENV_DISABLE_PROMPT - set -x PF_INFO "ascii title os host kernel uptime memory de" - set -x FZF_DEFAULT_OPTS "\ - --color=bg+:#1e1e2e,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" -end - -function _set_aliases - if which eza > /dev/null 2>&1 - alias ls="eza --icons=auto" - else if which exa > /dev/null 2>&1 - alias ls="exa --icons=auto" - end - - if which bat > /dev/null 2>&1 - alias cat="bat" - else if which batcat > /dev/null 2>&1 - alias cat="batcat" - end - - if which python > /dev/null 2>&1 - alias py="python" - end - - if which distrobox-enter > /dev/null 2>&1 - alias denter=distrobox-enter - end - - if which nvim > /dev/null 2>&1 - alias v "nvim" - alias V "sudoedit" - set -x EDITOR nvim - end - - alias cdt "cd (mktemp -d)" - alias ":q" exit -end - -function arm64cc-env - set -gx ARCH arm64 - set -gx hardeningDisable all - set -gx CROSS_COMPILE aarch64-linux-gnu- -end - -if which pyenv > /dev/null 2>&1 - pyenv init - | source -end - -if status is-interactive - bind \cl 'clear; _fetch; commandline -f repaint' - bind \cb btop - bind \cs 'source ~/.config/fish/config.fish' - - if which zoxide > /dev/null 2>&1 - zoxide init --cmd cd fish | source - end - - if [ "$reload" = "" ] - _fetch - end - - set reload "done" - _set_aliases -end -_set_env diff --git a/dot-config/fish/fish_variables b/dot-config/fish/fish_variables deleted file mode 100644 index 6f45388..0000000 --- a/dot-config/fish/fish_variables +++ /dev/null @@ -1,32 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3400 -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:blue -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:bryellow\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/timoxa0/\x2ecargo/bin\x1e/home/timoxa0/\x2elocal/bin diff --git a/dot-config/fish/functions/fish_prompt.fish b/dot-config/fish/functions/fish_prompt.fish deleted file mode 100644 index cf00f7c..0000000 --- a/dot-config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,34 +0,0 @@ -# name: Default -# author: Lily Ballard - -function fish_prompt --description 'Write out the prompt' - set -l last_pipestatus $pipestatus - set -lx __fish_last_status $status # Export for __fish_print_pipestatus. - set -l normal (set_color normal) - set -q fish_color_status - or set -g fish_color_status red - - # Color the prompt differently when we're root - set -l color_cwd $fish_color_cwd - set -l suffix '>' - if functions -q fish_is_root_user; and fish_is_root_user - if set -q fish_color_cwd_root - set color_cwd $fish_color_cwd_root - end - set suffix '#' - end - - # Write pipestatus - # If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it. - set -l bold_flag --bold - set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation - if test $__fish_prompt_status_generation = $status_generation - set bold_flag - end - set __fish_prompt_status_generation $status_generation - set -l status_color (set_color $fish_color_status) - set -l statusb_color (set_color $bold_flag $fish_color_status) - set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) - - echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " " -end diff --git a/dot-config/fish/functions/fish_right_prompt.fish b/dot-config/fish/functions/fish_right_prompt.fish deleted file mode 100644 index 398ca44..0000000 --- a/dot-config/fish/functions/fish_right_prompt.fish +++ /dev/null @@ -1,6 +0,0 @@ -function fish_right_prompt -d "Write out the right prompt" - if set -q CONTAINER_ID - set distrobox_prefix " $(string replace -r -a '\b([\w])' '\U$0' "$CONTAINER_ID") " - end - echo -n -s $distrobox_prefix -end diff --git a/dot-config/nvim b/dot-config/nvim new file mode 160000 index 0000000..c59406d --- /dev/null +++ b/dot-config/nvim @@ -0,0 +1 @@ +Subproject commit c59406dad40fb321ada18acee17ee8979e39b3ca diff --git a/dot-config/nvim/.stylua.toml b/dot-config/nvim/.stylua.toml deleted file mode 100644 index ecb6dca..0000000 --- a/dot-config/nvim/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferDouble" -call_parentheses = "None" diff --git a/dot-config/nvim/LICENSE b/dot-config/nvim/LICENSE deleted file mode 100644 index fdddb29..0000000 --- a/dot-config/nvim/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/dot-config/nvim/init.lua b/dot-config/nvim/init.lua deleted file mode 100644 index 1152335..0000000 --- a/dot-config/nvim/init.lua +++ /dev/null @@ -1,39 +0,0 @@ -vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" -vim.g.mapleader = " " - --- bootstrap lazy and all plugins -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" - -if not vim.loop.fs_stat(lazypath) then - local repo = "https://github.com/folke/lazy.nvim.git" - vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } -end - -vim.opt.rtp:prepend(lazypath) - -local lazy_config = require "configs.lazy" - --- load plugins -require("lazy").setup({ - { - "NvChad/NvChad", - lazy = false, - branch = "v2.5", - import = "nvchad.plugins", - config = function() - require "options" - end, - }, - - { import = "plugins" }, -}, lazy_config) - --- load theme -dofile(vim.g.base46_cache .. "defaults") -dofile(vim.g.base46_cache .. "statusline") - -require "nvchad.autocmds" - -vim.schedule(function() - require "mappings" -end) diff --git a/dot-config/nvim/lazy-lock.json b/dot-config/nvim/lazy-lock.json deleted file mode 100644 index ac9557e..0000000 --- a/dot-config/nvim/lazy-lock.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" }, - "NvChad": { "branch": "v2.5", "commit": "8792679a08c6747ba3f5890a01561442abec6935" }, - "base46": { "branch": "v2.5", "commit": "40943fc668bf8f1caa4cc45f71c784cf0d3cc34f" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, - "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "menu": { "branch": "main", "commit": "657bfc91382c0928453d9a4d0a10ec92db5de2bb" }, - "minty": { "branch": "main", "commit": "b454ca0229f8e22a631fd3c014ec99973fb8cad4" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" }, - "nvim-lspconfig": { "branch": "master", "commit": "b55b9659de9ac17e05df4787bb023e4c7ef45329" }, - "nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" }, - "nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" }, - "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, - "tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" }, - "ui": { "branch": "v3.0", "commit": "7905539f1e10f460811dc0db800355611f8a527a" }, - "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" }, - "volt": { "branch": "main", "commit": "8d35e03c70490190149a77c59155618ef4370721" }, - "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" } -} diff --git a/dot-config/nvim/lua/chadrc.lua b/dot-config/nvim/lua/chadrc.lua deleted file mode 100644 index afd57e3..0000000 --- a/dot-config/nvim/lua/chadrc.lua +++ /dev/null @@ -1,48 +0,0 @@ --- This file needs to have same structure as nvconfig.lua --- https://github.com/NvChad/ui/blob/v2.5/lua/nvconfig.lua - ----@type ChadrcConfig -local M = {} - -M = { - base46 = { - theme = "catppuccin", - transparency = true - }, - - ui = { - statusline = { - theme = "minimal", - separator_style = "round", - order = { "mode", "file", "git", "%=", "cwd"}, - } - }, - - nvdash = { - load_on_startup = true, - header = { - " ", - " ▄▄ ▄ ▄▄▄▄▄▄▄ ", - " ▄▀███▄ ▄██ █████▀ ", - " ██▄▀███▄ ███ ", - " ███ ▀███▄ ███ ", - " ███ ▀██ ███ ", - " ███ ▀ ███ ", - " ▀██ █████▄▀█▀▄██████▄ ", - " ▀ ▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀ ", - " ", - " ", - }, - buttons = { - { txt = " Find File", keys = "ff", cmd = "Telescope find_files" }, - { txt = " Recent Files", keys = "fo", cmd = "Telescope oldfiles" }, - { txt = "󰈭 Find Word", keys = "fw", cmd = "Telescope live_grep" }, - { txt = "󰈆 Exit", keys = ":q!", cmd = "q!" }, - } - } - -- hl_override = { - -- Comment = { italic = true }, - -- ["@comment"] = { italic = true }, - -- }, -} -return M diff --git a/dot-config/nvim/lua/configs/conform.lua b/dot-config/nvim/lua/configs/conform.lua deleted file mode 100644 index a000447..0000000 --- a/dot-config/nvim/lua/configs/conform.lua +++ /dev/null @@ -1,15 +0,0 @@ -local options = { - formatters_by_ft = { - lua = { "stylua" }, - -- css = { "prettier" }, - -- html = { "prettier" }, - }, - - -- format_on_save = { - -- -- These options will be passed to conform.format() - -- timeout_ms = 500, - -- lsp_fallback = true, - -- }, -} - -require("conform").setup(options) diff --git a/dot-config/nvim/lua/configs/lazy.lua b/dot-config/nvim/lua/configs/lazy.lua deleted file mode 100644 index cd170bd..0000000 --- a/dot-config/nvim/lua/configs/lazy.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - defaults = { lazy = true }, - install = { colorscheme = { "nvchad" } }, - - ui = { - icons = { - ft = "", - lazy = "󰂠 ", - loaded = "", - not_loaded = "", - }, - }, - - performance = { - rtp = { - disabled_plugins = { - "2html_plugin", - "tohtml", - "getscript", - "getscriptPlugin", - "gzip", - "logipat", - "netrw", - "netrwPlugin", - "netrwSettings", - "netrwFileHandlers", - "matchit", - "tar", - "tarPlugin", - "rrhelper", - "spellfile_plugin", - "vimball", - "vimballPlugin", - "zip", - "zipPlugin", - "tutor", - "rplugin", - "syntax", - "synmenu", - "optwin", - "compiler", - "bugreport", - "ftplugin", - }, - }, - }, -} diff --git a/dot-config/nvim/lua/configs/lspconfig.lua b/dot-config/nvim/lua/configs/lspconfig.lua deleted file mode 100644 index 7d3a64f..0000000 --- a/dot-config/nvim/lua/configs/lspconfig.lua +++ /dev/null @@ -1,29 +0,0 @@ --- EXAMPLE -local on_attach = require("nvchad.configs.lspconfig").on_attach -local on_init = require("nvchad.configs.lspconfig").on_init -local capabilities = require("nvchad.configs.lspconfig").capabilities - -local lspconfig = require "lspconfig" -local servers = { "html", "gopls" } - --- lsps with default config -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - on_init = on_init, - capabilities = capabilities, - } -end - --- typescript -lspconfig.ts_ls.setup { - on_attach = on_attach, - on_init = on_init, - capabilities = capabilities, -} - -lspconfig.pyright.setup({ - on_attach = on_attach, - capabilities = capabilities, - filetypes = {"python"}, -}) diff --git a/dot-config/nvim/lua/mappings.lua b/dot-config/nvim/lua/mappings.lua deleted file mode 100644 index 17728a0..0000000 --- a/dot-config/nvim/lua/mappings.lua +++ /dev/null @@ -1,15 +0,0 @@ -require "nvchad.mappings" - --- add yours here - -local map = vim.keymap.set - -map("n", ";", ":", { desc = "CMD enter command mode" }) -map("i", "jk", "") -map("n", "", "TmuxNavigateLeft", {desc = "Move tmux windows focus left"}) -map("n", "", "TmuxNavigateRight", {desc = "Move tmux windows focus right"}) -map("n", "", "TmuxNavigateDown", {desc = "Move tmux windows focus down"}) -map("n", "", "TmuxNavigateUp", {desc = "Move tmux windows focus up"}) - - --- map({ "n", "i", "v" }, "", " w ") diff --git a/dot-config/nvim/lua/options.lua b/dot-config/nvim/lua/options.lua deleted file mode 100644 index 6e008c0..0000000 --- a/dot-config/nvim/lua/options.lua +++ /dev/null @@ -1,14 +0,0 @@ -require "nvchad.options" - -local o = vim.o -o.tabstop = 4 -- A TAB character looks like 4 spaces -o.expandtab = true -- Pressing the TAB key will insert spaces instead of a TAB character -o.softtabstop = 4 -- Number of spaces inserted instead of a TAB character -o.shiftwidth = 4 -- Number of spaces inserted when indenting -o.cursorlineopt ='both' -- to enable cursorline! - -vim.filetype.add({ - extension = { - lnibuild = "bash" - } -}) diff --git a/dot-config/nvim/lua/plugins/init.lua b/dot-config/nvim/lua/plugins/init.lua deleted file mode 100644 index d217f1d..0000000 --- a/dot-config/nvim/lua/plugins/init.lua +++ /dev/null @@ -1,59 +0,0 @@ -return { - { - "stevearc/conform.nvim", - event = 'BufWritePre', -- uncomment for format on save - config = function() - require "configs.conform" - end, - }, - { - "christoomey/vim-tmux-navigator", - lazy = false, - }, - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "black", - "debugpy", - "mypy", - "ruff", - "pyright", - }, - }, - }, - - - -- These are some examples, uncomment them if you want to see them work! - { - "neovim/nvim-lspconfig", - config = function() - require("nvchad.configs.lspconfig").defaults() - require "configs.lspconfig" - end, - }, - -- - -- { - -- "williamboman/mason.nvim", - -- opts = { - -- ensure_installed = { - -- "lua-language-server", "stylua", - -- "html-lsp", "css-lsp" , "prettier" - -- }, - -- }, - -- }, - -- - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "vim", "lua", "vimdoc", - "html", "css" - }, - }, - }, - { - "luckasRanarison/tree-sitter-hyprlang", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - }, -}