Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
jmbuhr committed Feb 14, 2025
1 parent 999d17a commit be87280
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 43 deletions.
12 changes: 11 additions & 1 deletion ftplugin/python.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
vim.b.slime_cell_delimiter = '#\\s\\=%%'

require("otter").activate()

local start_hamilton_lsp = function()
local client = vim.lsp.start_client({
cmd = { 'hamilton-lsp' },
filetypes = { 'python' },
on_attach = require('config.lsp').on_attach,
root_dir = require('lspconfig').util.root_pattern('.git', 'setup.py'),
})
end

start_hamilton_lsp()
2 changes: 1 addition & 1 deletion init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ require 'config.lazy'
require 'config.autocommands'
-- require 'config.redir'


vim.cmd.colorscheme 'alabaster'
34 changes: 14 additions & 20 deletions lua/plugins/colorthemes.lua
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
return {
{ 'shaunsingh/nord.nvim', enabled = false, lazy = false, priority = 1000 },
{ 'folke/tokyonight.nvim', enabled = false, lazy = false, priority = 1000 },
{ 'shaunsingh/nord.nvim', enabled = false, lazy = false, priority = 1000 },
{ 'folke/tokyonight.nvim', enabled = false, lazy = false, priority = 1000 },
{ 'EdenEast/nightfox.nvim', enabled = false, lazy = false, priority = 1000 },
{ 'p00f/alabaster.nvim', enabled = true, lazy = false, priority = 1000 },
{
'catppuccin/nvim',
name = 'catppuccin',
enabled = false,
lazy = false, -- make sure we load this during startup if it is your main colorscheme
lazy = false, -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins
config = function()
-- set colorscheme and overwrite highlights
vim.cmd.colorscheme 'catppuccin-mocha'
local colors = require 'catppuccin.palettes.mocha'
vim.api.nvim_set_hl(0, 'Tabline', { fg = colors.green, bg = colors.mantle })
vim.api.nvim_set_hl(0, 'TermCursor', { fg = '#A6E3A1', bg = '#A6E3A1' })
end,
},

{
Expand Down Expand Up @@ -73,20 +67,20 @@ return {
opts = {
filetypes = { '*' },
user_default_options = {
RGB = true, -- #RGB hex codes
RRGGBB = true, -- #RRGGBB hex codes
names = true, -- "Name" codes like Blue or blue
RRGGBBAA = true, -- #RRGGBBAA hex codes
AARRGGBB = false, -- 0xAARRGGBB hex codes
rgb_fn = false, -- CSS rgb() and rgba() functions
hsl_fn = false, -- CSS hsl() and hsla() functions
css = false, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
css_fn = false, -- Enable all CSS *functions*: rgb_fn, hsl_fn
RGB = true, -- #RGB hex codes
RRGGBB = true, -- #RRGGBB hex codes
names = true, -- "Name" codes like Blue or blue
RRGGBBAA = true, -- #RRGGBBAA hex codes
AARRGGBB = false, -- 0xAARRGGBB hex codes
rgb_fn = false, -- CSS rgb() and rgba() functions
hsl_fn = false, -- CSS hsl() and hsla() functions
css = false, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
css_fn = false, -- Enable all CSS *functions*: rgb_fn, hsl_fn
-- Available modes for `mode`: foreground, background, virtualtext
mode = 'background', -- Set the display mode.
-- Available methods are false / true / "normal" / "lsp" / "both"
-- True is same as normal
tailwind = false, -- Enable tailwind colors
tailwind = false, -- Enable tailwind colors
-- parsers can contain values used in |user_default_options|
sass = { enable = false, parsers = { 'css' } }, -- Enable sass colors
virtualtext = '',
Expand Down
1 change: 1 addition & 0 deletions lua/plugins/common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ return {
quickfile = { enabled = true },
statuscolumn = { enabled = false },
words = { enabled = false },
picker = {}
},
},
}
9 changes: 4 additions & 5 deletions lua/plugins/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ return {
{ -- new completion plugin
'saghen/blink.cmp',
enabled = true,
version = 'v0.*',
dev = false,
-- version = '*',
dev = true,
-- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-- build = 'cargo build --release',
lazy = false, -- lazy loading handled internally
-- optional: provides snippets for the snippet source
build = 'cargo build --release',
lazy = false,
dependencies = {
{ 'rafamadriz/friendly-snippets' },
{ 'moyiz/blink-emoji.nvim' },
Expand Down
4 changes: 2 additions & 2 deletions lua/plugins/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ return {
},
opts = {
buffers = {
-- set_filetype = true,
-- write_to_disk = true
set_filetype = true,
write_to_disk = true
}
}
},
Expand Down
8 changes: 0 additions & 8 deletions lua/plugins/notes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ return {
{
'epwalsh/obsidian.nvim',
enabled = true,
ft = 'markdown',
event = {
-- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
-- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/**.md"
'BufReadPre ' .. vim.fn.expand '~/notes/**/*.md',
'BufNewFile ' .. vim.fn.expand '~/notes/**/*.md',
},
dependencies = {
'nvim-lua/plenary.nvim',
},
Expand All @@ -43,7 +36,6 @@ return {
{ '<leader>ns', ':ObsidianSearch<cr>', desc = 'obsidian [s]earch' },
{ '<leader>no', ':ObsidianQuickSwitch<cr>', desc = 'obsidian [o]pen quickswitch' },
{ '<leader>nO', ':ObsidianOpen<cr>', desc = 'obsidian [O]pen in app' },
-- { '<leader>nO', ':ObsidianToggleCheckbox<cr>', desc = 'obsidian toggle checkbox' },
},
config = function()
---@diagnostic disable-next-line: missing-fields
Expand Down
16 changes: 10 additions & 6 deletions lua/plugins/quarto.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ return {
'quarto-dev/quarto-nvim',
dev = false,
opts = {
lspFeatures = {
enabled = true,
chunks = "all",
},
codeRunner = {
enabled = true,
default_method = "slime"
Expand Down Expand Up @@ -138,14 +142,14 @@ return {
end,
config = function()
local init = function()
local quarto_cfg = require'quarto.config'.config
local quarto_cfg = require 'quarto.config'.config
quarto_cfg.codeRunner.default_method = "molten"
vim.cmd[[MoltenInit]]
vim.cmd [[MoltenInit]]
end
local deinit = function()
local quarto_cfg = require'quarto.config'.config
local quarto_cfg = require 'quarto.config'.config
quarto_cfg.codeRunner.default_method = "slime"
vim.cmd[[MoltenDeinit]]
vim.cmd [[MoltenDeinit]]
end
vim.keymap.set("n", "<localleader>mi", init,
{ silent = true, desc = "Initialize molten" })
Expand All @@ -156,9 +160,9 @@ return {
vim.keymap.set("n", "<localleader>mb", ":MoltenOpenInBrowser<CR>",
{ silent = true, desc = "molten open in browser" })
vim.keymap.set("n", "<localleader>mh", ":MoltenHideOutput<CR>",
{ silent = true, desc = "hide output" })
{ silent = true, desc = "hide output" })
vim.keymap.set("n", "<localleader>ms", ":noautocmd MoltenEnterOutput<CR>",
{ silent = true, desc = "show/enter output" })
{ silent = true, desc = "show/enter output" })
end,
},
}
7 changes: 7 additions & 0 deletions lua/plugins/ui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,13 @@ return {
{
"NStefan002/screenkey.nvim",
lazy = false,
opts = {
win_opts = {
row = 1,
col = vim.o.columns - 1,
anchor = "NE",
}
}
},

{ -- filetree
Expand Down

0 comments on commit be87280

Please sign in to comment.