ElKowar/dots-of-war
1
0
Fork 0
mirror of https://github.com/elkowar/dots-of-war.git synced 2024-12-26 14:12:23 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
ElKowar 2023-03-13 13:05:12 +01:00 committed by elkowar
parent dbda004755
commit 6507a36364
Signed by: ElKowar
GPG key ID: 862BA3D7D7760F13
4 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git/.gitconfig
View file

@ -1,7 +1,7 @@
[user] [user]
email = 5300871+elkowar@users.noreply.github.com email = 5300871+elkowar@users.noreply.github.com
name = elkowar name = elkowar
signingkey = B558974128820CB473BD9807E321AD71B1D1F27F signingkey = 9EFD181455D31DD0F42DA932862BA3D7D7760F13
[credential] [credential]
helper = store helper = store
[core] [core]

3
nvim/.config/nvim/fnl/dots/plugins.fnl
View file

@ -78,7 +78,8 @@
:lazy true :lazy true
:config #(setup :scrollbar)} :config #(setup :scrollbar)}
"https://git.sr.ht/~whynothugo/lsp_lines.nvim" {:config #(setup :lsp_lines)} "https://git.sr.ht/~whynothugo/lsp_lines.nvim" {:config #(do (setup :lsp_lines)
(vim.diagnostic.config {:virtual_lines false}))}
; editing and movement <<< ; editing and movement <<<

36
nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl
View file

@ -7,8 +7,8 @@
require-macros [macros]}) require-macros [macros]})
; :h bufferline-lua-highlights ; :h bufferline-lua-highlights
(let [selected {:bg colors.neutral_aqua :fg colors.bg_main :gui "NONE"} (let [selected {:guibg colors.neutral_aqua :guifg colors.bg_main :gui "NONE"}
visible {:bg colors.dark1 :fg colors.neutral_aqua}] visible {:guibg colors.dark1 :guifg colors.neutral_aqua}]
(bufferline.setup (bufferline.setup
{:options {:options
{:diagnostics "nvim_lsp" {:diagnostics "nvim_lsp"
@ -32,26 +32,26 @@
:error visible :error_selected selected :error_visible visible :error visible :error_selected selected :error_visible visible
:duplicate visible :duplicate_selected selected :duplicate_visible visible :duplicate visible :duplicate_selected selected :duplicate_visible visible
:diagnostic {:bg colors.dark1 :fg colors.neutral_red} :diagnostic {:guibg colors.dark1 :guifg colors.neutral_red}
:diagnostic_visible {:bg colors.dark1 :fg colors.neutral_red} :diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_red}
:diagnostic_selected {:bg colors.neutral_aqua :fg colors.faded_redu} :diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_redu}
:info_diagnostic {:bg colors.dark1 :fg colors.neutral_blue} :info_diagnostic {:guibg colors.dark1 :guifg colors.neutral_blue}
:info_diagnostic_visible {:bg colors.dark1 :fg colors.neutral_blue} :info_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_blue}
:info_diagnostic_selected {:bg colors.neutral_aqua :fg colors.faded_blue} :info_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_blue}
:warning_diagnostic {:bg colors.dark1 :fg colors.neutral_yellow} :warning_diagnostic {:guibg colors.dark1 :guifg colors.neutral_yellow}
:warning_diagnostic_visible {:bg colors.dark1 :fg colors.neutral_yellow} :warning_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_yellow}
:warning_diagnostic_selected {:bg colors.neutral_aqua :fg colors.faded_yellow} :warning_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.faded_yellow}
:error_diagnostic {:bg colors.dark1 :fg colors.neutral_red} :error_diagnostic {:guibg colors.dark1 :guifg colors.neutral_red}
:error_diagnostic_visible {:bg colors.dark1 :fg colors.neutral_red} :error_diagnostic_visible {:guibg colors.dark1 :guifg colors.neutral_red}
:error_diagnostic_selected {:bg colors.neutral_aqua :fg colors.red} :error_diagnostic_selected {:guibg colors.neutral_aqua :guifg colors.red}
:separator visible :separator visible
:indicator_selected {:bg colors.neutral_aqua :fg colors.neutral_aqua} :indicator_selected {:guibg colors.neutral_aqua :guifg colors.neutral_aqua}
; stuff I've never seen before :thonk: ; stuff I've never seen before :thonk:
:pick_selected {:bg colors.bright_red :fg colors.bright_red} :pick_selected {:guibg colors.bright_red :guifg colors.bright_red}
:tab_selected {:bg colors.bright_green :fg colors.bright_green} :tab_selected {:guibg colors.bright_green :guifg colors.bright_green}
:tab {:bg colors.bright_yellow :fg colors.bright_yellow}}})) :tab {:guibg colors.bright_yellow :guifg colors.bright_yellow}}}))

