diff --git a/flake.nix b/flake.nix index 04a15fa..0dfbe76 100644 --- a/flake.nix +++ b/flake.nix @@ -280,7 +280,7 @@ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICrbBG+U07f7OKvOxYIGYCaNvyozzxQF+I9Fb5TYZErK yukkop vm-postgres'' ]; - programs.zsh.shellAliases = self.lib.sharedShellAliases; + programs.zsh.shellAliases = self.lib.sharedShellAliasesForDevVm; virtualisation = { vmVariant = { @@ -362,7 +362,7 @@ journalctl -u postgresql.service | grep postgresql-post-start | sed 's|psql:/nix/store/[^:]*:[0-9]*: ||' | sed 's|^[^:]*:[^:]*:[^:]*: ||' | grep -v '^\[.*\]' | ${hectic.prettify-log}/bin/prettify-log --color-output '') ]; - programs.zsh.shellAliases = self.lib.sharedShellAliases // { + programs.zsh.shellAliases = self.lib.sharedShellAliasesForDevVm // { conn = "sudo su postgres -c 'psql -p 64317'"; }; @@ -408,6 +408,7 @@ ]; services.getty.autologinUser = "root"; + programs.zsh.shellAliases = self.lib.sharedShellAliases; programs.zsh.enable = true; users.defaultUserShell = pkgs.zsh; @@ -625,9 +626,12 @@ jc = ''journalctl''; sc = ''journalctl''; nv = ''nvim''; - sd = "shutdown now"; }; + sharedShellAliasesForDevVm = self.lib.sharedShellAliases // { + sd = "shutdown now"; + }; + readEnvironment = { envVarsToRead, prefix ? "" }: builtins.listToAttrs (map (name: { diff --git a/package/nvim-pager.nix b/package/nvim-pager.nix index ddeecf0..b06b26a 100644 --- a/package/nvim-pager.nix +++ b/package/nvim-pager.nix @@ -1,6 +1,6 @@ {pkgs, ...}: pkgs.writeShellScriptBin "pager" '' - nvim -R --clean NONE \ + nvim -R -u NONE \ -c 'nnoremap q :q!' \ -c 'set buftype=nofile nowrap' \ -c 'set runtimepath^=${pkgs.vimPlugins.vim-plugin-AnsiEsc}' \