raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-12-19 09:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

modules/terminal: switch to explicit lib calls

Browse source
This commit is contained in:
NotAShelf 2024-03-12 03:47:27 +03:00
parent 2c483d90af
commit 32c2e7733a
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
4 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/terminal/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./toggleterm ./toggleterm
]; ];

18
modules/terminal/toggleterm/config.nix
View file

@ -4,20 +4,25 @@
... ...
}: let }: let
inherit (builtins) toJSON; inherit (builtins) toJSON;
inherit (lib) mkMerge mkIf mkBinding nvim getExe; inherit (lib.lists) optionals;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib.nvim.binds) mkBinding;
inherit (lib.nvim.dag) entryAnywhere entryAfter;
cfg = config.vim.terminal.toggleterm; cfg = config.vim.terminal.toggleterm;
in { in {
config = mkMerge [ config = mkMerge [
( (
mkIf cfg.enable { mkIf cfg.enable {
vim.startPlugins = [ vim = {
startPlugins = [
"toggleterm-nvim" "toggleterm-nvim"
]; ];
vim.maps.normal = mkBinding cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal"; maps.normal = mkBinding cfg.mappings.open "<Cmd>execute v:count . \"ToggleTerm\"<CR>" "Toggle terminal";
vim.luaConfigRC.toggleterm = nvim.dag.entryAnywhere '' luaConfigRC.toggleterm = entryAnywhere ''
require("toggleterm").setup({ require("toggleterm").setup({
open_mapping = null, open_mapping = null,
direction = '${toString cfg.direction}', direction = '${toString cfg.direction}',
@ -37,15 +42,16 @@ in {
}, },
}) })
''; '';
};
} }
) )
( (
mkIf (cfg.enable && cfg.lazygit.enable) mkIf (cfg.enable && cfg.lazygit.enable)
{ {
vim.startPlugins = lib.optionals (cfg.lazygit.package != null) [ vim.startPlugins = optionals (cfg.lazygit.package != null) [
cfg.lazygit.package cfg.lazygit.package
]; ];
vim.luaConfigRC.toggleterm-lazygit = nvim.dag.entryAfter ["toggleterm"] '' vim.luaConfigRC.toggleterm-lazygit = entryAfter ["toggleterm"] ''
local terminal = require 'toggleterm.terminal' local terminal = require 'toggleterm.terminal'
local lazygit = terminal.Terminal:new({ local lazygit = terminal.Terminal:new({
cmd = '${ cmd = '${

2
modules/terminal/toggleterm/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./toggleterm.nix ./toggleterm.nix
./config.nix ./config.nix

15
modules/terminal/toggleterm/toggleterm.nix
View file

@ -1,29 +1,30 @@
{ {
pkgs, pkgs,
config,
lib, lib,
... ...
}: let }: let
inherit (lib) mkEnableOption mkOption types mkMappingOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.types) nullOr str enum bool package;
in { in {
options.vim.terminal.toggleterm = { options.vim.terminal.toggleterm = {
enable = mkEnableOption "toggleterm as a replacement to built-in terminal command"; enable = mkEnableOption "toggleterm as a replacement to built-in terminal command";
mappings = { mappings = {
open = mkOption { open = mkOption {
type = types.nullOr types.str; type = nullOr str;
description = "The keymapping to open toggleterm"; description = "The keymapping to open toggleterm";
default = "<c-t>"; default = "<c-t>";
}; };
}; };
direction = mkOption { direction = mkOption {
type = types.enum ["horizontal" "vertical" "tab" "float"]; type = enum ["horizontal" "vertical" "tab" "float"];
default = "horizontal"; default = "horizontal";
description = "Direction of the terminal"; description = "Direction of the terminal";
}; };
enable_winbar = mkOption { enable_winbar = mkOption {
type = types.bool; type = bool;
default = false; default = false;
description = "Enable winbar"; description = "Enable winbar";
}; };
@ -31,13 +32,13 @@ in {
lazygit = { lazygit = {
enable = mkEnableOption "LazyGit integration"; enable = mkEnableOption "LazyGit integration";
direction = mkOption { direction = mkOption {
type = types.enum ["horizontal" "vertical" "tab" "float"]; type = enum ["horizontal" "vertical" "tab" "float"];
default = "float"; default = "float";
description = "Direction of the lazygit window"; description = "Direction of the lazygit window";
}; };
package = mkOption { package = mkOption {
type = with types; nullOr package; type = nullOr package;
default = pkgs.lazygit; default = pkgs.lazygit;
description = "The package that should be used for lazygit. Setting it to null will attempt to use lazygit from your PATH"; description = "The package that should be used for lazygit. Setting it to null will attempt to use lazygit from your PATH";
}; };