diff --git a/.chezmoiroot b/.chezmoiroot deleted file mode 100644 index 73d74c2..0000000 --- a/.chezmoiroot +++ /dev/null @@ -1 +0,0 @@ -chezmoi diff --git a/.dotter/devbox.toml b/.dotter/devbox.toml new file mode 100644 index 0000000..7709e32 --- /dev/null +++ b/.dotter/devbox.toml @@ -0,0 +1,6 @@ +includes = [] +packages = ["default", "cli", "dev"] + +[files] + +[variables] diff --git a/.dotter/global.toml b/.dotter/global.toml new file mode 100644 index 0000000..d929b92 --- /dev/null +++ b/.dotter/global.toml @@ -0,0 +1,46 @@ +[helpers] + +[default] +depends = ["nvim"] + +[default.files] +"README.md" = "" +chezmoi = "" +config = "" +exports = "" +scripts = "" + +[default.variables] + +# CLI package +[cli] +depends = ["nvim", "nushell", "zsh"] + +[cli.files] +"config/yazi" = "~/.config/yazi" +"config/tmux" = "~/.config/tmux" +"config/sesh" = "~/.config/sesh" +"config/zellij" = "~/.config/zellij" +"config/starship.toml" = "~/.config/starship.toml" + +[dev.files] +"config/git" = "~/.config/git" +"config/lazygit" = { target = "~/.config/lazygit", type = "symbolic"} +"config/zed" = "~/.config/zed" + +[zsh.files] +"config/zsh/zshrc" = "~/.zshrc" +"config/zsh/zprofile" = "~/.zprofile" +"config/zsh/aliases" = {target = "~/.config/zsh/aliases", type="symbolic"} +"config/zsh/completions" = {target = "~/.config/zsh/completions", type = "symbolic"} +"config/zsh/functions" = "~/.config/zsh/functions" +"config/fzf" = "~/.config/fzf" + +[nushell.files] +"config/nushell" = "~/.config/nushell" + +[settings] +default_target_type = "automatic" + +[nvim.files] +"config/nvim" = "~/.config/nvim" diff --git a/.gitignore b/.gitignore index 218484e..dcbf75b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ config/ncspot/userstate.cbor config/zsh/zprofile.local config/spicetify/CustomApps/* chezmoi/dot_config/zsh/aliases/work.zsh +.dotter/cache.toml +.dotter/cache +.dotter/local.toml diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache deleted file mode 100644 index c737580..0000000 --- a/.php-cs-fixer.cache +++ /dev/null @@ -1 +0,0 @@ -{"php":"8.1.16","version":"3.14.4","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"config\/.null-ls_409243_php-cs-fixer-conf.php":"fb71792ed72df5b2976115b4380ef622","config\/.null-ls_800261_php-cs-fixer-conf.php":"1a554594a4eaa31e7bf231c0a93ad00e","config\/.null-ls_450233_php-cs-fixer-conf.php":"1a554594a4eaa31e7bf231c0a93ad00e","config\/.null-ls_536351_php-cs-fixer-conf.php":"5bfcd97c4bfff433fa6da9d289fd7ef9","config\/.null-ls_121074_php-cs-fixer-conf.php":"c116993e570fd1fd0d8e5ff29103a452"}} \ No newline at end of file diff --git a/chezmoi/.chezmoidata/packages.yaml b/chezmoi/.chezmoidata/packages.yaml deleted file mode 100644 index 3512bc7..0000000 --- a/chezmoi/.chezmoidata/packages.yaml +++ /dev/null @@ -1,41 +0,0 @@ -packages: - cargo: - - du-dust - - mise - - rbw - # - yazi-fm - # - yazi-cli - dnf: - copr: - - atim/lazygit - - atim/starship - - the4runner/firefox-dev - packages: - - bat - - dnf-plugin-system-upgrade - - duf - - eza - - fd-find - - firefox-dev - - flatpak - - fzf - - gcc - - gcc-c++ - - git - - gitlint - - gnome-software - - lazygit - - neovim - - nodejs - - openssl - - openssl-devel - - papirus-icon-theme - - remove-retired-packages - - ripgrep - - sd - - starship - - tealdeer - - tmux - - tree-sitter-cli - - zoxide - - zsh diff --git a/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl b/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl deleted file mode 100644 index efac3ee..0000000 --- a/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ .chezmoi.sourceDir }}/dot_config/nvim/original_lazy-lock.json - diff --git a/chezmoi/dot_config/yazi/symlink_package.toml.tmpl b/chezmoi/dot_config/yazi/symlink_package.toml.tmpl deleted file mode 100644 index 716b5a9..0000000 --- a/chezmoi/dot_config/yazi/symlink_package.toml.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ .chezmoi.sourceDir }}/dot_config/yazi/original_package.toml - diff --git a/chezmoi/dot_config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml similarity index 100% rename from chezmoi/dot_config/alacritty/alacritty.toml rename to config/alacritty/alacritty.toml diff --git a/chezmoi/dot_config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml similarity index 100% rename from chezmoi/dot_config/alacritty/alacritty.yml rename to config/alacritty/alacritty.yml diff --git a/chezmoi/dot_config/alacritty/themes/.keep b/config/alacritty/themes/.keep similarity index 100% rename from chezmoi/dot_config/alacritty/themes/.keep rename to config/alacritty/themes/.keep diff --git a/chezmoi/dot_config/bat/config b/config/bat/config similarity index 100% rename from chezmoi/dot_config/bat/config rename to config/bat/config diff --git a/chezmoi/dot_config/foot/foot.ini b/config/foot/foot.ini similarity index 100% rename from chezmoi/dot_config/foot/foot.ini rename to config/foot/foot.ini diff --git a/chezmoi/dot_config/foot/themes/catppuccin/LICENSE b/config/foot/themes/catppuccin/LICENSE similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/LICENSE rename to config/foot/themes/catppuccin/LICENSE diff --git a/chezmoi/dot_config/foot/themes/catppuccin/README.md b/config/foot/themes/catppuccin/README.md similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/README.md rename to config/foot/themes/catppuccin/README.md diff --git a/chezmoi/dot_config/foot/themes/catppuccin/assets/empty_dot_gitkeep b/config/foot/themes/catppuccin/assets/empty_dot_gitkeep similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/assets/empty_dot_gitkeep rename to config/foot/themes/catppuccin/assets/empty_dot_gitkeep diff --git a/chezmoi/dot_config/foot/themes/catppuccin/assets/foot.png b/config/foot/themes/catppuccin/assets/foot.png similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/assets/foot.png rename to config/foot/themes/catppuccin/assets/foot.png diff --git a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-frappe.conf b/config/foot/themes/catppuccin/catppuccin-frappe.conf similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/catppuccin-frappe.conf rename to config/foot/themes/catppuccin/catppuccin-frappe.conf diff --git a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-latte.conf b/config/foot/themes/catppuccin/catppuccin-latte.conf similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/catppuccin-latte.conf rename to config/foot/themes/catppuccin/catppuccin-latte.conf diff --git a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-macchiato.conf b/config/foot/themes/catppuccin/catppuccin-macchiato.conf similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/catppuccin-macchiato.conf rename to config/foot/themes/catppuccin/catppuccin-macchiato.conf diff --git a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-mocha.conf b/config/foot/themes/catppuccin/catppuccin-mocha.conf similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/catppuccin-mocha.conf rename to config/foot/themes/catppuccin/catppuccin-mocha.conf diff --git a/chezmoi/dot_config/foot/themes/catppuccin/dot_editorconfig b/config/foot/themes/catppuccin/dot_editorconfig similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/dot_editorconfig rename to config/foot/themes/catppuccin/dot_editorconfig diff --git a/chezmoi/dot_config/foot/themes/catppuccin/dot_git b/config/foot/themes/catppuccin/dot_git similarity index 100% rename from chezmoi/dot_config/foot/themes/catppuccin/dot_git rename to config/foot/themes/catppuccin/dot_git diff --git a/chezmoi/dot_config/fzf/forgitrc b/config/fzf/forgitrc similarity index 100% rename from chezmoi/dot_config/fzf/forgitrc rename to config/fzf/forgitrc diff --git a/chezmoi/dot_config/fzf/fzfrc b/config/fzf/fzfrc similarity index 100% rename from chezmoi/dot_config/fzf/fzfrc rename to config/fzf/fzfrc diff --git a/chezmoi/dot_config/fzf/widgets/alias_widget.zsh b/config/fzf/widgets/alias_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/alias_widget.zsh rename to config/fzf/widgets/alias_widget.zsh diff --git a/chezmoi/dot_config/fzf/widgets/atuin-history_widget.zsh b/config/fzf/widgets/atuin-history_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/atuin-history_widget.zsh rename to config/fzf/widgets/atuin-history_widget.zsh diff --git a/chezmoi/dot_config/fzf/widgets/cd-recent-dir_widget.zsh b/config/fzf/widgets/cd-recent-dir_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/cd-recent-dir_widget.zsh rename to config/fzf/widgets/cd-recent-dir_widget.zsh diff --git a/chezmoi/dot_config/fzf/widgets/cd_widget.zsh b/config/fzf/widgets/cd_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/cd_widget.zsh rename to config/fzf/widgets/cd_widget.zsh diff --git a/chezmoi/dot_config/fzf/widgets/dictionary_widget.zsh b/config/fzf/widgets/dictionary_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/dictionary_widget.zsh rename to config/fzf/widgets/dictionary_widget.zsh diff --git a/chezmoi/dot_config/fzf/widgets/fzf-rg-launcher.zsh b/config/fzf/widgets/fzf-rg-launcher.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/fzf-rg-launcher.zsh rename to config/fzf/widgets/fzf-rg-launcher.zsh diff --git a/chezmoi/dot_config/fzf/widgets/locate_widget.zsh b/config/fzf/widgets/locate_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/locate_widget.zsh rename to config/fzf/widgets/locate_widget.zsh diff --git a/chezmoi/dot_config/fzf/widgets/man_widget.zsh b/config/fzf/widgets/man_widget.zsh similarity index 100% rename from chezmoi/dot_config/fzf/widgets/man_widget.zsh rename to config/fzf/widgets/man_widget.zsh diff --git a/chezmoi/dot_config/git/config b/config/git/config similarity index 100% rename from chezmoi/dot_config/git/config rename to config/git/config diff --git a/chezmoi/dot_config/git/ignore b/config/git/ignore similarity index 100% rename from chezmoi/dot_config/git/ignore rename to config/git/ignore diff --git a/chezmoi/dot_config/hypr/executable_gdm-wrapper.sh b/config/hypr/executable_gdm-wrapper.sh similarity index 100% rename from chezmoi/dot_config/hypr/executable_gdm-wrapper.sh rename to config/hypr/executable_gdm-wrapper.sh diff --git a/chezmoi/dot_config/hypr/hyprland.conf b/config/hypr/hyprland.conf similarity index 100% rename from chezmoi/dot_config/hypr/hyprland.conf rename to config/hypr/hyprland.conf diff --git a/chezmoi/dot_config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf similarity index 100% rename from chezmoi/dot_config/hypr/hyprpaper.conf rename to config/hypr/hyprpaper.conf diff --git a/chezmoi/dot_config/kitty/current-theme.conf b/config/kitty/current-theme.conf similarity index 100% rename from chezmoi/dot_config/kitty/current-theme.conf rename to config/kitty/current-theme.conf diff --git a/chezmoi/dot_config/kitty/kitty.conf b/config/kitty/kitty.conf similarity index 100% rename from chezmoi/dot_config/kitty/kitty.conf rename to config/kitty/kitty.conf diff --git a/chezmoi/dot_config/kitty/private_kitty.conf.bak b/config/kitty/private_kitty.conf.bak similarity index 100% rename from chezmoi/dot_config/kitty/private_kitty.conf.bak rename to config/kitty/private_kitty.conf.bak diff --git a/chezmoi/dot_config/lazygit/config.yml b/config/lazygit/config.yml similarity index 100% rename from chezmoi/dot_config/lazygit/config.yml rename to config/lazygit/config.yml diff --git a/chezmoi/dot_config/mako/config b/config/mako/config similarity index 100% rename from chezmoi/dot_config/mako/config rename to config/mako/config diff --git a/chezmoi/dot_config/mise/config.toml b/config/mise/config.toml similarity index 100% rename from chezmoi/dot_config/mise/config.toml rename to config/mise/config.toml diff --git a/chezmoi/dot_config/mpv/encoding.rst b/config/mpv/encoding.rst similarity index 100% rename from chezmoi/dot_config/mpv/encoding.rst rename to config/mpv/encoding.rst diff --git a/chezmoi/dot_config/mpv/input.conf b/config/mpv/input.conf similarity index 100% rename from chezmoi/dot_config/mpv/input.conf rename to config/mpv/input.conf diff --git a/chezmoi/dot_config/mpv/mplayer-input.conf b/config/mpv/mplayer-input.conf similarity index 100% rename from chezmoi/dot_config/mpv/mplayer-input.conf rename to config/mpv/mplayer-input.conf diff --git a/chezmoi/dot_config/mpv/mpv.conf b/config/mpv/mpv.conf similarity index 100% rename from chezmoi/dot_config/mpv/mpv.conf rename to config/mpv/mpv.conf diff --git a/chezmoi/dot_config/mpv/restore-old-bindings.conf b/config/mpv/restore-old-bindings.conf similarity index 100% rename from chezmoi/dot_config/mpv/restore-old-bindings.conf rename to config/mpv/restore-old-bindings.conf diff --git a/chezmoi/dot_config/mpv/script-opts/mpv_thumbnail_script.conf b/config/mpv/script-opts/mpv_thumbnail_script.conf similarity index 100% rename from chezmoi/dot_config/mpv/script-opts/mpv_thumbnail_script.conf rename to config/mpv/script-opts/mpv_thumbnail_script.conf diff --git a/chezmoi/dot_config/mpv/scripts/mpv-i3-floating-centered.lua b/config/mpv/scripts/mpv-i3-floating-centered.lua similarity index 100% rename from chezmoi/dot_config/mpv/scripts/mpv-i3-floating-centered.lua rename to config/mpv/scripts/mpv-i3-floating-centered.lua diff --git a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_client_osc.lua b/config/mpv/scripts/mpv_thumbnail_script_client_osc.lua similarity index 100% rename from chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_client_osc.lua rename to config/mpv/scripts/mpv_thumbnail_script_client_osc.lua diff --git a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-1.lua b/config/mpv/scripts/mpv_thumbnail_script_server-1.lua similarity index 100% rename from chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-1.lua rename to config/mpv/scripts/mpv_thumbnail_script_server-1.lua diff --git a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-2.lua b/config/mpv/scripts/mpv_thumbnail_script_server-2.lua similarity index 100% rename from chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-2.lua rename to config/mpv/scripts/mpv_thumbnail_script_server-2.lua diff --git a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server.lua b/config/mpv/scripts/mpv_thumbnail_script_server.lua similarity index 100% rename from chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server.lua rename to config/mpv/scripts/mpv_thumbnail_script_server.lua diff --git a/chezmoi/dot_config/mpv/scripts/pause-indicator.lua b/config/mpv/scripts/pause-indicator.lua similarity index 100% rename from chezmoi/dot_config/mpv/scripts/pause-indicator.lua rename to config/mpv/scripts/pause-indicator.lua diff --git a/chezmoi/dot_config/mpv/tech-overview.txt b/config/mpv/tech-overview.txt similarity index 100% rename from chezmoi/dot_config/mpv/tech-overview.txt rename to config/mpv/tech-overview.txt diff --git a/config/nushell/config.nu b/config/nushell/config.nu new file mode 100644 index 0000000..2917e52 --- /dev/null +++ b/config/nushell/config.nu @@ -0,0 +1,898 @@ +# Nushell Config File +# +# version = "0.99.1" + +# For more information on defining custom themes, see +# https://www.nushell.sh/book/coloring_and_theming.html +# And here is the theme collection +# https://github.com/nushell/nu_scripts/tree/main/themes +let dark_theme = { + # color for nushell primitives + separator: white + leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off + header: green_bold + empty: blue + # Closures can be used to choose colors for specific values. + # The value (in this case, a bool) is piped into the closure. + # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } } + bool: light_cyan + int: white + filesize: cyan + duration: white + date: purple + range: white + float: white + string: white + nothing: white + binary: white + cell-path: white + row_index: green_bold + record: white + list: white + block: white + hints: dark_gray + search_result: { bg: red fg: white } + shape_and: purple_bold + shape_binary: purple_bold + shape_block: blue_bold + shape_bool: light_cyan + shape_closure: green_bold + shape_custom: green + shape_datetime: cyan_bold + shape_directory: cyan + shape_external: cyan + shape_externalarg: green_bold + shape_external_resolved: light_yellow_bold + shape_filepath: cyan + shape_flag: blue_bold + shape_float: purple_bold + # shapes are used to change the cli syntax highlighting + shape_garbage: { fg: white bg: red attr: b } + shape_glob_interpolation: cyan_bold + shape_globpattern: cyan_bold + shape_int: purple_bold + shape_internalcall: cyan_bold + shape_keyword: cyan_bold + shape_list: cyan_bold + shape_literal: blue + shape_match_pattern: green + shape_matching_brackets: { attr: u } + shape_nothing: light_cyan + shape_operator: yellow + shape_or: purple_bold + shape_pipe: purple_bold + shape_range: yellow_bold + shape_record: cyan_bold + shape_redirection: purple_bold + shape_signature: green_bold + shape_string: green + shape_string_interpolation: cyan_bold + shape_table: blue_bold + shape_variable: purple + shape_vardecl: purple + shape_raw_string: light_purple +} + +let light_theme = { + # color for nushell primitives + separator: dark_gray + leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off + header: green_bold + empty: blue + # Closures can be used to choose colors for specific values. + # The value (in this case, a bool) is piped into the closure. + # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } } + bool: dark_cyan + int: dark_gray + filesize: cyan_bold + duration: dark_gray + date: purple + range: dark_gray + float: dark_gray + string: dark_gray + nothing: dark_gray + binary: dark_gray + cell-path: dark_gray + row_index: green_bold + record: dark_gray + list: dark_gray + block: dark_gray + hints: dark_gray + search_result: { fg: white bg: red } + shape_and: purple_bold + shape_binary: purple_bold + shape_block: blue_bold + shape_bool: light_cyan + shape_closure: green_bold + shape_custom: green + shape_datetime: cyan_bold + shape_directory: cyan + shape_external: cyan + shape_externalarg: green_bold + shape_external_resolved: light_purple_bold + shape_filepath: cyan + shape_flag: blue_bold + shape_float: purple_bold + # shapes are used to change the cli syntax highlighting + shape_garbage: { fg: white bg: red attr: b } + shape_glob_interpolation: cyan_bold + shape_globpattern: cyan_bold + shape_int: purple_bold + shape_internalcall: cyan_bold + shape_keyword: cyan_bold + shape_list: cyan_bold + shape_literal: blue + shape_match_pattern: green + shape_matching_brackets: { attr: u } + shape_nothing: light_cyan + shape_operator: yellow + shape_or: purple_bold + shape_pipe: purple_bold + shape_range: yellow_bold + shape_record: cyan_bold + shape_redirection: purple_bold + shape_signature: green_bold + shape_string: green + shape_string_interpolation: cyan_bold + shape_table: blue_bold + shape_variable: purple + shape_vardecl: purple + shape_raw_string: light_purple +} + +# External completer example +# let carapace_completer = {|spans| +# carapace $spans.0 nushell ...$spans | from json +# } + +# The default config record. This is where much of your global configuration is setup. +$env.config = { + show_banner: false # true or false to enable or disable the welcome banner at startup + + ls: { + use_ls_colors: true # use the LS_COLORS environment variable to colorize output + clickable_links: true # enable or disable clickable links. Your terminal has to support links. + } + + rm: { + always_trash: true # always act as if -t was given. Can be overridden with -p + } + + table: { + mode: compact # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other + index_mode: auto # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column + show_empty: true # show 'empty list' and 'empty record' placeholders for command output + padding: { left: 1, right: 1 } # a left right padding of each column in a table + trim: { + methodology: wrapping # wrapping or truncating + wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology + truncating_suffix: "..." # A suffix used by the 'truncating' methodology + } + header_on_separator: false # show header text on separator/border line + # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point + } + + error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages + + # Whether an error message should be printed if an error of a certain kind is triggered. + display_errors: { + exit_code: false # assume the external command prints an error message + # Core dump errors are always printed, and SIGPIPE never triggers an error. + # The setting below controls message printing for termination by all other signals. + termination_signal: true + } + + # datetime_format determines what a datetime rendered in the shell would look like. + # Behavior without this configuration point will be to "humanize" the datetime display, + # showing something like "a day ago." + datetime_format: { + # normal: '%a, %d %b %Y %H:%M:%S %z' # shows up in displays of variables or other datetime's outside of tables + # table: '%m/%d/%y %I:%M:%S%p' # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format + } + + explore: { + status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" }, + command_bar_text: { fg: "#C4C9C6" }, + highlight: { fg: "black", bg: "yellow" }, + status: { + error: { fg: "white", bg: "red" }, + warn: {} + info: {} + }, + selected_cell: { bg: light_blue }, + } + + history: { + max_size: 100_000 # Session has to be reloaded for this to take effect + sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file + file_format: "sqlite" # "sqlite" or "plaintext" + isolation: true # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions. + } + + completions: { + case_sensitive: false # set to true to enable case-sensitive completions + quick: true # set this to false to prevent auto-selecting completions when only one remains + partial: true # set this to false to prevent partial filling of the prompt + algorithm: "prefix" # prefix or fuzzy + sort: "smart" # "smart" (alphabetical for prefix matching, fuzzy score for fuzzy matching) or "alphabetical" + external: { + enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow + max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options + completer: null # check 'carapace_completer' above as an example + } + use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS + } + + filesize: { + metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard) + format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto + } + + cursor_shape: { + emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default) + vi_insert: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default) + vi_normal: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default) + } + + color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record + footer_mode: 25 # always, never, number_of_rows, auto + float_precision: 2 # the precision for displaying floats in tables + buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL + use_ansi_coloring: true + bracketed_paste: true # enable bracketed paste, currently useless on windows + edit_mode: vi # emacs, vi + shell_integration: { + # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title + osc2: true + # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory + osc7: true + # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8 + osc8: true + # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal + osc9_9: false + # osc133 is several escapes invented by Final Term which include the supported ones below. + # 133;A - Mark prompt start + # 133;B - Mark prompt end + # 133;C - Mark pre-execution + # 133;D;exit - Mark execution finished with exit code + # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is + osc133: true + # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features + # 633;A - Mark prompt start + # 633;B - Mark prompt end + # 633;C - Mark pre-execution + # 633;D;exit - Mark execution finished with exit code + # 633;E - Explicitly set the command line with an optional nonce + # 633;P;Cwd= - Mark the current working directory and communicate it to the terminal + # and also helps with the run recent menu in vscode + osc633: true + # reset_application_mode is escape \x1b[?1l and was added to help ssh work better + reset_application_mode: true + } + render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. + use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this. + highlight_resolved_externals: true # true enables highlighting of external commands in the repl resolved by which. + recursion_limit: 50 # the maximum number of times nushell allows recursion before stopping it + + plugins: {} # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration. + + plugin_gc: { + # Configuration for plugin garbage collection + default: { + enabled: true # true to enable stopping of inactive plugins + stop_after: 10sec # how long to wait after a plugin is inactive to stop it + } + plugins: { + # alternate configuration for specific plugins, by name, for example: + # + # gstat: { + # enabled: false + # } + } + } + + hooks: { + pre_prompt: [{ null }] # run before the prompt is shown + pre_execution: [{ null }] # run before the repl input is run + env_change: { + PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input + } + display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline + command_not_found: { null } # return an error message when a command is not found + } + + menus: [ + # Configuration for default nushell menus + # Note the lack of source parameter + { + name: completion_menu + only_buffer_difference: false + marker: "| " + type: { + layout: columnar + columns: 4 + col_width: 20 # Optional value. If missing all the screen width is used to calculate column width + col_padding: 2 + } + style: { + text: green + selected_text: { attr: r } + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: ide_completion_menu + only_buffer_difference: false + marker: "| " + type: { + layout: ide + min_completion_width: 0, + max_completion_width: 50, + max_completion_height: 10, # will be limited by the available lines in the terminal + padding: 0, + border: true, + cursor_offset: 0, + description_mode: "prefer_right" + min_description_width: 0 + max_description_width: 50 + max_description_height: 10 + description_offset: 1 + # If true, the cursor pos will be corrected, so the suggestions match up with the typed text + # + # C:\> str + # str join + # str trim + # str split + correct_cursor_pos: false + } + style: { + text: green + selected_text: { attr: r } + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: history_menu + only_buffer_difference: true + marker: "? " + type: { + layout: list + page_size: 10 + } + style: { + text: green + selected_text: green_reverse + description_text: yellow + } + } + { + name: help_menu + only_buffer_difference: true + marker: "? " + type: { + layout: description + columns: 4 + col_width: 20 # Optional value. If missing all the screen width is used to calculate column width + col_padding: 2 + selection_rows: 4 + description_rows: 10 + } + style: { + text: green + selected_text: green_reverse + description_text: yellow + } + } + ] + + keybindings: [ + { + name: completion_menu + modifier: none + keycode: tab + mode: [emacs vi_normal vi_insert] + event: { + until: [ + { send: menu name: completion_menu } + { send: menunext } + { edit: complete } + ] + } + } + { + name: completion_previous_menu + modifier: shift + keycode: backtab + mode: [emacs, vi_normal, vi_insert] + event: { send: menuprevious } + } + { + name: ide_completion_menu + modifier: control + keycode: space + mode: [emacs vi_normal vi_insert] + event: { + until: [ + { send: menu name: ide_completion_menu } + { send: menunext } + { edit: complete } + ] + } + } + { + name: history_menu + modifier: control + keycode: char_r + mode: [emacs, vi_insert, vi_normal] + event: { send: menu name: history_menu } + } + { + name: help_menu + modifier: none + keycode: f1 + mode: [emacs, vi_insert, vi_normal] + event: { send: menu name: help_menu } + } + { + name: next_page_menu + modifier: control + keycode: char_x + mode: emacs + event: { send: menupagenext } + } + { + name: undo_or_previous_page_menu + modifier: control + keycode: char_z + mode: emacs + event: { + until: [ + { send: menupageprevious } + { edit: undo } + ] + } + } + { + name: escape + modifier: none + keycode: escape + mode: [emacs, vi_normal, vi_insert] + event: { send: esc } # NOTE: does not appear to work + } + { + name: cancel_command + modifier: control + keycode: char_c + mode: [emacs, vi_normal, vi_insert] + event: { send: ctrlc } + } + { + name: quit_shell + modifier: control + keycode: char_d + mode: [emacs, vi_normal, vi_insert] + event: { send: ctrld } + } + { + name: clear_screen + modifier: control + keycode: char_l + mode: [emacs, vi_normal, vi_insert] + event: { send: clearscreen } + } + { + name: search_history + modifier: control + keycode: char_q + mode: [emacs, vi_normal, vi_insert] + event: { send: searchhistory } + } + { + name: open_command_editor + modifier: control + keycode: char_o + mode: [emacs, vi_normal, vi_insert] + event: { send: openeditor } + } + { + name: move_up + modifier: none + keycode: up + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuup } + { send: up } + ] + } + } + { + name: move_down + modifier: none + keycode: down + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menudown } + { send: down } + ] + } + } + { + name: move_left + modifier: none + keycode: left + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuleft } + { send: left } + ] + } + } + { + name: move_right_or_take_history_hint + modifier: none + keycode: right + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { send: menuright } + { send: right } + ] + } + } + { + name: move_one_word_left + modifier: control + keycode: left + mode: [emacs, vi_normal, vi_insert] + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: control + keycode: right + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: move_to_line_start + modifier: none + keycode: home + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_start + modifier: control + keycode: char_a + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_end_or_take_history_hint + modifier: none + keycode: end + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { edit: movetolineend } + ] + } + } + { + name: move_to_line_end_or_take_history_hint + modifier: control + keycode: char_e + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { edit: movetolineend } + ] + } + } + { + name: move_to_line_start + modifier: control + keycode: home + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_end + modifier: control + keycode: end + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolineend } + } + { + name: move_down + modifier: control + keycode: char_n + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menudown } + { send: down } + ] + } + } + { + name: move_up + modifier: control + keycode: char_p + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuup } + { send: up } + ] + } + } + { + name: delete_one_character_backward + modifier: none + keycode: backspace + mode: [emacs, vi_insert] + event: { edit: backspace } + } + { + name: delete_one_word_backward + modifier: control + keycode: backspace + mode: [emacs, vi_insert] + event: { edit: backspaceword } + } + { + name: delete_one_character_forward + modifier: none + keycode: delete + mode: [emacs, vi_insert] + event: { edit: delete } + } + { + name: delete_one_character_forward + modifier: control + keycode: delete + mode: [emacs, vi_insert] + event: { edit: delete } + } + { + name: delete_one_character_backward + modifier: control + keycode: char_h + mode: [emacs, vi_insert] + event: { edit: backspace } + } + { + name: delete_one_word_backward + modifier: control + keycode: char_w + mode: [emacs, vi_insert] + event: { edit: backspaceword } + } + { + name: move_left + modifier: none + keycode: backspace + mode: vi_normal + event: { edit: moveleft } + } + { + name: newline_or_run_command + modifier: none + keycode: enter + mode: emacs + event: { send: enter } + } + { + name: move_left + modifier: control + keycode: char_b + mode: emacs + event: { + until: [ + { send: menuleft } + { send: left } + ] + } + } + { + name: move_right_or_take_history_hint + modifier: control + keycode: char_f + mode: emacs + event: { + until: [ + { send: historyhintcomplete } + { send: menuright } + { send: right } + ] + } + } + { + name: redo_change + modifier: control + keycode: char_g + mode: emacs + event: { edit: redo } + } + { + name: undo_change + modifier: control + keycode: char_z + mode: emacs + event: { edit: undo } + } + { + name: paste_before + modifier: control + keycode: char_y + mode: emacs + event: { edit: pastecutbufferbefore } + } + { + name: cut_word_left + modifier: control + keycode: char_w + mode: emacs + event: { edit: cutwordleft } + } + { + name: cut_line_to_end + modifier: control + keycode: char_k + mode: emacs + event: { edit: cuttolineend } + } + { + name: cut_line_from_start + modifier: control + keycode: char_u + mode: emacs + event: { edit: cutfromstart } + } + { + name: swap_graphemes + modifier: control + keycode: char_t + mode: emacs + event: { edit: swapgraphemes } + } + { + name: move_one_word_left + modifier: alt + keycode: left + mode: emacs + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: alt + keycode: right + mode: emacs + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: move_one_word_left + modifier: alt + keycode: char_b + mode: emacs + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: alt + keycode: char_f + mode: emacs + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: delete_one_word_forward + modifier: alt + keycode: delete + mode: emacs + event: { edit: deleteword } + } + { + name: delete_one_word_backward + modifier: alt + keycode: backspace + mode: emacs + event: { edit: backspaceword } + } + { + name: delete_one_word_backward + modifier: alt + keycode: char_m + mode: emacs + event: { edit: backspaceword } + } + { + name: cut_word_to_right + modifier: alt + keycode: char_d + mode: emacs + event: { edit: cutwordright } + } + { + name: upper_case_word + modifier: alt + keycode: char_u + mode: emacs + event: { edit: uppercaseword } + } + { + name: lower_case_word + modifier: alt + keycode: char_l + mode: emacs + event: { edit: lowercaseword } + } + { + name: capitalize_char + modifier: alt + keycode: char_c + mode: emacs + event: { edit: capitalizechar } + } + # The following bindings with `*system` events require that Nushell has + # been compiled with the `system-clipboard` feature. + # If you want to use the system clipboard for visual selection or to + # paste directly, uncomment the respective lines and replace the version + # using the internal clipboard. + { + name: copy_selection + modifier: control_shift + keycode: char_c + mode: emacs + event: { edit: copyselection } + # event: { edit: copyselectionsystem } + } + { + name: cut_selection + modifier: control_shift + keycode: char_x + mode: emacs + event: { edit: cutselection } + # event: { edit: cutselectionsystem } + } + # { + # name: paste_system + # modifier: control_shift + # keycode: char_v + # mode: emacs + # event: { edit: pastesystem } + # } + { + name: select_all + modifier: control_shift + keycode: char_a + mode: emacs + event: { edit: selectall } + } + ] +} diff --git a/config/nushell/env.nu b/config/nushell/env.nu new file mode 100644 index 0000000..0ed67b1 --- /dev/null +++ b/config/nushell/env.nu @@ -0,0 +1,101 @@ +# Nushell Environment Config File +# +# version = "0.99.1" + +def create_left_prompt [] { + let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) { + null => $env.PWD + '' => '~' + $relative_pwd => ([~ $relative_pwd] | path join) + } + + let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold }) + let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold }) + let path_segment = $"($path_color)($dir)(ansi reset)" + + $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)" +} + +def create_right_prompt [] { + # create a right prompt in magenta with green separators and am/pm underlined + let time_segment = ([ + (ansi reset) + (ansi magenta) + (date now | format date '%x %X') # try to respect user's locale + ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" | + str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}") + + let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([ + (ansi rb) + ($env.LAST_EXIT_CODE) + ] | str join) + } else { "" } + + ([$last_exit_code, (char space), $time_segment] | str join) +} + +# Use nushell functions to define your right and left prompt +$env.PROMPT_COMMAND = {|| create_left_prompt } +# FIXME: This default is not implemented in rust code as of 2023-09-08. +$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt } + +# The prompt indicators are environmental variables that represent +# the state of the prompt +$env.PROMPT_INDICATOR = {|| "> " } +$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " } +$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " } +$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " } + +# If you want previously entered commands to have a different prompt from the usual one, +# you can uncomment one or more of the following lines. +# This can be useful if you have a 2-line prompt and it's taking up a lot of space +# because every command entered takes up 2 lines instead of 1. You can then uncomment +# the line below so that previously entered commands show with a single `🚀`. +# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " } +# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" } +# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" } +# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" } +# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" } +# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" } + +# Specifies how environment variables are: +# - converted from a string to a value on Nushell startup (from_string) +# - converted from a value back to a string when running external commands (to_string) +# Note: The conversions happen *after* config.nu is loaded +$env.ENV_CONVERSIONS = { + "PATH": { + from_string: { |s| $s | split row (char esep) | path expand --no-symlink } + to_string: { |v| $v | path expand --no-symlink | str join (char esep) } + } + "Path": { + from_string: { |s| $s | split row (char esep) | path expand --no-symlink } + to_string: { |v| $v | path expand --no-symlink | str join (char esep) } + } +} + +# Directories to search for scripts when calling source or use +# The default for this is $nu.default-config-dir/scripts +$env.NU_LIB_DIRS = [ + ($nu.default-config-dir | path join 'scripts') # add /scripts + ($nu.data-dir | path join 'completions') # default home for nushell completions +] + +# Directories to search for plugin binaries when calling register +# The default for this is $nu.default-config-dir/plugins +$env.NU_PLUGIN_DIRS = [ + ($nu.default-config-dir | path join 'plugins') # add /plugins +] + +# To add entries to PATH (on Windows you might use Path), you can use the following pattern: +# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path') +# An alternate way to add entries to $env.PATH is to use the custom command `path add` +# which is built into the nushell stdlib: +# use std "path add" +# $env.PATH = ($env.PATH | split row (char esep)) +# path add /some/path +# path add ($env.CARGO_HOME | path join "bin") +# path add ($env.HOME | path join ".local" "bin") +# $env.PATH = ($env.PATH | uniq) + +# To load from a custom file you can use: +# source ($nu.default-config-dir | path join 'custom.nu') \ No newline at end of file diff --git a/chezmoi/dot_config/nvim/after/queries/blade/highlights.scm b/config/nvim/after/queries/blade/highlights.scm similarity index 100% rename from chezmoi/dot_config/nvim/after/queries/blade/highlights.scm rename to config/nvim/after/queries/blade/highlights.scm diff --git a/chezmoi/dot_config/nvim/after/queries/blade/injections.scm b/config/nvim/after/queries/blade/injections.scm similarity index 100% rename from chezmoi/dot_config/nvim/after/queries/blade/injections.scm rename to config/nvim/after/queries/blade/injections.scm diff --git a/chezmoi/dot_config/nvim/init.lua b/config/nvim/init.lua similarity index 100% rename from chezmoi/dot_config/nvim/init.lua rename to config/nvim/init.lua diff --git a/chezmoi/dot_config/nvim/original_lazy-lock.json b/config/nvim/lazy-lock.json similarity index 97% rename from chezmoi/dot_config/nvim/original_lazy-lock.json rename to config/nvim/lazy-lock.json index 11840da..8b6a601 100644 --- a/chezmoi/dot_config/nvim/original_lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -21,14 +21,13 @@ "debugprint.nvim": { "branch": "main", "commit": "8f2a335fb0e6ebf0291a3551e0198363437e3a38" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, - "flash.nvim": { "branch": "main", "commit": "d0799ae43a581d9f190e182e2a1f389d2887c42a" }, "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" }, "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, "gopher.nvim": { "branch": "main", "commit": "f55c15ada8e02398000c04a96ef44d986cd01051" }, "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" }, "hurl.nvim": { "branch": "main", "commit": "d708158dda9a175c0f83cd106ea232301f4317cb" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "b02c9eae6a250f98908c146d1dc1a891f5019f0a" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, @@ -64,6 +63,7 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "tfm.nvim": { "branch": "main", "commit": "fb0de2c96bf303216ac5d91ce9bdb7f430030f8b" }, "todo-comments.nvim": { "branch": "main", "commit": "d61567557e2ff5c548c74e96b2d9f8d33e5fcb34" }, + "tree-sitter-nu": { "branch": "main", "commit": "7e0f16f608a9e804fae61430ade734f9f849fb80" }, "treesj": { "branch": "main", "commit": "6e8bd008bacd5ad001c3953017c1dca20709e915" }, "trouble.nvim": { "branch": "main", "commit": "03c1fbf518bef683422a3be9643c3da190903488" }, "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" }, diff --git a/chezmoi/dot_config/nvim/lua/aleidk/autocmds.lua b/config/nvim/lua/aleidk/autocmds.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/autocmds.lua rename to config/nvim/lua/aleidk/autocmds.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/constants.lua b/config/nvim/lua/aleidk/constants.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/constants.lua rename to config/nvim/lua/aleidk/constants.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/keymaps.lua b/config/nvim/lua/aleidk/keymaps.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/keymaps.lua rename to config/nvim/lua/aleidk/keymaps.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/options.lua b/config/nvim/lua/aleidk/options.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/options.lua rename to config/nvim/lua/aleidk/options.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua b/config/nvim/lua/aleidk/plugins/ai.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua rename to config/nvim/lua/aleidk/plugins/ai.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/auto-pairs.lua b/config/nvim/lua/aleidk/plugins/auto-pairs.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/auto-pairs.lua rename to config/nvim/lua/aleidk/plugins/auto-pairs.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/bookmarks.lua b/config/nvim/lua/aleidk/plugins/bookmarks.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/bookmarks.lua rename to config/nvim/lua/aleidk/plugins/bookmarks.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua b/config/nvim/lua/aleidk/plugins/colorscheme.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua rename to config/nvim/lua/aleidk/plugins/colorscheme.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua b/config/nvim/lua/aleidk/plugins/comments.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua rename to config/nvim/lua/aleidk/plugins/comments.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua b/config/nvim/lua/aleidk/plugins/completion.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua rename to config/nvim/lua/aleidk/plugins/completion.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/dashboard.lua b/config/nvim/lua/aleidk/plugins/dashboard.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/dashboard.lua rename to config/nvim/lua/aleidk/plugins/dashboard.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/database.lua b/config/nvim/lua/aleidk/plugins/database.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/database.lua rename to config/nvim/lua/aleidk/plugins/database.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/debugprint.lua b/config/nvim/lua/aleidk/plugins/debugprint.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/debugprint.lua rename to config/nvim/lua/aleidk/plugins/debugprint.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/dressing.lua b/config/nvim/lua/aleidk/plugins/dressing.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/dressing.lua rename to config/nvim/lua/aleidk/plugins/dressing.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/file-browser.lua b/config/nvim/lua/aleidk/plugins/file-browser.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/file-browser.lua rename to config/nvim/lua/aleidk/plugins/file-browser.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/file-explorer.lua b/config/nvim/lua/aleidk/plugins/file-explorer.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/file-explorer.lua rename to config/nvim/lua/aleidk/plugins/file-explorer.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua b/config/nvim/lua/aleidk/plugins/formatter.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua rename to config/nvim/lua/aleidk/plugins/formatter.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua b/config/nvim/lua/aleidk/plugins/git.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua rename to config/nvim/lua/aleidk/plugins/git.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/http.lua b/config/nvim/lua/aleidk/plugins/http.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/http.lua rename to config/nvim/lua/aleidk/plugins/http.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/indent-blankline.lua b/config/nvim/lua/aleidk/plugins/indent-blankline.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/indent-blankline.lua rename to config/nvim/lua/aleidk/plugins/indent-blankline.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua b/config/nvim/lua/aleidk/plugins/init.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua rename to config/nvim/lua/aleidk/plugins/init.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua b/config/nvim/lua/aleidk/plugins/key-help.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua rename to config/nvim/lua/aleidk/plugins/key-help.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/linters.lua b/config/nvim/lua/aleidk/plugins/linters.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/linters.lua rename to config/nvim/lua/aleidk/plugins/linters.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua b/config/nvim/lua/aleidk/plugins/lsp.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua rename to config/nvim/lua/aleidk/plugins/lsp.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lualine.lua b/config/nvim/lua/aleidk/plugins/lualine.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/lualine.lua rename to config/nvim/lua/aleidk/plugins/lualine.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/luasnip.lua b/config/nvim/lua/aleidk/plugins/luasnip.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/luasnip.lua rename to config/nvim/lua/aleidk/plugins/luasnip.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/markdown.lua b/config/nvim/lua/aleidk/plugins/markdown.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/markdown.lua rename to config/nvim/lua/aleidk/plugins/markdown.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua b/config/nvim/lua/aleidk/plugins/mason.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua rename to config/nvim/lua/aleidk/plugins/mason.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/noice.lua b/config/nvim/lua/aleidk/plugins/noice.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/noice.lua rename to config/nvim/lua/aleidk/plugins/noice.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/pretty-fold.lua b/config/nvim/lua/aleidk/plugins/pretty-fold.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/pretty-fold.lua rename to config/nvim/lua/aleidk/plugins/pretty-fold.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/quickfix.lua b/config/nvim/lua/aleidk/plugins/quickfix.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/quickfix.lua rename to config/nvim/lua/aleidk/plugins/quickfix.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/remote-sshfs.lua b/config/nvim/lua/aleidk/plugins/remote-sshfs.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/remote-sshfs.lua rename to config/nvim/lua/aleidk/plugins/remote-sshfs.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/sessions.lua b/config/nvim/lua/aleidk/plugins/sessions.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/sessions.lua rename to config/nvim/lua/aleidk/plugins/sessions.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/smart-splits.lua b/config/nvim/lua/aleidk/plugins/smart-splits.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/smart-splits.lua rename to config/nvim/lua/aleidk/plugins/smart-splits.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/surround.lua b/config/nvim/lua/aleidk/plugins/surround.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/surround.lua rename to config/nvim/lua/aleidk/plugins/surround.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/task-runner.lua b/config/nvim/lua/aleidk/plugins/task-runner.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/task-runner.lua rename to config/nvim/lua/aleidk/plugins/task-runner.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/telescope.lua b/config/nvim/lua/aleidk/plugins/telescope.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/telescope.lua rename to config/nvim/lua/aleidk/plugins/telescope.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/todo-comments.lua b/config/nvim/lua/aleidk/plugins/todo-comments.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/todo-comments.lua rename to config/nvim/lua/aleidk/plugins/todo-comments.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua b/config/nvim/lua/aleidk/plugins/treesitter.lua similarity index 88% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua rename to config/nvim/lua/aleidk/plugins/treesitter.lua index 6246d99..73616e1 100644 --- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua +++ b/config/nvim/lua/aleidk/plugins/treesitter.lua @@ -7,30 +7,12 @@ return { "JoosepAlviste/nvim-ts-context-commentstring", "nvim-treesitter/nvim-treesitter-context", { "windwp/nvim-ts-autotag", opts = {} }, + { "nushell/tree-sitter-nu", build = ":TSUpdate nu" }, }, build = ":TSUpdate", config = function() ---@diagnostic disable-next-line: missing-fields require("nvim-treesitter.configs").setup({ - -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { - "bash", - "c", - "cpp", - "go", - "lua", - "markdown", - "markdown_inline", - "python", - "regex", - "rust", - "sql", - "tsx", - "javascript", - "typescript", - "vim", - "vimdoc", - }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = true, highlight = { enable = true }, diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/trouble.lua b/config/nvim/lua/aleidk/plugins/trouble.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/trouble.lua rename to config/nvim/lua/aleidk/plugins/trouble.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/ts-node-action.lua b/config/nvim/lua/aleidk/plugins/ts-node-action.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/ts-node-action.lua rename to config/nvim/lua/aleidk/plugins/ts-node-action.lua diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/zen.lua b/config/nvim/lua/aleidk/plugins/zen.lua similarity index 100% rename from chezmoi/dot_config/nvim/lua/aleidk/plugins/zen.lua rename to config/nvim/lua/aleidk/plugins/zen.lua diff --git a/chezmoi/dot_config/php-cs-fixer-conf.php b/config/php-cs-fixer-conf.php similarity index 100% rename from chezmoi/dot_config/php-cs-fixer-conf.php rename to config/php-cs-fixer-conf.php diff --git a/chezmoi/dot_config/pycodestyle b/config/pycodestyle similarity index 100% rename from chezmoi/dot_config/pycodestyle rename to config/pycodestyle diff --git a/chezmoi/dot_config/river/executable_init b/config/river/executable_init similarity index 100% rename from chezmoi/dot_config/river/executable_init rename to config/river/executable_init diff --git a/chezmoi/dot_config/river/init.lua b/config/river/init.lua similarity index 100% rename from chezmoi/dot_config/river/init.lua rename to config/river/init.lua diff --git a/chezmoi/dot_config/river/logger.lua b/config/river/logger.lua similarity index 100% rename from chezmoi/dot_config/river/logger.lua rename to config/river/logger.lua diff --git a/chezmoi/dot_config/river/river.lua b/config/river/river.lua similarity index 100% rename from chezmoi/dot_config/river/river.lua rename to config/river/river.lua diff --git a/chezmoi/dot_config/sesh/sesh.toml b/config/sesh/sesh.toml similarity index 100% rename from chezmoi/dot_config/sesh/sesh.toml rename to config/sesh/sesh.toml diff --git a/chezmoi/dot_config/starship.toml b/config/starship.toml similarity index 100% rename from chezmoi/dot_config/starship.toml rename to config/starship.toml diff --git a/chezmoi/dot_config/swappy/config b/config/swappy/config similarity index 100% rename from chezmoi/dot_config/swappy/config rename to config/swappy/config diff --git a/chezmoi/dot_config/sway/config b/config/sway/config similarity index 100% rename from chezmoi/dot_config/sway/config rename to config/sway/config diff --git a/chezmoi/dot_config/sway/executable_autorotate b/config/sway/executable_autorotate similarity index 100% rename from chezmoi/dot_config/sway/executable_autorotate rename to config/sway/executable_autorotate diff --git a/chezmoi/dot_config/sway/executable_lock.sh b/config/sway/executable_lock.sh similarity index 100% rename from chezmoi/dot_config/sway/executable_lock.sh rename to config/sway/executable_lock.sh diff --git a/chezmoi/dot_config/sway/executable_sway-bar.sh b/config/sway/executable_sway-bar.sh similarity index 100% rename from chezmoi/dot_config/sway/executable_sway-bar.sh rename to config/sway/executable_sway-bar.sh diff --git a/chezmoi/dot_config/sway/themes/catppuccin/.keep b/config/sway/themes/catppuccin/.keep similarity index 100% rename from chezmoi/dot_config/sway/themes/catppuccin/.keep rename to config/sway/themes/catppuccin/.keep diff --git a/chezmoi/dot_config/tmux/tmux.conf b/config/tmux/tmux.conf similarity index 100% rename from chezmoi/dot_config/tmux/tmux.conf rename to config/tmux/tmux.conf diff --git a/chezmoi/dot_config/vimiv/keys.conf b/config/vimiv/keys.conf similarity index 100% rename from chezmoi/dot_config/vimiv/keys.conf rename to config/vimiv/keys.conf diff --git a/chezmoi/dot_config/vimiv/styles/default b/config/vimiv/styles/default similarity index 100% rename from chezmoi/dot_config/vimiv/styles/default rename to config/vimiv/styles/default diff --git a/chezmoi/dot_config/vimiv/styles/material-darker b/config/vimiv/styles/material-darker similarity index 100% rename from chezmoi/dot_config/vimiv/styles/material-darker rename to config/vimiv/styles/material-darker diff --git a/chezmoi/dot_config/vimiv/vimiv.conf b/config/vimiv/vimiv.conf similarity index 100% rename from chezmoi/dot_config/vimiv/vimiv.conf rename to config/vimiv/vimiv.conf diff --git a/chezmoi/dot_config/waybar/config b/config/waybar/config similarity index 100% rename from chezmoi/dot_config/waybar/config rename to config/waybar/config diff --git a/chezmoi/dot_config/waybar/style.css b/config/waybar/style.css similarity index 100% rename from chezmoi/dot_config/waybar/style.css rename to config/waybar/style.css diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/LICENSE b/config/waybar/themes/catppuccin/LICENSE similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/LICENSE rename to config/waybar/themes/catppuccin/LICENSE diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/README.md b/config/waybar/themes/catppuccin/README.md similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/README.md rename to config/waybar/themes/catppuccin/README.md diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/assets/empty_dot_gitkeep b/config/waybar/themes/catppuccin/assets/empty_dot_gitkeep similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/assets/empty_dot_gitkeep rename to config/waybar/themes/catppuccin/assets/empty_dot_gitkeep diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/assets/frappe.webp b/config/waybar/themes/catppuccin/assets/frappe.webp similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/assets/frappe.webp rename to config/waybar/themes/catppuccin/assets/frappe.webp diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/assets/latte.webp b/config/waybar/themes/catppuccin/assets/latte.webp similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/assets/latte.webp rename to config/waybar/themes/catppuccin/assets/latte.webp diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/assets/macchiato.webp b/config/waybar/themes/catppuccin/assets/macchiato.webp similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/assets/macchiato.webp rename to config/waybar/themes/catppuccin/assets/macchiato.webp diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/assets/mocha.webp b/config/waybar/themes/catppuccin/assets/mocha.webp similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/assets/mocha.webp rename to config/waybar/themes/catppuccin/assets/mocha.webp diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/assets/preview.webp b/config/waybar/themes/catppuccin/assets/preview.webp similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/assets/preview.webp rename to config/waybar/themes/catppuccin/assets/preview.webp diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/dot_catppuccin.yaml b/config/waybar/themes/catppuccin/dot_catppuccin.yaml similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/dot_catppuccin.yaml rename to config/waybar/themes/catppuccin/dot_catppuccin.yaml diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/dot_editorconfig b/config/waybar/themes/catppuccin/dot_editorconfig similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/dot_editorconfig rename to config/waybar/themes/catppuccin/dot_editorconfig diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/dot_git b/config/waybar/themes/catppuccin/dot_git similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/dot_git rename to config/waybar/themes/catppuccin/dot_git diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/themes/frappe.css b/config/waybar/themes/catppuccin/themes/frappe.css similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/themes/frappe.css rename to config/waybar/themes/catppuccin/themes/frappe.css diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/themes/latte.css b/config/waybar/themes/catppuccin/themes/latte.css similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/themes/latte.css rename to config/waybar/themes/catppuccin/themes/latte.css diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/themes/macchiato.css b/config/waybar/themes/catppuccin/themes/macchiato.css similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/themes/macchiato.css rename to config/waybar/themes/catppuccin/themes/macchiato.css diff --git a/chezmoi/dot_config/waybar/themes/catppuccin/themes/mocha.css b/config/waybar/themes/catppuccin/themes/mocha.css similarity index 100% rename from chezmoi/dot_config/waybar/themes/catppuccin/themes/mocha.css rename to config/waybar/themes/catppuccin/themes/mocha.css diff --git a/chezmoi/dot_config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua similarity index 100% rename from chezmoi/dot_config/wezterm/wezterm.lua rename to config/wezterm/wezterm.lua diff --git a/chezmoi/dot_config/yazi/init.lua b/config/yazi/init.lua similarity index 100% rename from chezmoi/dot_config/yazi/init.lua rename to config/yazi/init.lua diff --git a/chezmoi/dot_config/yazi/keymap.toml b/config/yazi/keymap.toml similarity index 100% rename from chezmoi/dot_config/yazi/keymap.toml rename to config/yazi/keymap.toml diff --git a/chezmoi/dot_config/yazi/original_package.toml b/config/yazi/package.toml similarity index 100% rename from chezmoi/dot_config/yazi/original_package.toml rename to config/yazi/package.toml diff --git a/chezmoi/dot_config/yazi/plugins/.keep b/config/yazi/plugins/.keep similarity index 100% rename from chezmoi/dot_config/yazi/plugins/.keep rename to config/yazi/plugins/.keep diff --git a/chezmoi/dot_config/yazi/theme.toml b/config/yazi/theme.toml similarity index 100% rename from chezmoi/dot_config/yazi/theme.toml rename to config/yazi/theme.toml diff --git a/chezmoi/dot_config/yazi/yazi.toml b/config/yazi/yazi.toml similarity index 100% rename from chezmoi/dot_config/yazi/yazi.toml rename to config/yazi/yazi.toml diff --git a/chezmoi/dot_config/zed/keymap.json b/config/zed/keymap.json similarity index 100% rename from chezmoi/dot_config/zed/keymap.json rename to config/zed/keymap.json diff --git a/chezmoi/dot_config/zed/private_settings.json b/config/zed/private_settings.json similarity index 100% rename from chezmoi/dot_config/zed/private_settings.json rename to config/zed/private_settings.json diff --git a/chezmoi/dot_config/zed/themes/.keep b/config/zed/themes/.keep similarity index 100% rename from chezmoi/dot_config/zed/themes/.keep rename to config/zed/themes/.keep diff --git a/chezmoi/dot_config/zellij/config.kdl b/config/zellij/config.kdl similarity index 100% rename from chezmoi/dot_config/zellij/config.kdl rename to config/zellij/config.kdl diff --git a/chezmoi/dot_config/zellij/themes/catppuccin.kdl b/config/zellij/themes/catppuccin.kdl similarity index 100% rename from chezmoi/dot_config/zellij/themes/catppuccin.kdl rename to config/zellij/themes/catppuccin.kdl diff --git a/chezmoi/dot_config/zk/config.toml b/config/zk/config.toml similarity index 100% rename from chezmoi/dot_config/zk/config.toml rename to config/zk/config.toml diff --git a/chezmoi/dot_config/zsh/aliases/aliases.zsh b/config/zsh/aliases/aliases.zsh similarity index 100% rename from chezmoi/dot_config/zsh/aliases/aliases.zsh rename to config/zsh/aliases/aliases.zsh diff --git a/chezmoi/dot_config/zsh/aliases/configs.zsh b/config/zsh/aliases/configs.zsh similarity index 100% rename from chezmoi/dot_config/zsh/aliases/configs.zsh rename to config/zsh/aliases/configs.zsh diff --git a/chezmoi/dot_config/zsh/aliases/fzf.zsh b/config/zsh/aliases/fzf.zsh similarity index 100% rename from chezmoi/dot_config/zsh/aliases/fzf.zsh rename to config/zsh/aliases/fzf.zsh diff --git a/chezmoi/dot_config/zsh/aliases/nvim.zsh b/config/zsh/aliases/nvim.zsh similarity index 100% rename from chezmoi/dot_config/zsh/aliases/nvim.zsh rename to config/zsh/aliases/nvim.zsh diff --git a/chezmoi/dot_config/zsh/aliases/pnpm.zsh b/config/zsh/aliases/pnpm.zsh similarity index 100% rename from chezmoi/dot_config/zsh/aliases/pnpm.zsh rename to config/zsh/aliases/pnpm.zsh diff --git a/chezmoi/dot_config/zsh/completions/_alacritty b/config/zsh/completions/_alacritty similarity index 100% rename from chezmoi/dot_config/zsh/completions/_alacritty rename to config/zsh/completions/_alacritty diff --git a/chezmoi/dot_config/zsh/completions/_cargo b/config/zsh/completions/_cargo similarity index 100% rename from chezmoi/dot_config/zsh/completions/_cargo rename to config/zsh/completions/_cargo diff --git a/chezmoi/dot_config/zsh/completions/_chezmoi b/config/zsh/completions/_chezmoi similarity index 100% rename from chezmoi/dot_config/zsh/completions/_chezmoi rename to config/zsh/completions/_chezmoi diff --git a/chezmoi/dot_config/zsh/completions/_cht b/config/zsh/completions/_cht similarity index 100% rename from chezmoi/dot_config/zsh/completions/_cht rename to config/zsh/completions/_cht diff --git a/chezmoi/dot_config/zsh/completions/_globdots b/config/zsh/completions/_globdots similarity index 100% rename from chezmoi/dot_config/zsh/completions/_globdots rename to config/zsh/completions/_globdots diff --git a/chezmoi/dot_config/zsh/completions/_lsd b/config/zsh/completions/_lsd similarity index 100% rename from chezmoi/dot_config/zsh/completions/_lsd rename to config/zsh/completions/_lsd diff --git a/chezmoi/dot_config/zsh/completions/_rg b/config/zsh/completions/_rg similarity index 100% rename from chezmoi/dot_config/zsh/completions/_rg rename to config/zsh/completions/_rg diff --git a/chezmoi/dot_config/zsh/completions/_rtx b/config/zsh/completions/_rtx similarity index 100% rename from chezmoi/dot_config/zsh/completions/_rtx rename to config/zsh/completions/_rtx diff --git a/chezmoi/dot_config/zsh/completions/_rye b/config/zsh/completions/_rye similarity index 100% rename from chezmoi/dot_config/zsh/completions/_rye rename to config/zsh/completions/_rye diff --git a/chezmoi/dot_config/zsh/completions/_starship b/config/zsh/completions/_starship similarity index 100% rename from chezmoi/dot_config/zsh/completions/_starship rename to config/zsh/completions/_starship diff --git a/chezmoi/dot_config/zsh/completions/_tea b/config/zsh/completions/_tea similarity index 100% rename from chezmoi/dot_config/zsh/completions/_tea rename to config/zsh/completions/_tea diff --git a/chezmoi/dot_config/zsh/completions/_tldr b/config/zsh/completions/_tldr similarity index 100% rename from chezmoi/dot_config/zsh/completions/_tldr rename to config/zsh/completions/_tldr diff --git a/chezmoi/dot_config/zsh/completions/_zellij b/config/zsh/completions/_zellij similarity index 100% rename from chezmoi/dot_config/zsh/completions/_zellij rename to config/zsh/completions/_zellij diff --git a/chezmoi/dot_config/zsh/functions/fedora.zsh b/config/zsh/functions/fedora.zsh similarity index 100% rename from chezmoi/dot_config/zsh/functions/fedora.zsh rename to config/zsh/functions/fedora.zsh diff --git a/chezmoi/dot_config/zsh/functions/flatpak.zsh b/config/zsh/functions/flatpak.zsh similarity index 100% rename from chezmoi/dot_config/zsh/functions/flatpak.zsh rename to config/zsh/functions/flatpak.zsh diff --git a/chezmoi/dot_config/zsh/functions/functions.zsh b/config/zsh/functions/functions.zsh similarity index 100% rename from chezmoi/dot_config/zsh/functions/functions.zsh rename to config/zsh/functions/functions.zsh diff --git a/chezmoi/executable_dot_zprofile.tmpl b/config/zsh/zprofile similarity index 96% rename from chezmoi/executable_dot_zprofile.tmpl rename to config/zsh/zprofile index c4db92a..cf0977d 100644 --- a/chezmoi/executable_dot_zprofile.tmpl +++ b/config/zsh/zprofile @@ -10,7 +10,6 @@ export EDITOR=nvim export VISUAL="$EDITOR" export QT_STYLE_OVERRIDE=kvantum export MOZ_ENABLE_WAYLAND=1 -export OPENAI_API_KEY="{{ .openAIKey }}" # Dev Stuff export NPM_PACKAGES="$HOME/.npm-packages" diff --git a/chezmoi/executable_dot_zshrc b/config/zsh/zshrc similarity index 97% rename from chezmoi/executable_dot_zshrc rename to config/zsh/zshrc index 75a2f88..158a105 100644 --- a/chezmoi/executable_dot_zshrc +++ b/config/zsh/zshrc @@ -9,6 +9,10 @@ # Set the directory we want to store zinit and plugins ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit" +# Auto install zinit +[ ! -d $ZINIT_HOME ] && mkdir -p "$(dirname $ZINIT_HOME)" +[ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME" + # Source/Load zinit, installation is handle by chezmoi external script source "${ZINIT_HOME}/zinit.zsh" @@ -139,4 +143,4 @@ done eval "$(fzf --zsh)" eval "$(zoxide init --cmd cd zsh)" eval "$(starship init zsh)" -eval "$(mise activate zsh)" +# eval "$(mise activate zsh)"