diff --git a/stowers/nvim/dot-config/nvim/lazy-lock.json b/stowers/nvim/dot-config/nvim/lazy-lock.json index a714c37..542ef0c 100644 --- a/stowers/nvim/dot-config/nvim/lazy-lock.json +++ b/stowers/nvim/dot-config/nvim/lazy-lock.json @@ -2,20 +2,20 @@ "blamer.nvim": { "branch": "master", "commit": "920eee3913091bd929d83e7bf52a815351a0559c" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" }, - "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" }, + "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, "neovim": { "branch": "main", "commit": "14b371fb783a8cfdade04544fb782f0bb6f7c904" }, - "nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" }, - "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" }, - "nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" }, + "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" }, "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "schemastore.nvim": { "branch": "main", "commit": "992285058ce208825eb1b9ac82fa6be7d76ffcc1" }, + "schemastore.nvim": { "branch": "main", "commit": "df87d16fc4ea7c2c67cfc00b513861738693fe07" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, - "vim-gitgutter": { "branch": "main", "commit": "6620e5fbbe6a28de0bfed081f5bd2767023b7eea" } + "vim-gitgutter": { "branch": "main", "commit": "a5ae0a5a18e266f8a62b3e256208afcbb20fe5b5" } } diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua index 2359176..30b1a3f 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua @@ -1,3 +1,4 @@ require("eyedevelop.remap") require("eyedevelop.pm") require("eyedevelop.settings") +require("eyedevelop.lsp_settings") diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp_settings.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp_settings.lua new file mode 100644 index 0000000..a752e59 --- /dev/null +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp_settings.lua @@ -0,0 +1,29 @@ +vim.lsp.config("*", { + capabilities = require("cmp_nvim_lsp").default_capabilities(), + inlay_hints = { + enabled = true, + }, +}) + +vim.lsp.config("yamlls", { + settings = { + yaml = { + schemaStore = { + enable = false, + url = "", + }, + schemas = require("schemastore").yaml.schemas(), + }, + }, +}) + +vim.lsp.config("jsonls", { + settings = { + json = { + schemas = require("schemastore").json.schemas(), + validate = { + enable = true, + }, + }, + }, +}) diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua index 3546469..42c8991 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua @@ -71,39 +71,7 @@ return { { "williamboman/mason-lspconfig.nvim", lazy = true, - config = function() - require("mason-lspconfig").setup({}) - require("mason-lspconfig").setup_handlers({ - function (server_name) - require("lspconfig")[server_name].setup({}) - end, - - ["yamlls"] = function() - require("lspconfig").yamlls.setup({ - settings = { - yaml = { - schemaStore = { - enable = false, - url = "", - }, - schemas = require("schemastore").yaml.schemas(), - }, - }, - }) - end, - - ["jsonls"] = function() - require("lspconfig").jsonls.setup({ - settings = { - json = { - schemas = require("schemastore").json.schemas(), - validate = { enable = true, }, - }, - }, - }) - end, - }) - end, + opts = {}, }, { @@ -127,18 +95,6 @@ return { vim.opt.signcolumn = "yes" end, config = function() - local lsp_defaults = require("lspconfig").util.default_config - - lsp_defaults.capabilities = vim.tbl_deep_extend( - "force", - lsp_defaults.capabilities, - require("cmp_nvim_lsp").default_capabilities() - ) - - lsp_defaults.inlay_hints = { - enabled = true - } - vim.api.nvim_create_autocmd("LspAttach", { desc = "LSP actions", callback = function(event) diff --git a/stowers/shell-utils/dot-local/.gitignore b/stowers/shell-utils/dot-local/.gitignore new file mode 100644 index 0000000..bf445f7 --- /dev/null +++ b/stowers/shell-utils/dot-local/.gitignore @@ -0,0 +1 @@ +bin/yt-dlp diff --git a/stowers/zsh/config.sh b/stowers/zsh/config.sh index 85a804a..2a9e476 100644 --- a/stowers/zsh/config.sh +++ b/stowers/zsh/config.sh @@ -1,3 +1,3 @@ #!/bin/bash -COMMAND_DEPS=("zsh") +COMMAND_DEPS=("zsh" "starship") diff --git a/stowers/zsh/dot-bash_completion b/stowers/zsh/dot-bash_completion deleted file mode 100644 index 5b71754..0000000 --- a/stowers/zsh/dot-bash_completion +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -_devc_ssh() { - if [[ "${#COMP_WORDS[@]}" -eq 2 ]]; then - COMPREPLY=( $(compgen -W "$(docker ps --format '{{ .Names }}' | tr '\n' ' ')" -- "${cur}" ) ) - fi -} - -complete -F _devc_ssh devc-ssh diff --git a/stowers/zsh/dot-config/starship.toml b/stowers/zsh/dot-config/starship.toml new file mode 100644 index 0000000..c2321c4 --- /dev/null +++ b/stowers/zsh/dot-config/starship.toml @@ -0,0 +1,180 @@ +"$schema" = 'https://starship.rs/config-schema.json' + +format = """ +[](color_orange)\ +$os\ +$username\ +[](bg:color_yellow fg:color_orange)\ +$directory\ +[](fg:color_yellow bg:color_aqua)\ +$git_branch\ +$git_status\ +[](fg:color_aqua bg:color_blue)\ +$c\ +$cpp\ +$rust\ +$golang\ +$nodejs\ +$php\ +$java\ +$kotlin\ +$haskell\ +$python\ +[](fg:color_blue bg:color_bg3)\ +$docker_context\ +$conda\ +$pixi\ +[](fg:color_bg3 bg:color_bg1)\ +$time\ +[ ](fg:color_bg1)\ +$line_break$character""" + +palette = 'gruvbox_dark' + +[palettes.gruvbox_dark] +color_fg0 = '#fbf1c7' +color_bg1 = '#3c3836' +color_bg3 = '#665c54' +color_blue = '#458588' +color_aqua = '#689d6a' +color_green = '#98971a' +color_orange = '#d65d0e' +color_purple = '#b16286' +color_red = '#cc241d' +color_yellow = '#d79921' + +[os] +disabled = false +style = "bg:color_orange fg:color_fg0" + +[os.symbols] +Windows = "󰍲" +Ubuntu = "󰕈" +SUSE = "" +Raspbian = "󰐿" +Mint = "󰣭" +Macos = "󰀵" +Manjaro = "" +Linux = "󰌽" +Gentoo = "󰣨" +Fedora = "󰣛" +Alpine = "" +Amazon = "" +Android = "" +Arch = "󰣇" +Artix = "󰣇" +EndeavourOS = "" +CentOS = "" +Debian = "󰣚" +Redhat = "󱄛" +RedHatEnterprise = "󱄛" +Pop = "" + +[username] +show_always = true +style_user = "bg:color_orange fg:color_fg0" +style_root = "bg:color_orange fg:color_fg0" +format = '[ $user ]($style)' + +[directory] +style = "fg:color_fg0 bg:color_yellow" +format = "[ $path ]($style)" +truncation_length = 3 +truncation_symbol = "…/" + +[directory.substitutions] +"Documents" = "󰈙 " +"Downloads" = " " +"Music" = "󰝚 " +"Pictures" = " " +"Developer" = "󰲋 " + +[git_branch] +symbol = "" +style = "bg:color_aqua" +format = '[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)' + +[git_status] +style = "bg:color_aqua" +format = '[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)' + +[nodejs] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[c] +symbol = " " +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[cpp] +symbol = " " +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[rust] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[golang] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[php] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[java] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[kotlin] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[haskell] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[python] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[docker_context] +symbol = "" +style = "bg:color_bg3" +format = '[[ $symbol( $context) ](fg:#83a598 bg:color_bg3)]($style)' + +[conda] +style = "bg:color_bg3" +format = '[[ $symbol( $environment) ](fg:#83a598 bg:color_bg3)]($style)' + +[pixi] +style = "bg:color_bg3" +format = '[[ $symbol( $version)( $environment) ](fg:color_fg0 bg:color_bg3)]($style)' + +[time] +disabled = false +time_format = "%R" +style = "bg:color_bg1" +format = '[[  $time ](fg:color_fg0 bg:color_bg1)]($style)' + +[line_break] +disabled = false + +[character] +disabled = false +success_symbol = '[](bold fg:color_green)' +error_symbol = '[](bold fg:color_red)' +vimcmd_symbol = '[](bold fg:color_green)' +vimcmd_replace_one_symbol = '[](bold fg:color_purple)' +vimcmd_replace_symbol = '[](bold fg:color_purple)' +vimcmd_visual_symbol = '[](bold fg:color_yellow)' diff --git a/stowers/zsh/dot-oh-my-zsh b/stowers/zsh/dot-oh-my-zsh deleted file mode 160000 index ebb479e..0000000 --- a/stowers/zsh/dot-oh-my-zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ebb479e5e2395d26fc368c9b9d534e935a292740 diff --git a/stowers/zsh/dot-zshrc b/stowers/zsh/dot-zshrc index c041392..b7e11ea 100644 --- a/stowers/zsh/dot-zshrc +++ b/stowers/zsh/dot-zshrc @@ -1,82 +1,6 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH +#!/bin/bash export PATH="${PATH}:${HOME}/.local/bin" -# Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="fishy" # set by `omz` - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment one of the following lines to change the auto-update behavior -# zstyle ':omz:update' mode disabled # disable automatic updates -zstyle ':omz:update' mode auto # update automatically without asking -# zstyle ':omz:update' mode reminder # just remind me to update when it's time - -# Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=() - -source $ZSH/oh-my-zsh.sh - -# User configuration - # export MANPATH="/usr/local/man:$MANPATH" # You may need to manually set your language environment @@ -89,18 +13,6 @@ source $ZSH/oh-my-zsh.sh # export EDITOR='mvim' # fi -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - # Read man page. zstyle ':completion:*:manuals' separate-sections true zstyle ':completion:*:manuals.*' insert-sections true @@ -113,7 +25,12 @@ if [[ -d "${HOME}/.zshrc.d" ]]; then done fi +alias ls="ls --color=auto" + # Custom command completions if [[ -f "${HOME}/.bash_completion" ]]; then source "${HOME}"/.bash_completion fi + +# Starship +eval "$(starship init zsh)" diff --git a/stowers/zsh/dot-zshrc.d/01-aliases.sh b/stowers/zsh/dot-zshrc.d/01-aliases.sh index f5884dd..b56fee3 100644 --- a/stowers/zsh/dot-zshrc.d/01-aliases.sh +++ b/stowers/zsh/dot-zshrc.d/01-aliases.sh @@ -7,6 +7,3 @@ alias cdw="cd \${WORKSPACE_DIR}" function cdp() { cd -- "$(_cdp_path "$@")" } - -alias devcontainer-nvim="devcontainer up --mount 'type=bind,source=${HOME}/.config/nvim,target=/home/dev/.config/nvim' --workspace-folder ." -