Skip to content

Commit

Permalink
random
Browse files Browse the repository at this point in the history
  • Loading branch information
mosheavni committed Jan 27, 2025
1 parent 55868be commit cc4e4d1
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 29 deletions.
2 changes: 1 addition & 1 deletion asdf/.tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kubectx 0.9.5
minikube 1.32.0
mysql 8.0.34
neovim nightly
nodejs 20.10.0
nodejs 20.17.0
python 3.11.8
semver 3.4.0
terraform 1.5.5
Expand Down
36 changes: 18 additions & 18 deletions nvim/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" },
"CopilotChat.nvim": { "branch": "main", "commit": "1b375c24602680b5fe28c3c223a822111857dc37" },
"CursorLineCurrentWindow": { "branch": "master", "commit": "b4eeea98b0d139772969fd243a8802a9883fd2a8" },
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
"SchemaStore.nvim": { "branch": "main", "commit": "5be212138af55d3dcae9d77b5b14f63634243e3d" },
"SchemaStore.nvim": { "branch": "main", "commit": "bb52c530698654355bbddb9f0035dc35cea401a5" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
Expand All @@ -13,18 +13,18 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-tabnine": { "branch": "main", "commit": "c0167cdc86c15e782c5461ee62aebee89231c2ed" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "f8d743ce333bedc47821de2cd4d23c43856ecbe5" },
"conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
"copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"fzf-lua": { "branch": "main", "commit": "5e703b571878825e0386e59b8626801fdbaf5a9c" },
"fzf-lua": { "branch": "main", "commit": "7a83b844423c6ec55c445f1de9ad51fe038f5df5" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"gitsigns.nvim": { "branch": "main", "commit": "632fda72df903255dc1683cd739dceaa7338128a" },
"gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
"jsonpath.nvim": { "branch": "main", "commit": "2d889eb9c39893e030e902b854122a1615c042ea" },
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
"leap.nvim": { "branch": "main", "commit": "67d26a13cfbf558450955ee9c76e78e03d13ee9e" },
"lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
"leap.nvim": { "branch": "main", "commit": "be8e6eee2dabc68ce810ddf2e800c14bfda09fee" },
"leetcode.nvim": { "branch": "master", "commit": "db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951" },
"linediff.vim": { "branch": "main", "commit": "ddae71ef5f94775d101c1c70032ebe8799f32745" },
"lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
Expand All @@ -50,38 +50,38 @@
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-bqf": { "branch": "main", "commit": "ebb6d2689e4427452180f17c53f29f7e460236f1" },
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
"nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
"nvim-dap": { "branch": "master", "commit": "1fdfe74661170ce58d37dc46259448987ffe706c" },
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
"nvim-dap-ui": { "branch": "master", "commit": "0d5c37a43bc039c42a0a9bf801e53f77adf06a24" },
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
"nvim-hlslens": { "branch": "main", "commit": "e22f8448b571b56d6140427e27e02406bcf4e059" },
"nvim-lspconfig": { "branch": "master", "commit": "513f4f0bde469ecb3abe2e1b606f63cf142e751e" },
"nvim-lspconfig": { "branch": "master", "commit": "e5bf88e5ea1c4cea5ea96b1e970cb264f7a401a1" },
"nvim-luaref": { "branch": "main", "commit": "9cd3ed50d5752ffd56d88dd9e395ddd3dc2c7127" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-pqf": { "branch": "main", "commit": "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6" },
"nvim-tree.lua": { "branch": "master", "commit": "fca0b67c0b5a31727fb33addc4d9c100736a2894" },
"nvim-treesitter": { "branch": "master", "commit": "6587a5886873cce8698a47477224c30578b33a24" },
"nvim-tree.lua": { "branch": "master", "commit": "d05881f65f0a653db8d830ccc4d2e07d6a720628" },
"nvim-treesitter": { "branch": "master", "commit": "61a385d74f822dcd1d223f42f1267d1317aaa2d0" },
"nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-ufo": { "branch": "main", "commit": "4c64d89c2bf174d95d4ac91cc959a9e43e2f318c" },
"nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
"oil.nvim": { "branch": "master", "commit": "7a782c9a9cb7a16ec52199e55a1e892262c5dbbc" },
"oklch-color-picker.nvim": { "branch": "master", "commit": "b1d5003a263dc10cb251212c329e57045b72fdfe" },
"nvim-ufo": { "branch": "main", "commit": "6e810dff2e590ed32dd697f90d5910443c78b8e1" },
"nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" },
"oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
"oklch-color-picker.nvim": { "branch": "master", "commit": "db53d2c5dd552e6fe3fe89a226f29b53c01647c0" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"rose-pine": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" },
"snacks.nvim": { "branch": "main", "commit": "41ee33725e48d4a5f6f7ca36127a69bf267a909e" },
"snacks.nvim": { "branch": "main", "commit": "b96bd540f785c725289f9f15f0147b1b2dac5a35" },
"sqlite.lua": { "branch": "master", "commit": "b487fcc8937b683942a1f7d9662fcf50ca5acd58" },
"statuscol.nvim": { "branch": "0.10", "commit": "b0de00dfcf583bdd94284d844aac1b134d47c578" },
"switch.vim": { "branch": "main", "commit": "0de9b271dfb840e71e36e831f6a487f3422ff562" },
"template-string.nvim": { "branch": "main", "commit": "da5f326b65fb74fd068aa1d8b55461b64c8fb23b" },
"treemonkey.nvim": { "branch": "main", "commit": "1fe117cc25b283c33209136e8d48cea078939d6d" },
"treesitter-terraform-doc.nvim": { "branch": "main", "commit": "130e0e47d4d436e9efefb786613f83c4498ec309" },
"ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
"vim-dadbod": { "branch": "master", "commit": "96997dac981d50717a63d4dbd48d4a43e09ecf57" },
"vim-dadbod": { "branch": "master", "commit": "9f0ca8bcef704659820a95c3bbd2c262583a66a1" },
"vim-dadbod-completion": { "branch": "master", "commit": "95cbcf21ea7a5c8c025f387280c2e261b8cb3a89" },
"vim-dadbod-ui": { "branch": "master", "commit": "65454e2011c029922c2c972d63f8bf04282de033" },
"vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
Expand Down
5 changes: 5 additions & 0 deletions nvim/.config/nvim/lua/plugins/fzf.lua
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ return {
config = function()
require('fzf-lua').setup {
'default-title',
files = {
git_icons = true,
rg_opts = [[--color=never --files --hidden --follow -g "!.git"]],
fd_opts = [[--color=never --type f --type l --hidden --follow --exclude .git]],
},
oldfiles = {
cwd_only = true,
include_current_session = true,
Expand Down
3 changes: 2 additions & 1 deletion nvim/.config/nvim/lua/user/autocommands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, {
})

autocmd('FileChangedShellPost', {
desc = 'Actions when the file is changed outside of Neovim',
desc = 'Reload when the file is changed outside of Neovim',
group = reload_file_group,
callback = function()
vim.notify('File changed, reloading the buffer', vim.log.levels.WARN)
Expand All @@ -41,6 +41,7 @@ autocmd('UIEnter', {
end,
})

-- VeryLazy
autocmd('User', {
desc = 'Setup non-critical stuff after lazy has loaded',
group = first_load,
Expand Down
9 changes: 7 additions & 2 deletions nvim/.config/nvim/lua/user/lsp/servers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,17 @@ M.setup = function()
capabilities = capabilities,
}

local yaml_cfg = require('user.lsp.yaml').setup { capabilities = capabilities }

lspconfig['helm_ls'].setup {
capabilities = capabilities,
filetypes = { 'helm', 'gotmpl' },
settings = {
yamlls = {
config = yaml_cfg.settings,
},
},
}

require('user.lsp.yaml').setup { capabilities = capabilities }
end

return M
1 change: 0 additions & 1 deletion nvim/.config/nvim/lua/user/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ vim.opt.completeopt = 'menu,menuone,noselect,noinsert,popup'
vim.o.previewheight = 15
vim.o.laststatus = 3 -- Global statusline, only one for all buffers
vim.o.showcmd = true
vim.o.guifont = 'Fira Code,Hack Nerd Font'
vim.o.mouse = 'a'
vim.o.undofile = true -- Enables saving undo history to a file
vim.o.undolevels = 10000
Expand Down
6 changes: 6 additions & 0 deletions nvim/.config/nvim/snippets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
"Jenkinsfile"
],
"path": "./groovy.json"
},
{
"language": [
"yaml"
],
"path": "./yaml.json"
}
]
}
Expand Down
7 changes: 7 additions & 0 deletions nvim/.config/nvim/snippets/yaml.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"modeline": {
"prefix": "mod",
"body": ["# yaml-language-server: $$schema=${1:file:///}"],
"description": "Create an autocmd"
}
}
1 change: 1 addition & 0 deletions wezterm/.wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ config.line_height = 0.9

-- tab bar
config.use_fancy_tab_bar = true
config.show_close_tab_button_in_tabs = true
config.tab_max_width = 999
config.window_frame = {
font = wez.font { family = 'Roboto', weight = 'Bold' },
Expand Down
3 changes: 1 addition & 2 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ export LC_ALL=en_US.UTF-8
# ============= #
# asdf
export ASDF_PYTHON_DEFAULT_PACKAGES_FILE=~/.dotfiles/requirements.txt
export ASDF_DIR="$HOME/.asdf"
[[ -d $HOME/.asdf ]] && source $HOME/.asdf/asdf.sh
. $(brew --prefix asdf)/libexec/asdf.sh

source $HOME/.antidote/antidote.zsh
antidote load
Expand Down
6 changes: 2 additions & 4 deletions zsh/zsh.d/term-support.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ function termsupport_cwd {

function termsupport_cwd_preexec {
emulate -L zsh
print -Pn "\e]0;${1:-%N}: ${ZSH_TAB_TITLE}\a" # set tab name
local CMD="${2%% *}"
print -Pn "\e]0;${CMD}: ${ZSH_TAB_TITLE}\a" # set tab name
}

# Use a precmd hook instead of a chpwd hook to avoid contaminating output
# i.e. when a script or function changes directory without `cd -q`, chpwd
# will be called the output may be swallowed by the script or function.
autoload -Uz add-zsh-hook
add-zsh-hook precmd termsupport_cwd
add-zsh-hook preexec termsupport_cwd_preexec

0 comments on commit cc4e4d1

Please sign in to comment.