Merge branch 'main' of ssh://codeberg.org/dnscio/nix-config
This commit is contained in:
commit
7a2c65ba62
13 changed files with 73 additions and 521 deletions
|
|
@ -47,5 +47,6 @@
|
|||
imagemagick
|
||||
sqlite
|
||||
fortune
|
||||
lazygit
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -222,8 +222,8 @@
|
|||
'';
|
||||
|
||||
shellAbbrs = {
|
||||
lg = "nvim +Neogit";
|
||||
gg = "nvim +Neogit";
|
||||
lg = "lazygit";
|
||||
gg = "lazygit";
|
||||
g = "git";
|
||||
frc = "source ~/.config/fish/**/*.fish";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
settings = {
|
||||
font-size = 17;
|
||||
font-size = 18;
|
||||
font-family = "Victor Mono";
|
||||
font-style = "SemiBold";
|
||||
background-opacity = 0.945;
|
||||
|
|
|
|||
|
|
@ -15,10 +15,6 @@
|
|||
cleanup = "zap";
|
||||
};
|
||||
|
||||
taps = [
|
||||
"homebrew/services"
|
||||
];
|
||||
|
||||
brews = [
|
||||
"go"
|
||||
"mas"
|
||||
|
|
|
|||
|
|
@ -1,31 +1,29 @@
|
|||
{
|
||||
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
|
||||
"codecompanion.nvim": { "branch": "main", "commit": "a8c696d1fc4268085e4306d54af39b07be884b17" },
|
||||
"conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"codecompanion.nvim": { "branch": "main", "commit": "8ad65eef735b31bb47d76f59d878ee1bac4bdc85" },
|
||||
"conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" },
|
||||
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
|
||||
"follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitportal.nvim": { "branch": "main", "commit": "2420f27c6269184f13d018f347f36eb120403110" },
|
||||
"gopher.nvim": { "branch": "main", "commit": "295e21e637f9194a4d2bc34622d324a88b028141" },
|
||||
"gopher.nvim": { "branch": "main", "commit": "6a3924cee5a9f36d316f8e4a90c3020438d3513f" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
|
||||
"mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" },
|
||||
"neogit": { "branch": "master", "commit": "614a63489be5734b14f314c3449535566b8352d4" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||
"mini.pairs": { "branch": "main", "commit": "472ec50092a3314ec285d2db2baa48602d71fe93" },
|
||||
"nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
|
||||
"oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "eed1834170f343c14a6768f085b26b3571a55302" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "3c5c23ba91e608bd89bb36d76cb005aa63d20dbf" },
|
||||
"schemastore.nvim": { "branch": "main", "commit": "3941c524f88fd4b7696bc574d7acde0313ef5bf5" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
|
||||
"snipe.nvim": { "branch": "main", "commit": "d2d196c335919767803f905d573ce66340e33ee6" },
|
||||
"substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
|
||||
"vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
|
||||
"vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
|
||||
"vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" },
|
||||
"vim-dadbod-ui": { "branch": "master", "commit": "236179fd6bdc2aabeb1326d428e6b29d41044d8e" },
|
||||
"vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
|
||||
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
return {
|
||||
"olexsmir/gopher.nvim",
|
||||
ft = "go",
|
||||
build = function()
|
||||
vim.cmd.GoInstallDeps()
|
||||
end,
|
||||
---@module "gopher"
|
||||
---@type gopher.Config
|
||||
opts = {},
|
||||
keys = {
|
||||
{ "<leader>cga", "<cmd>GoTagAdd<cr>", desc = "Add tags to struct", mode = "n" },
|
||||
{ "<leader>cgi", "<cmd>GoIfErr<cr>", desc = "Adds if err boilerplate", mode = "n" },
|
||||
{ "<leader>cgt", "<cmd>GoTestAdd<cr>", desc = "Add test under cursor", mode = "n" },
|
||||
},
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
return {
|
||||
"NeogitOrg/neogit",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"sindrets/diffview.nvim",
|
||||
"folke/snacks.nvim",
|
||||
},
|
||||
lazy = false,
|
||||
opts = {},
|
||||
keys = {
|
||||
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Open neogit", mode = "n" },
|
||||
{ "<leader>gc", "<cmd>Neogit commit<cr>", desc = "Open neogit commit UI", mode = "n" },
|
||||
{ "<leader>gp", "<cmd>Neogit push<cr>", desc = "Open neogit push UI", mode = "n" },
|
||||
{ "<leader>gf", "<cmd>Neogit pull<cr>", desc = "Open neogit pull UI", mode = "n" },
|
||||
{ "<leader>gm", "<cmd>Neogit merge<cr>", desc = "Open neogit merge UI", mode = "n" },
|
||||
{ "<leader>ghb", "<cmd>DiffviewFileHistory<cr>", desc = "Show history for current branch", mode = "n" },
|
||||
{ "<leader>ghf", "<cmd>DiffviewFileHistory %<cr>", desc = "Show file history", mode = "n" },
|
||||
},
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ return {
|
|||
keys = {
|
||||
-- Git
|
||||
{
|
||||
"<leader>g_",
|
||||
"<leader>gg",
|
||||
function()
|
||||
Snacks.lazygit()
|
||||
end,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue