Skip to content

Commit

Permalink
random
Browse files Browse the repository at this point in the history
  • Loading branch information
mosheavni committed Dec 19, 2024
1 parent d77be14 commit d93dd93
Show file tree
Hide file tree
Showing 14 changed files with 97 additions and 39 deletions.
31 changes: 16 additions & 15 deletions nvim/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" },
"CursorLineCurrentWindow": { "branch": "master", "commit": "b4eeea98b0d139772969fd243a8802a9883fd2a8" },
"LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
"SchemaStore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" },
"SchemaStore.nvim": { "branch": "main", "commit": "bb03860b59f17dfada46d6d9563c48b7b12fecaf" },
"auto-indent.nvim": { "branch": "main", "commit": "46801cf8857d42a20a73c40b0a5d3dfe8b2b6192" },
"blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" },
"blink.cmp": { "branch": "main", "commit": "b4c6fe6c3092043cc09a60230e91d02558be41f0" },
"carbon-now.nvim": { "branch": "main", "commit": "f13c3c611a6aa22cca028bfe2cec63c7f67f2c87" },
"cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
Expand All @@ -23,9 +23,9 @@
"copilot.lua": { "branch": "master", "commit": "d3783b9283a7c35940ed8d71549030d5f5f9f980" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"fzf-lua": { "branch": "main", "commit": "8330321fa135f7fa9e4855099026c4ad622a0c85" },
"fzf-lua": { "branch": "main", "commit": "29e8180cd395f4a2e8871ad45ef9767bbe8d381b" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"git-dev.nvim": { "branch": "master", "commit": "730e700bbe94083ce8ea2676934b5db43d32609f" },
"gitlinker.nvim": { "branch": "master", "commit": "df0c4e342742812186f87e32caf82b3e5e288a84" },
Expand All @@ -47,7 +47,6 @@
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
"mini.cursorword": { "branch": "main", "commit": "7d1b38a17834acbbc4feff8e42aedc4ed0c6ff06" },
"mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" },
"mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
"mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
"mini.notify": { "branch": "main", "commit": "a933dc637b84314976d6482449f9f51ecd02d2b3" },
"mini.operators": { "branch": "main", "commit": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888" },
Expand All @@ -56,35 +55,36 @@
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
"nginx.vim": { "branch": "master", "commit": "cffaec54f0c7f9518de053634413a20e90eac825" },
"none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
"none-ls.nvim": { "branch": "main", "commit": "c279e541f73a2deea9deb5231b9c037678dd6353" },
"none-ls.nvim": { "branch": "main", "commit": "40dc2e983560acaea29d6312b33fafba37b0c272" },
"nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
"nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" },
"nvim-cmp": { "branch": "main", "commit": "98e8b9d593a5547c126a39212d6f5e954a2d85dd" },
"nvim-dap": { "branch": "master", "commit": "567da83810dd9da32f9414d941bc6848715fc102" },
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
"nvim-hlslens": { "branch": "main", "commit": "0bd7ddb0aecf095055e9cb6eef0c25c70fb69cfc" },
"nvim-lspconfig": { "branch": "master", "commit": "ae8a01bb40848490548e5d07b97ed972ed43c2f9" },
"nvim-lspconfig": { "branch": "master", "commit": "9f2c279cf9abe584f03bfeb37c6658d68e3ff49d" },
"nvim-lua-gf": { "branch": "main", "commit": "ca712497b2bab6351518917be219e9bfd8d63e4f" },
"nvim-luaref": { "branch": "main", "commit": "9cd3ed50d5752ffd56d88dd9e395ddd3dc2c7127" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-pqf": { "branch": "main", "commit": "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6" },
"nvim-tree.lua": { "branch": "master", "commit": "f7b76cd1a75615c8d6254fc58bedd2a7304eb7d8" },
"nvim-treesitter": { "branch": "master", "commit": "7fee2c55e0ba1a6307a80eee7fab84533e5721e9" },
"nvim-treesitter": { "branch": "master", "commit": "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f" },
"nvim-treesitter-context": { "branch": "master", "commit": "8fd989b6b457a448606b4a2e51f9161700f609a7" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-ufo": { "branch": "main", "commit": "95cbe2e99901135704aabdc8732d722cf68b12c9" },
"oklch-color-picker.nvim": { "branch": "master", "commit": "c21f036d2f81154c674cfface77aa6a6d276a855" },
"nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" },
"nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" },
"oklch-color-picker.nvim": { "branch": "master", "commit": "8fbce7d8ef230b69f8207ea9dd82ddc8dee8c3bf" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"profile.nvim": { "branch": "master", "commit": "d57df512bdade4c7a04a1bb6c89c8b54c5dce52a" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"rose-pine": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },
"snacks.nvim": { "branch": "main", "commit": "b90e8c4c15a78083f8be86be271ae69a60f425d8" },
"sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
"snacks.nvim": { "branch": "main", "commit": "9563bb1ffc890abf35341561ea2362b9ac51da04" },
"sqlite.lua": { "branch": "master", "commit": "cf482586c4f24e197375235a6e310b9b9e80ba83" },
"statuscol.nvim": { "branch": "0.10", "commit": "b0de00dfcf583bdd94284d844aac1b134d47c578" },
"switch.vim": { "branch": "main", "commit": "21defb202ebb8406b8ed63183a43ea026f2645b3" },
"template-string.nvim": { "branch": "main", "commit": "419bfb2e4d5f0e6ddd0d4435f85b69da0d88d524" },
Expand All @@ -101,13 +101,14 @@
"vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
"vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
"vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" },
"vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" },
"vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" },
"vim-kubernetes": { "branch": "master", "commit": "f477818c30efe4914e9a047ba1105b524d78e1b5" },
"vim-lister": { "branch": "master", "commit": "ec903e615f867f910cd8adc73f5906d521f3f214" },
"vim-matchup": { "branch": "master", "commit": "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7" },
"vim-matchup": { "branch": "master", "commit": "aca23ce53ebfe34e02c4fe07e29e9133a2026481" },
"vim-sh-indent": { "branch": "master", "commit": "4a3ef08bbf3a2ddacd6d80ef732726a59d9012f9" },
"vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
"vim-swap": { "branch": "master", "commit": "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83" },
"wezterm-types": { "branch": "main", "commit": "1518752906ba3fac0060d9efab6e4d3ec15d4b5a" },
"winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" },
"yaml-companion.nvim": { "branch": "main", "commit": "8088feaaaa6c13895afe4615c6a9cc69206162c3" },
"yaml.nvim": { "branch": "main", "commit": "1c1096a0b4b2cc31ca7cf430570911faaeca02c2" },
Expand Down
8 changes: 7 additions & 1 deletion nvim/.config/nvim/lua/plugins/blink.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,13 @@ return {
---@type blink.cmp.Config
opts = {
fuzzy = {
sorts = { 'score', require 'cmp_tabnine.compare', 'sort_text' },
sorts = {
'score',
function()
require 'cmp_tabnine.compare'
end,
'sort_text',
},
},

appearance = {
Expand Down
1 change: 1 addition & 0 deletions nvim/.config/nvim/lua/plugins/fzf.lua
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ return {
cmd = 'FzfLua',
config = function()
require('fzf-lua').setup {
'default-title',
previewers = {
builtin = {
extensions = {
Expand Down
4 changes: 4 additions & 0 deletions nvim/.config/nvim/lua/plugins/look-and-feel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ local M = {
-----------
-- other --
-----------
{
'nvim-tree/nvim-web-devicons',
lazy = true,
},
{
'eero-lehtinen/oklch-color-picker.nvim',
opts = {
Expand Down
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/plugins/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ M.config = function()
{
function()
local location = navic.get_location()
return navic.is_available() and location ~= '' and location or '󰊕'
return navic.is_available() and location ~= '' and location or vim.fn.fnamemodify(vim.fn.getcwd(), ':~')
end,
color = { fg = colors.aqua },
},
Expand Down
13 changes: 1 addition & 12 deletions nvim/.config/nvim/lua/plugins/mini.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,6 @@ local M = {
]]
end,
},
{
the_king .. 'icons',
lazy = true,
opts = {},
init = function()
package.preload['nvim-web-devicons'] = function()
require('mini.icons').mock_nvim_web_devicons()
return package.loaded['nvim-web-devicons']
end
end,
},
{
the_king .. 'hipatterns',
version = false,
Expand All @@ -86,7 +75,7 @@ local M = {
lazy = false,
keys = {
{ '<leader>x', '<cmd>lua require("mini.notify").clear()<cr>', { silent = true, desc = 'Dismiss all notifications' } },
{ '<leader>n', '<cmd>lua require("mini.notify").show_history()<cr>', { silent = true, desc = 'Show notifications history' } },
{ '<leader>n', '<cmd>tabnew|lua require("mini.notify").show_history()<cr>', { silent = true, desc = 'Show notifications history' } },
},
init = function()
local mnotify = require 'mini.notify'
Expand Down
2 changes: 1 addition & 1 deletion nvim/.config/nvim/lua/user/git.lua
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ M.create_new_branch = function(branch_opts)
return
end
if not input:match '^[a-zA-Z0-9_-]+$' then
return vim.notify('Invalid branch name', vim.log.levels.ERROR)
return M.prnt('Invalid branch name', vim.log.levels.ERROR)
end
run_git({ 'checkout', '-b', input }, 'Creating new branch: ' .. input)
end)
Expand Down
8 changes: 2 additions & 6 deletions nvim/.config/nvim/lua/user/lsp/yaml.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
local M = {
k8s_schemas = {
{
name = 'Kubernetes 1.27.12',
uri = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.27.12-standalone-strict/all.json',
},
{
name = 'Kubernetes 1.26.14',
uri = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.26.14-standalone-strict/all.json',
name = 'Kubernetes 1.29.9',
uri = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.29.9-standalone-strict/all.json',
},
},
all_schemas = {},
Expand Down
3 changes: 3 additions & 0 deletions starship/.config/starship.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ disabled = true

[battery]
disabled = false

[lua]
disabled = true
2 changes: 1 addition & 1 deletion wezterm/.wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ config.colors = {
config.window_decorations = 'INTEGRATED_BUTTONS|RESIZE'
config.inactive_pane_hsb = {
saturation = 0.4,
brightness = 0.5,
brightness = 0.7,
}
config.window_padding = {
left = 0,
Expand Down
2 changes: 1 addition & 1 deletion zsh/.zsh_plugins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ mattmc3/ez-compinit

# completions
zsh-users/zsh-completions kind:fpath path:src
RobSis/zsh-completion-generator kind:defer

loiccoyle/zsh-github-copilot
ohmyzsh/ohmyzsh path:lib/key-bindings.zsh
zsh-users/zsh-history-substring-search
peterhurford/git-it-on.zsh
hlissner/zsh-autopair
agkozak/zhooks
RobSis/zsh-completion-generator

# deferred
zsh-users/zsh-autosuggestions kind:defer
Expand Down
7 changes: 6 additions & 1 deletion zsh/zsh.d/aliases.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,15 @@ alias zshrc='${=EDITOR} ${ZDOTDIR:-$HOME}/.zshrc'
#------------------------------------------------------------------------------
alias tf='terraform'
alias tg='terragrunt'
alias git_current_branch='git branch --show-current'
alias gb='git for-each-ref --sort=-committerdate --format="%(refname:short)" | grep -n . | sed "s?origin/??g" | sort -t: -k2 -u | sort -n | cut -d: -f2 | fzf | xargs git checkout'
alias update-nvim-nightly='asdf uninstall neovim nightly && asdf install neovim nightly'

#------------------------------------------------------------------------------
# Git
#------------------------------------------------------------------------------
alias gst='git status'
alias git_current_branch='git branch --show-current'

#------------------------------------------------------------------------------
# Network & System Utils
#------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions zsh/zsh.d/completions.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ zstyle ':completion:*:*:*:*:*' menu select
zstyle ':completion:*' completer _complete _prefix _match _approximate
zstyle ':completion:*' matcher-list 'r:[[:ascii:]]||[[:ascii:]]=** r:|=* m:{a-z\-}={A-Z\_}'
zstyle ':completion:*:approximate:*' max-errors 3 numeric
zstyle :plugin:zsh-completion-generator programs ggrep kubedebug docker_copy_between_regions ab

# Initialize completion system
autoload -U +X bashcompinit && bashcompinit
Expand Down
52 changes: 52 additions & 0 deletions zsh/zsh.d/fzf.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
function fzf-rm() {
if [[ "$#" -eq 0 ]]; then
local files
files=$(find . -maxdepth 1 -type f | fzf --multi)
echo $files | xargs -I '{}' rm {} #we use xargs to capture filenames with spaces in them properly
else
command rm "$@"
fi
}

# Man without options will use fzf to select a page
function fzf-man() {
MAN="/usr/bin/man"
if [ -n "$1" ]; then
$MAN "$@"
return $?
else
$MAN -k . | fzf --reverse --preview="echo {1,2} | sed 's/ (/./' | sed -E 's/\)\s*$//' | xargs $MAN" | awk '{print $1 "." $2}' | tr -d '()' | xargs -r $MAN
return $?
fi
}

function fzf-eval() {
echo | fzf -q "$*" --preview-window=up:99% --preview="eval {q}"
}

function fzf-aliases-functions() {
CMD=$(
(
(alias)
(functions | grep "()" | cut -d ' ' -f1 | grep -v "^_")
) | fzf | cut -d '=' -f1
)

eval $CMD
}

fzf-git-status() {
git rev-parse --git-dir >/dev/null 2>&1 || {
echo "You are not in a git repository" && return
}
local selected
selected=$(git -c color.status=always status --short |
fzf --height 50% "$@" --border -m --ansi --nth 2..,.. \
--preview '(git diff --color=always -- {-1} | sed 1,4d; cat {-1}) | head -500' |
cut -c4- | sed 's/.* -> //')
if [[ $selected ]]; then
for prog in $(echo $selected); do
$EDITOR $prog
done
fi
}

0 comments on commit d93dd93

Please sign in to comment.