prescientmoon/satellite
prescientmoon/satellite
1
Fork 0
Code Activity

Update to nixpgks 24.05

Browse source
This commit is contained in:
prescientmoon 2024-07-26 20:18:26 +02:00
parent 5247160b43
commit a6293a1ba4
Signed by: prescientmoon
SSH key fingerprint: SHA256:UUF9JT2s8Xfyv76b8ZuVL7XrmimH4o49p4b+iexbVH4
46 changed files with 475 additions and 991 deletions
home/features/neovim
config
lazy-lock.json
lua/my
tempest.lua
default.nix
plugins
lspconfig.lua

70
home/features/neovim/config/lazy-lock.json
View file

@ -1,58 +1,58 @@
{
"clipboard-image": { "branch": "main", "commit": "485de5493d196154db30f85665f8ac480ce116a2" },
"cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" },
"cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"conform": { "branch": "master", "commit": "192a6d2ddace343f1840a8f72efe2315bd392243" },
"crates": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" },
"conform": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
"crates": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" },
"discord-rich-presence": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"dressing": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
"dressing": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
"fidget": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
"flash": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"flash": { "branch": "main", "commit": "d0799ae43a581d9f190e182e2a1f389d2887c42a" },
"ftft": { "branch": "master", "commit": "f3e43c9584e14b27f04c27a95a9d9f0e58dfec02" },
"github-actions": { "branch": "master", "commit": "f2f16243447cea174daa6b4a9ffd3ff9213814ef" },
"github-actions": { "branch": "master", "commit": "728374ef59b11a5f5991ea2560d149a4ae33fd22" },
"gitlinker": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
"gitsigns": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
"gruvbox": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
"gitsigns": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" },
"gruvbox": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
"harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
"haskell-tools": { "branch": "master", "commit": "92e097c6832405fb64e4c44a7ce8bebe7836cae6" },
"hyprland": { "branch": "main", "commit": "71760fe0cad972070657b0528f48456f7e0027b2" },
"idris": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" },
"inc-rename": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
"indent-blankline": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
"inc-rename": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
"indent-blankline": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
"lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
"lean": { "branch": "main", "commit": "1a2a2dfbc7e6775e9ec8b84e5eadaf31fde1894e" },
"lean": { "branch": "main", "commit": "182703184edb866d7bfe878be358295e189c8223" },
"live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" },
"lspconfig": { "branch": "master", "commit": "16295b79410f131c4fa7870c663b4ace6a761fb2" },
"lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"luasnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" },
"mini.ai": { "branch": "main", "commit": "98e45e6832351354e41e82b32a80ce7537c20746" },
"mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" },
"mini.files": { "branch": "main", "commit": "eab771c69b787a3f042dc6505d15613c282aa786" },
"mini.operators": { "branch": "main", "commit": "0765e4818086e96b8fb55d280e47af781a5bc56a" },
"mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
"mini.statusline": { "branch": "main", "commit": "dfd3d2ba295473930f78f143852b9b53eb54ae2a" },
"mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
"luasnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
"mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
"mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" },
"mini.files": { "branch": "main", "commit": "acfc4e46f6722a0690ce640632c5b5515ddade70" },
"mini.operators": { "branch": "main", "commit": "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4" },
"mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
"mini.statusline": { "branch": "main", "commit": "ec7e2c509c7262fef85a28a772f60ebe146297db" },
"mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
"navigator": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
"neoconf": { "branch": "main", "commit": "4ef6c6c5882e7e16209173fb8c47414202843384" },
"neodev": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
"nui": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" },
"neoconf": { "branch": "main", "commit": "23f24edab5f78465a0bc3320678e038664b9aa6e" },
"neodev": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
"null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
"plenary": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
"rust-tools": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
"rzip": { "branch": "master", "commit": "f65400fed27b27c7cff7ef8d428c4e5ff749bf28" },
"scrap": { "branch": "main", "commit": "cc8453ed613932c744c3d1ec42f379b78bd8b92c" },
"ssr": { "branch": "main", "commit": "bb323ba621ac647b4ac5638b47666e3ef3c279e1" },
"telescope": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
"treesitter": { "branch": "master", "commit": "19bf991be2403c10fa379fa0fb11b7de2560ac31" },
"typst": { "branch": "main", "commit": "e28d440c7ba4df2516d7d7f908c4fb664a8cf86c" },
"undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" },
"wakatime": { "branch": "master", "commit": "285c2e4e48fb0c63ced233c00fb10a2edb3b6c94" },
"web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
"telescope": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" },
"typst": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" },
"undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
"wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" },
"web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
"which-key.nvim": { "branch": "main", "commit": "c77cda8cd2f54965e4316699f1d124a2b3bf9d49" }
}

10
home/features/neovim/config/lua/my/tempest.lua
View file

@ -130,11 +130,17 @@ function M.configure(opts, context)
opts = opts(context)
end
if type(opts) ~= "table" then
-- TODO: throw
if opts == nil then
return
end
if type(opts) ~= "table" then
return error(
"Cannot handle non-table options for tempest runtime, "
.. vim.inspect(opts)
)
end
if type(opts.mkContext) == "function" then
context = opts.mkContext(context)
end

