Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusandre committed Apr 28, 2024
1 parent 4a7d876 commit 909eae8
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 176 deletions.
1 change: 1 addition & 0 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ brew "glow"
brew "gnu-sed"
brew "go"
brew "gopls"
brew "gron"
brew "helix"
brew "jj"
brew "jq"
Expand Down
161 changes: 105 additions & 56 deletions Brewfile.lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" },
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
"mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" },
Expand All @@ -25,16 +25,16 @@
"nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
"nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
"nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
"nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" },
"nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
"nvim-spectre": { "branch": "master", "commit": "026394a8458d62c6b7b305c076ce675420dbaa4c" },
"nvim-treesitter": { "branch": "master", "commit": "876111c8df409a6ad17ba1ff6e1a90bac22b4a42" },
"nvim-treesitter": { "branch": "master", "commit": "0883ff05655117a3fc79ab295a640c4984cfd415" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
"nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" },
"obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" },
"oil.nvim": { "branch": "master", "commit": "f3a31eba24587bc038592103d8f7e64648292115" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" },
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
"poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/plugins/colors.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ return {
'folke/tokyonight.nvim',
lazy = false,
priority = 1000,
config = function() vim.cmd([[colorscheme tokyonight]]) end,
config = function() vim.cmd([[colorscheme tokyonight-moon]]) end,
},
{
'olivercederborg/poimandres.nvim',
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/plugins/gitsigns.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ return {
-- stylua: ignore end
},
opts = {
signcolumn = false,
signcolumn = true,
numhl = true,
signs = {
add = { text = '' },
Expand Down
3 changes: 2 additions & 1 deletion nvim/lua/plugins/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ return {
vim.keymap.set('n', '<leader>fg', builtin.git_status, { desc = 'Files (changed)' })
vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Help' })
vim.keymap.set('n', '<leader>fk', builtin.keymaps, { desc = 'Keymaps' })
vim.keymap.set('n', '<leader>fo', builtin.oldfiles, { desc = 'Files (old)' })
vim.keymap.set('n', '<leader>fO', builtin.oldfiles, { desc = 'Files (old)' })
vim.keymap.set('n', '<leader>fo', function() builtin.oldfiles({ only_cwd = true }) end, { desc = 'Files (old)' })
vim.keymap.set('n', '<leader>fr', builtin.resume, { desc = 'Resume' })
vim.keymap.set('n', '<leader>ft', builtin.builtin, { desc = 'Builtins' })
vim.keymap.set('n', '<leader>fz', builtin.spell_suggest, { desc = 'Spelling' })
Expand Down
5 changes: 3 additions & 2 deletions wezterm/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ local config = wezterm.config_builder()
config.term = 'wezterm'

-- Text
-- config.font = wezterm.font('IBM Plex Mono')
config.font = wezterm.font('JetBrains Mono')
-- config.font = wezterm.font('Berkeley Mono')
-- config.font = wezterm.font('Input Mono Narrow')
Expand All @@ -19,15 +20,15 @@ config.set_environment_variables = {

-- Colors
-- config.color_scheme = 'nightfox'
config.color_scheme = 'tokyonight'
config.color_scheme = 'tokyonight_moon'
-- config.color_scheme = 'Poimandres'
-- config.color_scheme = 'Molokai (Gogh)'

-- UI
config.enable_scroll_bar = false
config.tab_bar_at_bottom = true
config.use_fancy_tab_bar = false
-- config.force_reverse_video_cursor = true
config.force_reverse_video_cursor = true

config.window_padding = {
left = 0,
Expand Down
60 changes: 0 additions & 60 deletions zed/keymap.json
Original file line number Diff line number Diff line change
@@ -1,60 +0,0 @@
[
{
"context": "Editor && VimControl && !VimWaiting && !menu",
"bindings": {
"ctrl-w z": "workspace::ToggleZoom",
"ctrl-w t": "terminal_panel::ToggleFocus",
"ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
"ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
"ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
"ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
"1 g shift-d": "editor::GoToImplementation",
"] d": "editor::GoToDiagnostic",
"[ d": "editor::GoToPrevDiagnostic",
"g shift-r": "editor::FindAllReferences",
"shift-k": "editor::Hover",
"g a": "editor::ToggleCodeActions",
"g r": "editor::Rename",
"j": ["vim::Down", { "displayLines": true }],
"k": ["vim::Up", { "displayLines": true }]
}
},
{
"context": "Editor && vim_mode == normal && !VimWaiting && !VimCount",
"bindings": {
"0": [
"vim::StartOfLine",
{
"displayLines": true
}
],
"$": [
"vim::EndOfLine",
{
"displayLines": true
}
]
}
},
{
"context": "Editor && vim_mode == normal",
"bindings": {
"g c c": "editor::ToggleComments"
}
},
{
"context": "Terminal",
"bindings": {
"ctrl-u": "terminal::Clear"
}
},
{
"context": "Dock",
"bindings": {
"ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
"ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
"ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
"ctrl-j": ["workspace::ActivatePaneInDirection", "Down"]
}
}
]
51 changes: 0 additions & 51 deletions zed/settings.json
Original file line number Diff line number Diff line change
@@ -1,51 +0,0 @@
// Zed settings
//
// For information on how to configure Zed, see the Zed
// documentation: https://zed.dev/docs/configuring-zed
//
// To see all of Zed's default settings without changing your
// custom settings, run the `open default settings` command
// from the command palette or from `Zed` application menu.
{
"base_keymap": "VSCode",
"buffer_font_family": "JetBrains Mono",
"buffer_font_size": 13,
"cursor_blink": false,
"format_on_save": "on",
"inlay_hints": { "enabled": true },
"project_panel": { "dock": "left" },
"scrollbar": { "show": "always" },
"show_whitespaces": "all",
"soft_wrap": "editor_width",
"terminal": { "dock": "bottom", "blinking": "on" },
"theme": "Atelier Sulphurpool Light",
"vim_mode": true,
"formatter": "language_server",
"languages": {
"TypeScript": {
"formatter": "language_server",
"code_actions_on_format": {
"source.eslint.fixall": true
}
}
},
"lsp": {
"rust_analyzer": {
"initialization_options": {
"checkOnSave": {
"command": "clippy"
},
"inlayHints": {
"maxLength": null,
"lifetimeElisionHints": {
"useParameterNames": true,
"enable": "skip_trivial"
},
"closureReturnTypeHints": {
"enable": "always"
}
}
}
}
}
}

0 comments on commit 909eae8

Please sign in to comment.