Steffen Rademacker 4 weeks ago
parent 9c1f253e3d
commit ebec8a93de

@ -1,6 +1,5 @@
{
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"CopilotChat.nvim": { "branch": "canary", "commit": "b70d043e8ddf8e67f9308c0f444223a0708d985c" },
"Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
@ -9,8 +8,6 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
"codeium.nvim": { "branch": "main", "commit": "937667b2cadc7905e6b9ba18ecf84694cf227567" },
"copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
"copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
"gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
@ -23,24 +20,22 @@
"nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "46ce5fd8c081f179a509da423077f8372e63ffc4" },
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-lspconfig": { "branch": "master", "commit": "b064131428f6bbbbc905f4451ba6779fda334a3a" },
"nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"nvim-treesitter": { "branch": "master", "commit": "b9002f6fe679e2b8025a46116081c0da629a6b8c" },
"nvim-treesitter": { "branch": "master", "commit": "1fbc25fc111cf5c7e73819657c8968dc5fa302ad" },
"nvim-treesitter-pairs": { "branch": "master", "commit": "f8c195d4d8464cba6971bf8de2d6a5c8c109b37a" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
"nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" },
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
"nvim-web-devicons": { "branch": "master", "commit": "31bd21ac46b2b6039aa0b856ca02b018cf549ef7" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"telescope.nvim": { "branch": "master", "commit": "927c10f748e49c543b2d544c321a1245302ff324" },
"telescope.nvim": { "branch": "master", "commit": "b5fd7f7ae0ea4537511077ed8ef4a6021cedba2f" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"treesj": { "branch": "main", "commit": "0d81326b5afd36babe7dd480aabbb0b05f33e688" },
"trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
"which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" },
"yazi.nvim": { "branch": "main", "commit": "ac97d7c5e47490ecd179647bc0d0ea04c9ce3329" },
"which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },
"yazi.nvim": { "branch": "main", "commit": "813b0665e6298d3fbb29b95c4546fefecff276fd" },
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
}

@ -1,14 +1,5 @@
return {
{ 'Exafunction/codeium.nvim', config = true },
{ 'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary', config = true },
{ 'zbirenbaum/copilot-cmp', config = true },
{ 'zbirenbaum/copilot.lua',
opts = {
-- we are using copilot-cmp for everything
suggestion = { enabled = false },
panel = { enabled = false },
},
},
{ 'hrsh7th/nvim-cmp',
version = false,
@ -27,10 +18,9 @@ return {
cmp.setup({
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'path' },
{ name = 'copilot' },
{ name = 'codeium' },
{ name = 'buffer',
{ name = 'path' },
option = {
get_bufnrs = function()
return vim.api.nvim_list_bufs()
@ -53,7 +43,6 @@ return {
formatting = {
format = function(entry, vim_item)
vim_item.menu = ({
copilot = '[Copilot]',
codeium = '[Codeium]',
nvim_lsp = '[LSP]',
buffer = '[Buffer]',

@ -24,7 +24,7 @@ return {
{ '<right>', '<cmd>bnext<cr>', desc = 'buffer navigation with arrow keys' },
{ '<up>', '<cmd>bfirst<cr>', desc = 'buffer navigation with arrow keys' },
{ '-', '<cmd>Yazi<cr>', desc = 'Open file browser' },
{ '-', '<cmd>Yazi<cr>', desc = 'Open yazi file browser' },
{ ';', ':', desc = 'Colon with semicolon' },
{ 'j', 'gj', desc = 'j and k with wrapped lines' },
{ 'k', 'gk', desc = 'j and k with wrapped lines' },

@ -1,19 +1,12 @@
return {
{ 'OXY2DEV/markview.nvim', config = true, lazy = false },
{ 'lewis6991/gitsigns.nvim', config = true },
{ 'folke/todo-comments.nvim', config = true },
{ 'kevinhwang91/nvim-bqf', config = true },
{ 'lewis6991/gitsigns.nvim', config = true },
{ 'norcalli/nvim-colorizer.lua', config = true },
{ 'nvim-pack/nvim-spectre', config = true, },
{ 'folke/twilight.nvim', config = true },
{ 'folke/trouble.nvim', config = true },
{ 'folke/todo-comments.nvim', config = true },
{ 'norcalli/nvim-colorizer.lua',
opts = {
css = { css = true },
scss = { css = true },
json = { css = true},
javascript = { css = true },
},
},
{ 'folke/zen-mode.nvim',
opts = {
window = {
@ -35,9 +28,4 @@ return {
},
},
},
{ 'rcarriga/nvim-notify',
config = function()
vim.notify = require('notify')
end
},
}

@ -1,9 +1,6 @@
return {
{ 'hrsh7th/vim-vsnip',
dependencies = {
'hrsh7th/cmp-vsnip',
'rafamadriz/friendly-snippets',
},
dependencies = 'rafamadriz/friendly-snippets',
config = function ()
vim.g.vsnip_snippet_dirs = {
os.getenv('HOME') .. '/.local/share/nvim/lazy/friendly-snippets/snippets/',

@ -2,9 +2,7 @@ return {
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
{ 'nvim-telescope/telescope.nvim',
version = false,
dependencies = {
'nvim-telescope/telescope-fzf-native.nvim',
},
dependencies = 'nvim-telescope/telescope-fzf-native.nvim',
config = function()
require('telescope').setup({
extensions = {
@ -37,5 +35,5 @@ return {
open_for_directories = true,
yazi_floating_window_border = 'none',
},
}
},
}

@ -83,6 +83,7 @@
[delta]
blame-code-style = syntax
blame-format = "{author:>18} ({commit:>8}) {timestamp:<13} "
blame-palette = "#282828"
commit-decoration-style = normal box
dark = true
file-added-label = [+]

@ -16,8 +16,8 @@ alias vd='$EDITOR -d'
alias vim=$EDITOR
# helpers
alias up='n lts && topgrade && npm-check -gu && vup && brew cleanup && brew autoremove'
alias vup='nvim --headless "+TSUpdateSync" +qa && nvim --headless "+Lazy! sync" +qa && nvim --headless "+MasonUpdate" +qa'
alias up='n lts && topgrade && npm-check -gu && vup && brew cleanup && brew autoremove'
# work / dev related
alias nb='npm run build'

@ -21,6 +21,7 @@ export HOMEBREW_CASK_OPTS="--appdir=/Applications"
export HOMEBREW_NO_ENV_HINTS=true
export FZF_DEFAULT_COMMAND="rg --files --hidden --follow --glob '!.git'"
export RIPGREP_CONFIG_PATH="$HOME/.ripgreprc"
export N_PREFIX=$HOME/.n
# Paths
export XDG_CONFIG_HOME="$HOME/.config"
@ -28,4 +29,4 @@ export MANPATH=/opt/homebrew/share/man:$MANPATH
export PATH=/opt/homebrew/bin:$PATH
export PATH=/opt/homebrew/sbin:$PATH
export PATH=/opt/homebrew/opt/curl/bin:$PATH
export PATH=/.local/bin:$PATH
export PATH=$N_PREFIX/bin:$PATH

@ -31,4 +31,3 @@ source ~/.zsh/aliases.sh
source <(fzf --zsh)
source <(starship init zsh)
source <(zoxide init zsh)
. /opt/homebrew/opt/asdf/libexec/asdf.sh

@ -1,7 +1,6 @@
tap "homebrew/services"
tap "buo/cask-upgrade"
brew "asdf"
brew "bat"
brew "btop"
brew "coreutils"
@ -22,6 +21,7 @@ brew "lazygit"
brew "mpv"
brew "msmtp"
brew "mu"
brew "n"
brew "neomutt"
brew "neovim"
brew "ocrmypdf"

@ -49,8 +49,7 @@ exit
# ------------------------------------------------------------- #
# node, global tools and custom scripts
asdf install nodejs latest
asdf global nodejs latest
n lts
npm install -g fkill-cli neovim npm npm-check trash-cli yarn
cd ~/Dotfiles/scripts/out && npm i -g
cd ~/Dotfiles/scripts/gallery && npm i -g

Loading…
Cancel
Save