foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-04-24 06:19:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

nixvimConfigs/fiesta: update deprecated lua attribute for keymaps

Browse Source
This commit is contained in:
Gabriel Arazas 2024-06-27 18:30:37 +08:00
parent 6666d55073
commit 5003d9723a
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
4 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configs/nixvim/fiesta/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, helpers, ... }:
{ {
imports = [ ./modules ]; imports = [ ./modules ];
@ -41,8 +41,7 @@
{ {
mode = "n"; mode = "n";
key = "<leader>bd"; key = "<leader>bd";
action = "vim.cmd.bdelete"; action = helpers.mkRaw "vim.cmd.bdelete";
lua = true;
options.desc = "Delete current buffer"; options.desc = "Delete current buffer";
} }
]; ];

43
configs/nixvim/fiesta/modules/setups/debugging.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, helpers, ... }:
let let
nixvimCfg = config.nixvimConfigs.fiesta; nixvimCfg = config.nixvimConfigs.fiesta;
@ -24,24 +24,23 @@ in
{ {
mode = "n"; mode = "n";
key = "${bindingPrefix}${binding}"; key = "${bindingPrefix}${binding}";
lua = true;
} // settings; } // settings;
in in
lib.mapAttrsToList mkDAPBinding lib.mapAttrsToList mkDAPBinding
{ {
"b" = { "b" = {
options.desc = "Toggle breakpoint"; options.desc = "Toggle breakpoint";
action = "require('dap').toggle_breakpoint"; action = helpers.mkRaw "require('dap').toggle_breakpoint";
}; };
"B" = { "B" = {
options.desc = "Set breakpoint"; options.desc = "Set breakpoint";
action = "require('dap').set_breakpoint"; action = helpers.mkRaw "require('dap').set_breakpoint";
}; };
"Bp" = { "Bp" = {
options.desc = "Set breakpoint with log message"; options.desc = "Set breakpoint with log message";
action = '' action = helpers.mkRaw ''
function() function()
require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: '))
end end
@ -50,92 +49,92 @@ in
"n" = { "n" = {
options.desc = "Continue"; options.desc = "Continue";
action = "require('dap').continue"; action = helpers.mkRaw "require('dap').continue";
}; };
# You know, like a comma is supposed to do. I got nothing on this one # You know, like a comma is supposed to do. I got nothing on this one
# but this is the best choice for now. # but this is the best choice for now.
"," = { "," = {
options.desc = "Pause"; options.desc = "Pause";
action = "require('dap').pause"; action = helpers.mkRaw "require('dap').pause";
}; };
"d" = { "d" = {
options.desc = "Terminate"; options.desc = "Terminate";
action = "require('dap').terminate"; action = helpers.mkRaw "require('dap').terminate";
}; };
"l" = { "l" = {
options.desc = "Step over"; options.desc = "Step over";
action = "require('dap').step_over"; action = helpers.mkRaw "require('dap').step_over";
}; };
"j" = { "j" = {
options.desc = "Step into"; options.desc = "Step into";
action = "require('dap').step_into"; action = helpers.mkRaw "require('dap').step_into";
}; };
"J" = { "J" = {
options.desc = "Go up"; options.desc = "Go up";
action = "require('dap').up"; action = helpers.mkRaw "require('dap').up";
}; };
"k" = { "k" = {
options.desc = "Step out"; options.desc = "Step out";
action = "require('dap').step_out"; action = helpers.mkRaw "require('dap').step_out";
}; };
"K" = { "K" = {
options.desc = "Go down"; options.desc = "Go down";
action = "require('dap').down"; action = helpers.mkRaw "require('dap').down";
}; };
"rs" = { "rs" = {
options.desc = "Restart session"; options.desc = "Restart session";
action = "require('dap').restart"; action = helpers.mkRaw "require('dap').restart";
}; };
"rr" = { "rr" = {
options.desc = "Open debugging REPL"; options.desc = "Open debugging REPL";
action = "require('dap').repl.open"; action = helpers.mkRaw "require('dap').repl.open";
}; };
"rl" = { "rl" = {
options.desc = "Run last configuration"; options.desc = "Run last configuration";
action = "require('dap').run_last"; action = helpers.mkRaw "require('dap').run_last";
}; };
"ph" = { "ph" = {
options.desc = "View the value under the cursor"; options.desc = "View the value under the cursor";
action = "require('dap.ui.widgets').hover"; action = helpers.mkRaw "require('dap.ui.widgets').hover";
mode = [ "n" "v" ]; mode = [ "n" "v" ];
}; };
"pp" = { "pp" = {
options.desc = "See value in preview window"; options.desc = "See value in preview window";
action = "require('dap.ui.widgets').preview"; action = helpers.mkRaw "require('dap.ui.widgets').preview";
mode = [ "n" "v" ]; mode = [ "n" "v" ];
}; };
} }
++ lib.mapAttrsToList mkDAPBinding { ++ lib.mapAttrsToList mkDAPBinding {
"<F5>" = { "<F5>" = {
options.desc = "Continue"; options.desc = "Continue";
action = "require('dap').continue"; action = helpers.mkRaw "require('dap').continue";
}; };
"<F10>" = { "<F10>" = {
options.desc = "Step over"; options.desc = "Step over";
action = "require('dap').step_over"; action = helpers.mkRaw "require('dap').step_over";
}; };
"<F11>" = { "<F11>" = {
options.desc = "Step into"; options.desc = "Step into";
action = "require('dap').step_into"; action = helpers.mkRaw "require('dap').step_into";
}; };
"<F12>" = { "<F12>" = {
options.desc = "Step out"; options.desc = "Step out";
action = "require('dap').step_out"; action = helpers.mkRaw "require('dap').step_out";
}; };
}; };
}; };

29
configs/nixvim/fiesta/modules/setups/fuzzy-finder.nix
View File

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, lib, helpers, ... }:
let let
nixvimCfg = config.nixvimConfigs.fiesta; nixvimCfg = config.nixvimConfigs.fiesta;
@ -31,26 +31,23 @@ in
lib.mapAttrsToList mkTelescopeKeymap ({ lib.mapAttrsToList mkTelescopeKeymap ({
"A" = { "A" = {
options.desc = "Resume from last use"; options.desc = "Resume from last use";
action = "require('telescope.builtin').resume"; action = helpers.mkRaw "require('telescope.builtin').resume";
lua = true;
}; };
"b" = { "b" = {
options.desc = "List buffers"; options.desc = "List buffers";
action = "require('telescope.builtin').buffers"; action = helpers.mkRaw "require('telescope.builtin').buffers";
lua = true;
}; };
"f" = { "f" = {
options.desc = "Find files"; options.desc = "Find files";
action = '' action = helpers.mkRaw ''
function() function()
require('telescope.builtin').find_files { hidden = true } require('telescope.builtin').find_files { hidden = true }
end end
''; '';
lua = true;
}; };
"F" = { "F" = {
options.desc = "Find files in current directory"; options.desc = "Find files in current directory";
action = '' action = helpers.mkRaw ''
function() function()
require('telescope.builtin').find_files { require('telescope.builtin').find_files {
cwd = require('telescope.utils').buffer_dir(), cwd = require('telescope.utils').buffer_dir(),
@ -58,34 +55,28 @@ in
} }
end end
''; '';
lua = true;
}; };
"g" = { "g" = {
options.desc = "Find files tracked by Git"; options.desc = "Find files tracked by Git";
action = "require('telescope.builtin').git_files"; action = helpers.mkRaw "require('telescope.builtin').git_files";
lua = true;
}; };
"G" = { "G" = {
options.desc = "Live grep for the whole project"; options.desc = "Live grep for the whole project";
action = "require('telescope.builtin').live_grep"; action = helpers.mkRaw "require('telescope.builtin').live_grep";
lua = true;
}; };
"h" = { "h" = {
options.desc = "Find section from help tags"; options.desc = "Find section from help tags";
action = "require('telescope.builtin').help_tags"; action = helpers.mkRaw "require('telescope.builtin').help_tags";
lua = true;
}; };
"m" = { "m" = {
options.desc = "Find manpage entries"; options.desc = "Find manpage entries";
action = "require('telescope.builtin').man_pages"; action = helpers.mkRaw "require('telescope.builtin').man_pages";
lua = true;
}; };
} }
// lib.optionalAttrs nixvimCfg.setups.treesitter.enable { // lib.optionalAttrs nixvimCfg.setups.treesitter.enable {
"t" = { "t" = {
options.desc = "List symbols from treesitter queries"; options.desc = "List symbols from treesitter queries";
action = "require('telescope.builtin').treesitter"; action = helpers.mkRaw "require('telescope.builtin').treesitter";
lua = true;
}; };
}); });
}; };

