From f46ac4cd5b9388aeacb807f7392a88ade83dd59a Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 11 Dec 2024 20:20:05 -0500 Subject: [PATCH] shell.nix: split page to page.nix --- modules/page.nix | 23 +++++++++++++++++++++++ modules/shell.nix | 14 +------------- 2 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 modules/page.nix diff --git a/modules/page.nix b/modules/page.nix new file mode 100644 index 0000000..d8403ff --- /dev/null +++ b/modules/page.nix @@ -0,0 +1,23 @@ +{ pkgs, config }: +{ + systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ]; + + environment = { + systemPackages = [ pkgs.page ]; + variables = { + PAGER = "page -WC -q 90000 -z 90000"; + SYSTEMD_PAGERSECURE = "true"; + MANPAGER = "page -t man"; + }; + shellAliases.page = config.environment.variables.PAGER; + }; + + programs.zsh.interactiveShellInit = '' + man () { + PROGRAM="''${@[-1]}" + SECTION="''${@[-2]}" + page -W "man://$PROGRAM''${SECTION:+($SECTION)}" + } + ''; + +} diff --git a/modules/shell.nix b/modules/shell.nix index fec62c2..d406798 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -1,21 +1,16 @@ { fetch-rs, pkgs, - config, }: { - systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ]; environment = { systemPackages = builtins.attrValues { - inherit (pkgs) page eza fzf; + inherit (pkgs) eza fzf; inherit (fetch-rs.packages) fetch-rs; }; variables = { EDITOR = "nvim"; VISUAL = "nvim"; - PAGER = "page -WC -q 90000 -z 90000"; - SYSTEMD_PAGERSECURE = "true"; - MANPAGER = "page -t man"; }; shellAliases = { #paste link trick @@ -36,7 +31,6 @@ lx = "eza -lbhHigUmuSa@ --time-style=long-iso --git --color-scale"; lS = "eza -1"; lt = "eza --tree --level=2"; - page = config.environment.variables.PAGER; }; interactiveShellInit = "fetch-rs"; }; @@ -58,12 +52,6 @@ bindkey '^[[B' history-substring-search-down ### fzf-tab ### source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh - ### pager ### - man () { - PROGRAM="''${@[-1]}" - SECTION="''${@[-2]}" - page -W "man://$PROGRAM''${SECTION:+($SECTION)}" - } ### transient shell prompt ### zle-line-init() { emulate -L zsh