From 6ec3cea36d9950bb74ae1a2951d47dd26f5488de Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 16 Nov 2022 20:42:41 +0000 Subject: Use programs.vim.defaultEditor everywhere --- nix-conf/machines/djmuk1/configuration.nix | 3 ++- nix-conf/machines/djmuk2/configuration.nix | 3 ++- nix-conf/machines/egalmoth/configuration.nix | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'nix-conf') diff --git a/nix-conf/machines/djmuk1/configuration.nix b/nix-conf/machines/djmuk1/configuration.nix index 74e252a..305f45f 100644 --- a/nix-conf/machines/djmuk1/configuration.nix +++ b/nix-conf/machines/djmuk1/configuration.nix @@ -54,12 +54,13 @@ extraRules = [ { users = [ "djm" ]; noPass = true; keepEnv = true; } ]; }; + programs.vim.defaultEditor = true; + environment.systemPackages = with pkgs; [ #procmail vim wget ]; - environment.variables = { EDITOR = "vim"; VISUAL = "vim"; }; nix.trustedUsers = [ "root" "djm" ]; diff --git a/nix-conf/machines/djmuk2/configuration.nix b/nix-conf/machines/djmuk2/configuration.nix index d115655..fcde201 100644 --- a/nix-conf/machines/djmuk2/configuration.nix +++ b/nix-conf/machines/djmuk2/configuration.nix @@ -55,13 +55,14 @@ extraRules = [ { users = [ "djm" ]; noPass = true; keepEnv = true; } ]; }; + programs.vim.defaultEditor = true; + environment.systemPackages = with pkgs; [ #procmail git vim wget ]; - environment.variables = { EDITOR = "vim"; VISUAL = "vim"; }; nix.trustedUsers = [ "root" "djm" ]; diff --git a/nix-conf/machines/egalmoth/configuration.nix b/nix-conf/machines/egalmoth/configuration.nix index d9e239f..2988e7d 100644 --- a/nix-conf/machines/egalmoth/configuration.nix +++ b/nix-conf/machines/egalmoth/configuration.nix @@ -181,6 +181,8 @@ in enableSSHSupport = true; }; + programs.vim.defaultEditor = true; + services.openssh.enable = true; system.stateVersion = "21.05"; # Did you read the comment? -- cgit 1.4.1-2-gfad0