11
configs/nixvim/fiesta/modules/setups/snippets/default.nix
View File

@ -1,11 +1,10 @@
{ config, lib, ... }: { config, lib, helpers, ... }:
let let
nixvimCfg = config.nixvimConfigs.fiesta; nixvimCfg = config.nixvimConfigs.fiesta;
cfg = nixvimCfg.setups.snippets; cfg = nixvimCfg.setups.snippets;
luasnipKeymapConfig = { luasnipKeymapConfig = {
lua = true;
mode = [ "i" "s" ]; mode = [ "i" "s" ];
}; };
in in
@ -40,7 +39,7 @@ in
(luasnipKeymapConfig // { (luasnipKeymapConfig // {
key = "<C-j>"; key = "<C-j>";
options.desc = "Jump to next node"; options.desc = "Jump to next node";
action = '' action = helpers.mkRaw ''
function() function()
ls = require("luasnip") ls = require("luasnip")
if ls.jumpable(1) then if ls.jumpable(1) then
@ -53,7 +52,7 @@ in
(luasnipKeymapConfig // { (luasnipKeymapConfig // {
key = "<C-k>"; key = "<C-k>";
options.desc = "Jump to previous node"; options.desc = "Jump to previous node";
action = '' action = helpers.mkRaw ''
function() function()
ls = require("luasnip") ls = require("luasnip")
if ls.jumpable(-1) then if ls.jumpable(-1) then
@ -66,7 +65,7 @@ in
(luasnipKeymapConfig // { (luasnipKeymapConfig // {
key = "<C-l>"; key = "<C-l>";
options.desc = "Expand or jump to next node"; options.desc = "Expand or jump to next node";
action = '' action = helpers.mkRaw ''
function() function()
ls = require("luasnip") ls = require("luasnip")
if ls.expand_or_jumpable() then if ls.expand_or_jumpable() then
@ -79,7 +78,7 @@ in
(luasnipKeymapConfig // { (luasnipKeymapConfig // {
key = "<C-u>"; key = "<C-u>";
options.desc = "Show extra choices"; options.desc = "Show extra choices";
action = '' action = helpers.mkRaw ''
function() function()
require("luasnip.extras.select_choice")() require("luasnip.extras.select_choice")()
end end