mirror of
https://github.com/js0ny/dotfiles.git
synced 2025-12-21 00:33:00 +00:00
Minor fixes
This commit is contained in:
parent
c5292ac9de
commit
f42ac2a6a3
17 changed files with 191 additions and 50 deletions
17
.gitignore
vendored
17
.gitignore
vendored
|
|
@ -18,24 +18,9 @@ test.*
|
||||||
# Utils
|
# Utils
|
||||||
xdg-ninja/
|
xdg-ninja/
|
||||||
|
|
||||||
# nvim config cache
|
|
||||||
tools/nvim/tt.*
|
|
||||||
tools/nvim/.tests
|
|
||||||
tools/nvim/doc/tags
|
|
||||||
tools/nvim/debug
|
|
||||||
tools/nvim/.repro
|
|
||||||
tools/nvim/foo.*
|
|
||||||
tools/nvim/*.log
|
|
||||||
tools/nvim/data
|
|
||||||
tools/nvim/lazy-lock.json
|
|
||||||
tools/nvim/lazyvim.json
|
|
||||||
tools/nvim/lua/plugins/obsidian.lua
|
|
||||||
|
|
||||||
# Undone
|
# Undone
|
||||||
# Windows PowerToys
|
# Windows PowerToys
|
||||||
PowerToys/
|
PowerToys/
|
||||||
# Just Script
|
|
||||||
Justfile
|
|
||||||
# Nushell
|
# Nushell
|
||||||
tools/nushell/
|
tools/nushell/
|
||||||
# fzf
|
# fzf
|
||||||
|
|
@ -50,4 +35,4 @@ platforms/win/komorebi/applications.json
|
||||||
|
|
||||||
gitconfig
|
gitconfig
|
||||||
|
|
||||||
*.exe
|
*.exe
|
||||||
|
|
|
||||||
9
Justfile
Normal file
9
Justfile
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
set shell := ["pwsh", "-c"]
|
||||||
|
|
||||||
|
pull:
|
||||||
|
git pull github master
|
||||||
|
git pull codeberg master
|
||||||
|
|
||||||
|
push:
|
||||||
|
git push github master
|
||||||
|
git push codeberg master
|
||||||
|
|
@ -84,6 +84,7 @@ nmap F <Plug>(sneak-S)
|
||||||
|
|
||||||
"" Miscs ""
|
"" Miscs ""
|
||||||
nnoremap <leader>: :action GotoAction<CR>
|
nnoremap <leader>: :action GotoAction<CR>
|
||||||
|
nnoremap <leader><leader> :action GotoFile<CR>
|
||||||
|
|
||||||
"" AI Related <leader>a + ""
|
"" AI Related <leader>a + ""
|
||||||
nnoremap <leader>ac :action copilot.chat.show<CR>
|
nnoremap <leader>ac :action copilot.chat.show<CR>
|
||||||
|
|
|
||||||
|
|
@ -24,14 +24,15 @@ just build
|
||||||
|
|
||||||
Or use the minimal setup, by changing `glzr\zebar\settings.json`: `startupConfigs.path` to `minimal/bar.zebar.json`.
|
Or use the minimal setup, by changing `glzr\zebar\settings.json`: `startupConfigs.path` to `minimal/bar.zebar.json`.
|
||||||
|
|
||||||
```json
|
```diff
|
||||||
{
|
{
|
||||||
"$schema": "https://github.com/glzr-io/zebar/raw/v2.4.0/resources/settings-schema.json",
|
"$schema": "https://github.com/glzr-io/zebar/raw/v2.4.0/resources/settings-schema.json",
|
||||||
"startupConfigs": [
|
"startupConfigs": [
|
||||||
{
|
{
|
||||||
"path": "minimal/bar.zebar.json",
|
- "path": "neobrutal/bar.zebar.json",
|
||||||
"preset": "default"
|
+ "path": "minimal/bar.zebar.json",
|
||||||
}
|
"preset": "default"
|
||||||
]
|
}
|
||||||
}
|
]
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@ Works for Windows, Linux and MacOS.
|
||||||
|
|
||||||
```
|
```
|
||||||
^
|
^
|
||||||
n
|
|
||||||
< h i >
|
|
||||||
e
|
e
|
||||||
|
< h i >
|
||||||
|
n
|
||||||
v
|
v
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -246,9 +246,6 @@ api.mapkey('S', 'Start/Stop Generating', function () {
|
||||||
var btn = document.querySelector('button.h-8:nth-child(2)');
|
var btn = document.querySelector('button.h-8:nth-child(2)');
|
||||||
btn.click();
|
btn.click();
|
||||||
}, { domain: /chatgpt.com/ });
|
}, { domain: /chatgpt.com/ });
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
api.mapkey('an', 'New Chat', function () {
|
api.mapkey('an', 'New Chat', function () {
|
||||||
var btn = document.querySelector('div.no-draggable:nth-child(3) > span:nth-child(1) > button:nth-child(1)')
|
var btn = document.querySelector('div.no-draggable:nth-child(3) > span:nth-child(1) > button:nth-child(1)')
|
||||||
btn.click();
|
btn.click();
|
||||||
|
|
@ -265,7 +262,6 @@ api.mapkey('as', 'Start/Stop Generating', function () {
|
||||||
// var btn = document.querySelector('#radix -\: r2i\:');
|
// var btn = document.querySelector('#radix -\: r2i\:');
|
||||||
// btn.click();
|
// btn.click();
|
||||||
//}, { domain: /chatgpt.com/ });
|
//}, { domain: /chatgpt.com/ });
|
||||||
>>>>>>> 9557dcb023a49b72674bff74180d1d4224b959e0
|
|
||||||
// perplexity.ai
|
// perplexity.ai
|
||||||
api.unmap('<Ctrl-i>', /perplexity.ai/);
|
api.unmap('<Ctrl-i>', /perplexity.ai/);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,7 @@ if command -v gem > /dev/null
|
||||||
set -gx PATH $dir $PATH
|
set -gx PATH $dir $PATH
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
set -gx PATH $HOME/.local/share/gem/ruby/3.3.0/bin $PATH
|
||||||
end
|
end
|
||||||
# Spacemacs
|
# Spacemacs
|
||||||
if command -v emacs > /dev/null
|
if command -v emacs > /dev/null
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,6 @@
|
||||||
# ln -sf $DOTFILES/tools/fish ~/.config/fish
|
# ln -sf $DOTFILES/tools/fish ~/.config/fish
|
||||||
|
|
||||||
if command -v starship > /dev/null
|
if command -v starship > /dev/null
|
||||||
set STARSHIP_CONFIG "~/.dotfiles/tools/starship/starship_fish.toml"
|
set -gx STARSHIP_CONFIG "~/.dotfiles/tools/starship/starship_fish.toml"
|
||||||
starship init fish | source
|
starship init fish | source
|
||||||
end
|
end
|
||||||
|
|
|
||||||
3
tools/nvim/.gitignore
vendored
3
tools/nvim/.gitignore
vendored
|
|
@ -1 +1,2 @@
|
||||||
lazy-lock.json
|
lazy-lock.json
|
||||||
|
./lua/config/keymaps/obsidian-nvim.lua
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,10 @@ opt.cursorline = true
|
||||||
opt.termguicolors = true
|
opt.termguicolors = true
|
||||||
|
|
||||||
-- Fold
|
-- Fold
|
||||||
opt.foldlevel = 99
|
|
||||||
opt.foldmethod = "expr"
|
opt.foldmethod = "expr"
|
||||||
|
opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||||
|
opt.foldlevel = 99
|
||||||
|
opt.foldlevelstart = 1
|
||||||
|
|
||||||
-- Statusline
|
-- Statusline
|
||||||
opt.laststatus = 0
|
opt.laststatus = 0
|
||||||
|
|
@ -50,3 +52,6 @@ opt.scrolloff = 5
|
||||||
opt.sidescrolloff = 10
|
opt.sidescrolloff = 10
|
||||||
|
|
||||||
opt.conceallevel = 2
|
opt.conceallevel = 2
|
||||||
|
|
||||||
|
vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
return {
|
return {
|
||||||
{ import = "plugins.mod.auto-session" },
|
{ import = "plugins.mod.auto-session" },
|
||||||
{ import = "plugins.mod.nvim-tree" },
|
{ import = "plugins.mod.nvim-tree" },
|
||||||
{ "nvim-telescope/telescope.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
|
{ import = "plugins.mod.telescope" },
|
||||||
{ import = "plugins.mod.projects" }
|
{ import = "plugins.mod.projects" }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,31 @@
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{ import = "plugins.mod.lspconfig" },
|
{ import = "plugins.mod.lspconfig" },
|
||||||
{ "MeanderingProgrammer/render-markdown.nvim" },
|
{
|
||||||
-- {
|
"NoahTheDuke/vim-just",
|
||||||
-- "OXY2DEV/markview.nvim",
|
ft = { "just" }
|
||||||
-- lazy = false, -- Recommended
|
},
|
||||||
-- -- ft = "markdown" -- If you decide to lazy-load anyway
|
{ import = "plugins.mod.render-markdown" },
|
||||||
--
|
-- { import = "plugins.mod.markview" },
|
||||||
-- dependencies = {
|
{
|
||||||
-- "nvim-treesitter/nvim-treesitter",
|
"lervag/vimtex",
|
||||||
-- "nvim-tree/nvim-web-devicons"
|
lazy = false, -- we don't want to lazy load VimTeX
|
||||||
-- }
|
-- tag = "v2.15", -- uncomment to pin to a specific release
|
||||||
-- },
|
init = function()
|
||||||
|
-- VimTeX configuration goes here, e.g.
|
||||||
|
vim.g.vimtex_view_method = "sioyek"
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"iurimateus/luasnip-latex-snippets.nvim",
|
||||||
|
-- vimtex isn't required if using treesitter
|
||||||
|
requires = { "L3MON4D3/LuaSnip", "lervag/vimtex" },
|
||||||
|
config = function()
|
||||||
|
require'luasnip-latex-snippets'.setup()
|
||||||
|
-- or setup({ use_treesitter = true })
|
||||||
|
require("luasnip").config.setup { enable_autosnippets = true }
|
||||||
|
end,
|
||||||
|
},
|
||||||
{ "williamboman/mason.nvim", config = true },
|
{ "williamboman/mason.nvim", config = true },
|
||||||
{
|
{
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
||||||
|
|
|
||||||
30
tools/nvim/lua/plugins/mod/markview.lua
Normal file
30
tools/nvim/lua/plugins/mod/markview.lua
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"OXY2DEV/markview.nvim",
|
||||||
|
lazy = false,
|
||||||
|
dependencies = {
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
local presets = require("markview.presets")
|
||||||
|
require("markview").setup({
|
||||||
|
checkboxes = presets.checkboxes.nerd,
|
||||||
|
headings = {
|
||||||
|
enable = true,
|
||||||
|
shift_width = 1,
|
||||||
|
heading_1 = {
|
||||||
|
style = "label",
|
||||||
|
hl = "MarkviewH1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
code_blocks = {
|
||||||
|
style = "language",
|
||||||
|
language_direction = "right",
|
||||||
|
hl = "MarkviewCode",
|
||||||
|
info_hl = "MarkviewCodeInfo"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,7 +3,7 @@ return {
|
||||||
run = ":TSUpdate",
|
run = ":TSUpdate",
|
||||||
config = function()
|
config = function()
|
||||||
require("nvim-treesitter.configs").setup({
|
require("nvim-treesitter.configs").setup({
|
||||||
ensure_installed = { "markdown", "markdown_inline" },
|
ensure_installed = { "markdown", "markdown_inline", "latex", "python"},
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = true },
|
indent = { enable = true },
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -21,12 +21,15 @@ return {
|
||||||
workspaces = {
|
workspaces = {
|
||||||
{
|
{
|
||||||
name = "personal",
|
name = "personal",
|
||||||
path = "~/Obsidian",
|
path = "~/winhome/Obsidian",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
completion = {
|
completion = {
|
||||||
nvim_cmp = true,
|
nvim_cmp = true,
|
||||||
min_chars = 2
|
min_chars = 2
|
||||||
|
},
|
||||||
|
ui = {
|
||||||
|
enable = false
|
||||||
}
|
}
|
||||||
-- see below for full list of options 👇
|
-- see below for full list of options 👇
|
||||||
},
|
},
|
||||||
|
|
|
||||||
74
tools/nvim/lua/plugins/mod/render-markdown.lua
Normal file
74
tools/nvim/lua/plugins/mod/render-markdown.lua
Normal file
|
|
@ -0,0 +1,74 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"MeanderingProgrammer/render-markdown.nvim",
|
||||||
|
lazy = false,
|
||||||
|
config = function()
|
||||||
|
require("render-markdown").setup({
|
||||||
|
render_modes = { "n", "c", "t" },
|
||||||
|
latex = {
|
||||||
|
enabled = true,
|
||||||
|
converter = "latex2text",
|
||||||
|
highlight = "RenderMarkdownMath",
|
||||||
|
top_pad = 0,
|
||||||
|
bottom_pad = 0,
|
||||||
|
},
|
||||||
|
heading = {
|
||||||
|
sign = false,
|
||||||
|
position = "inline",
|
||||||
|
width = "block",
|
||||||
|
left_margin = 0.5,
|
||||||
|
left_pad = 0.2,
|
||||||
|
right_pad = 0.2,
|
||||||
|
},
|
||||||
|
link = {
|
||||||
|
custom = {
|
||||||
|
python = { pattern = "%.py", icon = " " },
|
||||||
|
lua = { pattern = "%.lua", icon = " " },
|
||||||
|
markdown = { pattern = "%.md", icon = " " },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
bullet = {
|
||||||
|
icons = { " ", "●", "○", "◆", "◇" },
|
||||||
|
},
|
||||||
|
checkbox = {
|
||||||
|
checked = { scope_highlight = "@markup.strikethrough" },
|
||||||
|
unchecked = { scope_highlight = "@comment.todo" },
|
||||||
|
},
|
||||||
|
code = {
|
||||||
|
position = "right",
|
||||||
|
width = "block",
|
||||||
|
right_pad = 10,
|
||||||
|
},
|
||||||
|
callout = {
|
||||||
|
note = { raw = "[!NOTE]", rendered = " Note", highlight = "RenderMarkdownInfo" },
|
||||||
|
tip = { raw = "[!TIP]", rendered = " Tip", highlight = "RenderMarkdownSuccess" },
|
||||||
|
important = { raw = "[!IMPORTANT]", rendered = " Important", highlight = "RenderMarkdownHint" },
|
||||||
|
warning = { raw = "[!WARNING]", rendered = " Warning", highlight = "RenderMarkdownWarn" },
|
||||||
|
caution = { raw = "[!CAUTION]", rendered = " Caution", highlight = "RenderMarkdownError" },
|
||||||
|
abstract = { raw = "[!ABSTRACT]", rendered = " Abstract", highlight = "RenderMarkdownInfo" },
|
||||||
|
summary = { raw = "[!SUMMARY]", rendered = " Summary", highlight = "RenderMarkdownInfo" },
|
||||||
|
tldr = { raw = "[!TLDR]", rendered = " Tldr", highlight = "RenderMarkdownInfo" },
|
||||||
|
info = { raw = "[!INFO]", rendered = " Info", highlight = "RenderMarkdownInfo" },
|
||||||
|
todo = { raw = "[!TODO]", rendered = " Todo", highlight = "RenderMarkdownInfo" },
|
||||||
|
hint = { raw = "[!HINT]", rendered = " Hint", highlight = "RenderMarkdownSuccess" },
|
||||||
|
success = { raw = "[!SUCCESS]", rendered = " Success", highlight = "RenderMarkdownSuccess" },
|
||||||
|
check = { raw = "[!CHECK]", rendered = " Check", highlight = "RenderMarkdownSuccess" },
|
||||||
|
done = { raw = "[!DONE]", rendered = " Done", highlight = "RenderMarkdownSuccess" },
|
||||||
|
question = { raw = "[!QUESTION]", rendered = " Question", highlight = "RenderMarkdownWarn" },
|
||||||
|
help = { raw = "[!HELP]", rendered = " Help", highlight = "RenderMarkdownWarn" },
|
||||||
|
faq = { raw = "[!FAQ]", rendered = " Faq", highlight = "RenderMarkdownWarn" },
|
||||||
|
attention = { raw = "[!ATTENTION]", rendered = " Attention", highlight = "RenderMarkdownWarn" },
|
||||||
|
failure = { raw = "[!FAILURE]", rendered = " Failure", highlight = "RenderMarkdownError" },
|
||||||
|
fail = { raw = "[!FAIL]", rendered = " Fail", highlight = "RenderMarkdownError" },
|
||||||
|
missing = { raw = "[!MISSING]", rendered = " Missing", highlight = "RenderMarkdownError" },
|
||||||
|
danger = { raw = "[!DANGER]", rendered = " Danger", highlight = "RenderMarkdownError" },
|
||||||
|
error = { raw = "[!ERROR]", rendered = " Error", highlight = "RenderMarkdownError" },
|
||||||
|
bug = { raw = "[!BUG]", rendered = " Bug", highlight = "RenderMarkdownError" },
|
||||||
|
example = { raw = "[!EXAMPLE]", rendered = " Example", highlight = "RenderMarkdownHint" },
|
||||||
|
quote = { raw = "[!QUOTE]", rendered = " Quote", highlight = "RenderMarkdownQuote" },
|
||||||
|
cite = { raw = "[!CITE]", rendered = " Cite", highlight = "RenderMarkdownQuote" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
21
tools/nvim/lua/plugins/mod/telescope.lua
Normal file
21
tools/nvim/lua/plugins/mod/telescope.lua
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
return {
|
||||||
|
"nvim-telescope/telescope.nvim",
|
||||||
|
config = function ()
|
||||||
|
require("telescope").setup {
|
||||||
|
defaults = {
|
||||||
|
mappings = {
|
||||||
|
n = {
|
||||||
|
["n"] = "move_selection_next",
|
||||||
|
["e"] = "move_selection_previous",
|
||||||
|
["w"] = "preview_scrolling_up",
|
||||||
|
["r"] = "preview_scrolling_down",
|
||||||
|
["a"] = "preview_scrolling_left",
|
||||||
|
["s"] = "preview_scrolling_right",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue