EDITOR, GIT_EDITOR: lift into vim.nix
This commit is contained in:
parent
40ec4d6ce0
commit
771f482d84
|
@ -71,19 +71,6 @@
|
||||||
# disable non-required packages like nano, perl, rsync, strace
|
# disable non-required packages like nano, perl, rsync, strace
|
||||||
environment.defaultPackages = [];
|
environment.defaultPackages = [];
|
||||||
|
|
||||||
# programs.vim.defaultEditor = true;
|
|
||||||
environment.variables = {
|
|
||||||
EDITOR = "vim";
|
|
||||||
# git claims it should use EDITOR, but it doesn't!
|
|
||||||
GIT_EDITOR = "vim";
|
|
||||||
# TODO: these should be moved to `home.sessionVariables` (home-manager)
|
|
||||||
# Electron apps should use native wayland backend:
|
|
||||||
# https://nixos.wiki/wiki/Slack#Wayland
|
|
||||||
# Discord under sway crashes with this.
|
|
||||||
# NIXOS_OZONE_WL = "1";
|
|
||||||
# LIBGL_ALWAYS_SOFTWARE = "1";
|
|
||||||
};
|
|
||||||
|
|
||||||
# dconf docs: <https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/desktop_migration_and_administration_guide/profiles>
|
# dconf docs: <https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/desktop_migration_and_administration_guide/profiles>
|
||||||
# find keys/values with `dconf dump /`
|
# find keys/values with `dconf dump /`
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
|
|
@ -43,6 +43,7 @@ let
|
||||||
lsof
|
lsof
|
||||||
miniupnpc
|
miniupnpc
|
||||||
nano
|
nano
|
||||||
|
neovim
|
||||||
netcat
|
netcat
|
||||||
nethogs
|
nethogs
|
||||||
nmap
|
nmap
|
||||||
|
@ -124,7 +125,7 @@ let
|
||||||
lm_sensors # for sensors-detect. TODO: what needs this? lift into the consumer
|
lm_sensors # for sensors-detect. TODO: what needs this? lift into the consumer
|
||||||
lshw
|
lshw
|
||||||
# memtester
|
# memtester
|
||||||
neovim
|
neovim # needed as a user package, for swap persistence
|
||||||
# nettools
|
# nettools
|
||||||
# networkmanager
|
# networkmanager
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
|
|
|
@ -81,7 +81,12 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# private because there could be sensitive things in the swap
|
# private because there could be sensitive things in the swap
|
||||||
sane.programs.neovim.persist.private = [ ".cache/vim-swap" ];
|
sane.programs.neovim = {
|
||||||
|
persist.private = [ ".cache/vim-swap" ];
|
||||||
|
env.EDITOR = "vim";
|
||||||
|
# git claims it should use EDITOR, but it doesn't!
|
||||||
|
env.GIT_EDITOR = "vim";
|
||||||
|
};
|
||||||
|
|
||||||
programs.neovim = mkIf config.sane.programs.neovim.enabled {
|
programs.neovim = mkIf config.sane.programs.neovim.enabled {
|
||||||
# neovim: https://github.com/neovim/neovim
|
# neovim: https://github.com/neovim/neovim
|
||||||
|
|
Loading…
Reference in New Issue
Block a user