134
home/features/neovim/default.nix
View file

@ -177,7 +177,7 @@ let
(thunk /* lua */ "vim.opt.spell = not vim.o.spell")
"toggle [s]pell checker")
(nmap "<leader>yp"
("<cmd>!curl --data-binary @% https://paste.rs<cr>")
"<cmd>!curl --data-binary @% https://paste.rs<cr>"
"[y]ank [p]aste.rs link")
# }}}
];
@ -538,7 +538,7 @@ let
event = "VeryLazy";
config = true;
# {{{{ Keybinds
# {{{ Keybinds
keys =
let
# {{{ List of fold-related keybinds
@ -702,21 +702,6 @@ let
"[U]ndo tree";
};
# }}}
# {{{ ssr (structured search & replace)
ssr = {
package = "cshuaimin/ssr.nvim";
cond = blacklist "vscode";
keys = {
mode = "nx";
mapping = "<leader>rt";
action = thunk /* lua */ ''require("ssr").open()'';
desc = "[r]eplace [t]emplate";
};
opts.keymaps.replace_all = "<s-cr>";
};
# }}}
# {{{ mini.ai
mini-ai = {
package = "echasnovski/mini.ai";
@ -925,7 +910,6 @@ let
pkgs.lua
] ++
optionals nix [
pkgs.rnix-lsp
pkgs.nil
pkgs.nixd
] ++
@ -1036,100 +1020,6 @@ let
'';
};
# }}}
# {{{ gitsigns
gitsigns = {
package = "lewis6991/gitsigns.nvim";
cond = [ (blacklist [ "vscode" "firenvim" ]) notmp ];
event = "BufReadPost";
opts.on_attach = tempest {
mkContext = lua /* lua */
"function(bufnr) return { bufnr = bufnr } end";
keys =
let
prefix = m: "<leader>h${m}";
gs = "package.loaded.gitsigns";
# {{{ nmap helper
nmap = mapping: action: desc: {
inherit desc;
mapping = prefix "mapping";
action = "${gs}.action";
};
# }}}
# {{{ exprmap helper
exprmap = mapping: action: desc: {
inherit mapping desc;
action = thunk /* lua */ ''
if vim.wo.diff then
return "${mapping}"
end
vim.schedule(function()
${gs}.${action}()
end)
return "<ignore>"
'';
expr = true;
};
# }}}
in
[
# {{{ navigation
(exprmap "]c" "next_hunk" "Navigate to next hunk")
(exprmap "[c" "prev_hunk" "Navigate to previous hunk")
# }}}
# {{{ actions
(nmap "s" "stage_hunk" "[s]tage hunk")
(nmap "r" "reset_hunk" "[s]tage hunk")
(nmap "S" "stage_buffer" "[s]tage hunk")
(nmap "u" "undo_stage_hunk" "[s]tage hunk")
(nmap "R" "reset_buffer" "[s]tage hunk")
(nmap "p" "preview_hunk" "[s]tage hunk")
(nmap "d" "diffthis" "[s]tage hunk")
{
mapping = prefix "D";
action = thunk ''
${gs}.diffthis("~")
'';
desc = "[d]iff file (?)";
}
{
mapping = prefix "b";
action = thunk ''
${gs}.blame_line({ full = true })
'';
desc = "[b]lame line";
}
# }}}
# {{{ Toggles
(nmap "tb" "toggle_current_line_blame" "[t]oggle line [b]laming")
(nmap "td" "toggle_deleted" "[t]oggle [d]eleted")
# }}}
# {{{ visual mappings
{
mode = "v";
mapping = prefix "s";
action = thunk /* lua */ ''
${gs}.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
'';
desc = "stage visual hunk";
}
{
mode = "v";
mapping = prefix "r";
action = thunk /* lua */ ''
${gs}.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
'';
desc = "reset visual hunk";
}
# }}}
];
};
};
# }}}
# {{{ cmp
cmp = {
package = "hrsh7th/nvim-cmp";
@ -1151,26 +1041,6 @@ let
config = importFrom ./plugins/cmp.lua "config";
};
# }}}
# {{{ inc-rename
inc-rename = {
package = "smjonas/inc-rename.nvim";
dependencies.lua = [ "dressing" ];
cond = blacklist "vscode";
event = "VeryLazy";
opts.input_buffer_type = "dressing";
config.autocmds = {
event = "LspAttach";
group = "CreateIncRenameKeybinds";
action.keys = {
mapping = "<leader>rn";
action = ":IncRename <c-r><c-w>";
desc = "Incremenetal [r]e[n]ame";
};
};
};
# }}}
# }}}
# {{{ language support
# {{{ haskell support

3
home/features/neovim/plugins/lspconfig.lua
View file

@ -86,8 +86,7 @@ function M.config()
},
-- }}}
-- {{{ Nix
rnix = {},
-- nil_ls = {},
nil_ls = {},
nixd = {},
-- }}}
cssls = {},