diff --git a/modules/session/nvim-session-manager/config.nix b/modules/session/nvim-session-manager/config.nix index 91072f1..729270e 100644 --- a/modules/session/nvim-session-manager/config.nix +++ b/modules/session/nvim-session-manager/config.nix @@ -3,12 +3,8 @@ lib, ... }: let - inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) optionals; - inherit (lib.strings) concatStringsSep; - inherit (lib.trivial) boolToString; - inherit (lib.nvim.binds) mkBinding; - inherit (lib.nvim.dag) entryAnywhere; + inherit (lib) mkIf optionals mkMerge mkBinding nvim; + inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.session.nvim-session-manager; in { @@ -19,7 +15,7 @@ in { "nvim-session-manager" "plenary-nvim" ] - ++ optionals (cfg.usePicker) ["dressing-nvim"]; + ++ optionals cfg.usePicker ["dressing-nvim"]; maps.normal = mkMerge [ (mkBinding cfg.mappings.loadSession ":SessionManager load_session" "Load session") @@ -29,31 +25,10 @@ in { # TODO: load_current_dir_session ]; - luaConfigRC.nvim-session-manager = entryAnywhere '' + luaConfigRC.nvim-session-manager = nvim.dag.entryAnywhere '' local Path = require('plenary.path') local sm = require('session_manager.config') - require('session_manager').setup({ - sessions_dir = Path:new(vim.fn.stdpath('data'), 'sessions'), - - path_replacer = '${toString cfg.pathReplacer}', - - colon_replacer = '${toString cfg.colonReplacer}', - - autoload_mode = sm.AutoloadMode.${toString cfg.autoloadMode}, - - autosave_last_session = ${boolToString cfg.autoSave.lastSession}, - - autosave_ignore_not_normal = ${boolToString cfg.autoSave.ignoreNotNormal}, - - autosave_ignore_dirs = {${concatStringsSep ", " (map (x: "\'" + x + "\'") cfg.autoSave.ignoreDirs)}}, - - autosave_ignore_filetypes = {${concatStringsSep ", " (map (x: "\'" + x + "\'") cfg.autoSave.ignoreFiletypes)}}, - - autosave_ignore_buftypes = {${concatStringsSep ", " (map (x: "\'" + x + "\'") cfg.autoSave.ignoreBufTypes)}}, - - autosave_only_in_session = ${boolToString cfg.autoSave.onlyInSession}, - max_path_length = ${toString cfg.maxPathLength}, - }) + require('session_manager').setup(${toLuaObject cfg.setupOpts}) ''; }; }; diff --git a/modules/session/nvim-session-manager/nvim-session-manager.nix b/modules/session/nvim-session-manager/nvim-session-manager.nix index 2182db3..8dce6ce 100644 --- a/modules/session/nvim-session-manager/nvim-session-manager.nix +++ b/modules/session/nvim-session-manager/nvim-session-manager.nix @@ -1,7 +1,23 @@ {lib, ...}: let - inherit (lib.options) mkOption mkEnableOption; - inherit (lib.types) nullOr str bool int listOf enum; + inherit (lib.types) nullOr str bool; + inherit (lib) mkEnableOption mkOption types mkRenamedOptionModule; in { + imports = let + renameSetupOpt = oldPath: newPath: + mkRenamedOptionModule (["vim" "session" "nvim-session-manager"] ++ oldPath) (["vim" "session" "nvim-session-manager" "setupOpts"] ++ newPath); + in [ + (renameSetupOpt ["pathReplacer"] ["path_replacer"]) + (renameSetupOpt ["colonReplacer"] ["colon_replacer"]) + (renameSetupOpt ["autoloadMode"] ["autoload_mode"]) + (renameSetupOpt ["maxPathLength"] ["max_path_length"]) + (renameSetupOpt ["autoSave" "lastSession"] ["autosave_last_session"]) + (renameSetupOpt ["autoSave" "ignoreNotNormal"] ["autosave_ignore_not_normal"]) + (renameSetupOpt ["autoSave" "ignoreDirs"] ["autosave_ignore_dirs"]) + (renameSetupOpt ["autoSave" "ignoreFiletypes"] ["autosave_ignore_filetypes"]) + (renameSetupOpt ["autoSave" "ignoreBufTypes"] ["autosave_ignore_buftypes"]) + (renameSetupOpt ["autoSave" "onlyInSession"] ["autosave_only_in_session"]) + ]; + options.vim.session.nvim-session-manager = { enable = mkEnableOption "nvim-session-manager: manage sessions like folders in VSCode"; @@ -37,63 +53,63 @@ in { description = "Whether or not we should use dressing.nvim to build a session picker UI"; }; - pathReplacer = mkOption { - type = str; - default = "__"; - description = "The character to which the path separator will be replaced for session files"; - }; + setupOpts = { + path_replacer = mkOption { + type = types.str; + default = "__"; + description = "The character to which the path separator will be replaced for session files"; + }; - colonReplacer = mkOption { - type = str; - default = "++"; - description = "The character to which the colon symbol will be replaced for session files"; - }; + colon_replacer = mkOption { + type = types.str; + default = "++"; + description = "The character to which the colon symbol will be replaced for session files"; + }; - autoloadMode = mkOption { - type = enum ["Disabled" "CurrentDir" "LastSession"]; - default = "LastSession"; - description = "Define what to do when Neovim is started without arguments. Possible values: Disabled, CurrentDir, LastSession"; - }; + autoload_mode = mkOption { + type = types.enum ["Disabled" "CurrentDir" "LastSession"]; + default = "LastSession"; + description = "Define what to do when Neovim is started without arguments. Possible values: Disabled, CurrentDir, LastSession"; + }; - maxPathLength = mkOption { - type = nullOr int; - default = 80; - description = "Shorten the display path if length exceeds this threshold. Use 0 if don't want to shorten the path at all"; - }; + max_path_length = mkOption { + type = types.nullOr types.int; + default = 80; + description = "Shorten the display path if length exceeds this threshold. Use 0 if don't want to shorten the path at all"; + }; - autoSave = { - lastSession = mkOption { - type = bool; + autosave_last_session = mkOption { + type = types.bool; default = true; description = "Automatically save last session on exit and on session switch"; }; - ignoreNotNormal = mkOption { - type = bool; + autosave_ignore_not_normal = mkOption { + type = types.bool; default = true; description = "Plugin will not save a session when no buffers are opened, or all of them aren't writable or listed"; }; - ignoreDirs = mkOption { - type = listOf str; + autosave_ignore_dirs = mkOption { + type = types.listOf types.str; default = []; description = "A list of directories where the session will not be autosaved"; }; - ignoreFiletypes = mkOption { - type = listOf str; + autosave_ignore_filetypes = mkOption { + type = types.listOf types.str; default = ["gitcommit"]; description = "All buffers of these file types will be closed before the session is saved"; }; - ignoreBufTypes = mkOption { - type = listOf str; + autosave_ignore_buftypes = mkOption { + type = types.listOf types.str; default = []; description = "All buffers of these bufer types will be closed before the session is saved"; }; - onlyInSession = mkOption { - type = bool; + autosave_only_in_session = mkOption { + type = types.bool; default = false; description = "Always autosaves session. If true, only autosaves after a session is active"; };