12
nvim/.config/nvim/lazy-lock.json
View file

@ -1,6 +1,7 @@
{ {
"agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" }, "agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" },
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"aniseed": { "branch": "master", "commit": "44d2886a9ec38abac61b4c73c2e57fb752232cfe" }, "aniseed": { "branch": "master", "commit": "44d2886a9ec38abac61b4c73c2e57fb752232cfe" },
======= =======
@ -9,6 +10,9 @@
======= =======
"aniseed": { "branch": "master", "commit": "44d2886a9ec38abac61b4c73c2e57fb752232cfe" }, "aniseed": { "branch": "master", "commit": "44d2886a9ec38abac61b4c73c2e57fb752232cfe" },
>>>>>>> 2b14fd7 (äf) >>>>>>> 2b14fd7 (äf)
=======
"aniseed": { "branch": "develop", "commit": "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2" },
>>>>>>> 5e64830 (update)
"antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" }, "antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" },
"any-jump.vim": { "branch": "master", "commit": "9768403b6381ce3758cebac9613910c0160969e3" }, "any-jump.vim": { "branch": "master", "commit": "9768403b6381ce3758cebac9613910c0160969e3" },
"ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" }, "ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" },
@ -24,7 +28,7 @@
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
"conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" }, "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
"conjure": { "branch": "master", "commit": "d2e69a13b32e8574decfe81ea275292234eba6ea" }, "conjure": { "branch": "master", "commit": "d2e69a13b32e8574decfe81ea275292234eba6ea" },
"copilot.lua": { "branch": "master", "commit": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f" }, "copilot.lua": { "branch": "master", "commit": "db62371b6eac73954c194f3c8faee36cffee8135" },
"crates.nvim": { "branch": "main", "commit": "3fc7ddac13ddf65914a733ef074317c4c72ef05b" }, "crates.nvim": { "branch": "main", "commit": "3fc7ddac13ddf65914a733ef074317c4c72ef05b" },
"diffview.nvim": { "branch": "main", "commit": "11827d46e939b4748dbdb7e0df4982a63bd59d26" }, "diffview.nvim": { "branch": "main", "commit": "11827d46e939b4748dbdb7e0df4982a63bd59d26" },
"dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" }, "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" },
@ -47,6 +51,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" },
======= =======
@ -73,8 +78,11 @@
"lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" },
>>>>>>> d78e6c9 (Re-set up laptop) >>>>>>> d78e6c9 (Re-set up laptop)
>>>>>>> a524934 (Re-set up laptop) >>>>>>> a524934 (Re-set up laptop)
=======
"lazy.nvim": { "branch": "main", "commit": "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2" },
>>>>>>> 5e64830 (update)
"litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" },
"lsp_lines.nvim": { "branch": "main", "commit": "ec98b45c8280e5ef8c84028d4f38aa447276c002" }, "lsp_lines.nvim": { "branch": "main", "commit": "dcff567b3a2d730f31b6da229ca3bb40640ec5a6" },
"lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" }, "lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" },
"neoformat": { "branch": "master", "commit": "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81" }, "neoformat": { "branch": "master", "commit": "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81" },
"neogit": { "branch": "master", "commit": "089d388876a535032ac6a3f80e19420f09e4ddda" }, "neogit": { "branch": "master", "commit": "089d388876a535032ac6a3f80e19420f09e4ddda" },