Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jlesquembre committed Sep 2, 2024
1 parent d206c9e commit e32ec2c
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 46 deletions.
26 changes: 13 additions & 13 deletions dotfiles/neovim/gitsigns.lua
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
require("gitsigns").setup({
signs = {
-- add = {hl = 'GitSignsAdd' , text = '▌', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'},
-- change = {hl = 'GitSignsChange', text = '▌', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
add = { hl = "GitSignsAdd", text = "", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
change = { hl = "GitSignsChange", text = "", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
topdelete = { hl = "GitSignsDelete", text = "", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
changedelete = { hl = "GitSignsChangeDelete", text = "~", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
},
-- signs = {
-- -- add = {hl = 'GitSignsAdd' , text = '▌', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'},
-- -- change = {hl = 'GitSignsChange', text = '▌', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
-- add = { hl = "GitSignsAdd", text = "▎", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
-- change = { hl = "GitSignsChange", text = "▎", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
-- delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-- topdelete = { hl = "GitSignsDelete", text = "‾", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-- changedelete = { hl = "GitSignsChangeDelete", text = "~", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
-- },

numhl = false,

on_attach = function(bufnr)
vim.fn.sign_define("GitSignsAdd", { culhl = "GitSignsAddCul" })
vim.fn.sign_define("GitSignsChange", { culhl = "GitSignsChangeCul" })
vim.fn.sign_define("GitSignsDelete", { culhl = "GitSignsDeleteCul" })
vim.fn.sign_define("GitSignsChangeDelete", { culhl = "GitSignsChangeDeleteCul" })
-- vim.fn.sign_define("GitSignsAdd", { culhl = "GitSignsAddCul" })
-- vim.fn.sign_define("GitSignsChange", { culhl = "GitSignsChangeCul" })
-- vim.fn.sign_define("GitSignsDelete", { culhl = "GitSignsDeleteCul" })
-- vim.fn.sign_define("GitSignsChangeDelete", { culhl = "GitSignsChangeDeleteCul" })

local gs = package.loaded.gitsigns

Expand Down
36 changes: 18 additions & 18 deletions dotfiles/neovim/luasnip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ ls.add_snippets("all", {
s("date", { d(1, date_input, {}) }),
})

ls.add_snippets("clojure", {
s("item", {
t({ '{:description "' }),
i(1),
t({ '" ', "" }),
t({ " :amount " }),
i(2),
t({ " ", "" }),
t({ " :tags #{" }),
i(3),
t({ "}", "" }),
t({ ' :date "' }),
f(function()
return os.date("%Y-%m-%d")
end),
t({ '"}', "" }),
}),
})
-- ls.add_snippets("clojure", {
-- s("item", {
-- t({ '{:description "' }),
-- i(1),
-- t({ '" ', "" }),
-- t({ " :amount " }),
-- i(2),
-- t({ " ", "" }),
-- t({ " :tags #{" }),
-- i(3),
-- t({ "}", "" }),
-- t({ ' :date "' }),
-- f(function()
-- return os.date("%Y-%m-%d")
-- end),
-- t({ '"}', "" }),
-- }),
-- })

local elementName = function()
return sn(nil, i(1, fname()))
Expand Down
7 changes: 6 additions & 1 deletion dotfiles/neovim/myconfig.fnl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@
(let [kmap "<leader>a"
opts {:noremap true}]
(vim.keymap.set "n" (.. kmap "a") (fn [] (other.open)) opts)
(vim.keymap.set "n" (.. kmap "v") (fn [] (other.openVSplit)) opts)
(vim.keymap.set "n" (.. kmap "v") (fn []
(let [v vim.o.splitright]
(set vim.o.splitright true)
(other.openVSplit)
(set vim.o.splitright v)))
opts)
(vim.keymap.set "n" (.. kmap "x") (fn [] (other.openSplit)) opts)
(vim.keymap.set "n" (.. kmap "t") (fn [] (other.openTabNew)) opts))

Expand Down
8 changes: 7 additions & 1 deletion dotfiles/neovim/user.lua
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,16 @@ augroup END
require("nterm.main").init()
vim.keymap.set("t", "<C-e>", [[<cmd>lua require'nterm.main'.term_toggle()<cr>]], { remap = false })

local lisp_langs = require("jlle.conjure").lisp_langs

require("nvim-autopairs").setup({
disable_filetype = { "TelescopePrompt", unpack(require("jlle.conjure").lisp_langs) },
disable_filetype = { "TelescopePrompt", unpack(lisp_langs) },
})

vim.g.rainbow_delimiters = {
whitelist = lisp_langs,
}

function _G.toggle_qf()
local qf_exists = false

Expand Down
2 changes: 1 addition & 1 deletion dotfiles/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ config = wezterm.config_builder()
config.font = wezterm.font("Hack")
config.font_size = 12.0

config.front_end = "WebGpu"
-- config.front_end = "WebGpu"

config.default_cursor_style = "BlinkingBlock"
-- config.default_cursor_style = "BlinkingBar"
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e32ec2c

Please sign in to comment.