all repos — nixfiles @ 10d7d263581b192f7cc53f9b959c638cb035e7e2

System and user configuration, managed by nix and home-manager

centralise default editor

Alin
commit

10d7d263581b192f7cc53f9b959c638cb035e7e2

parent

e6120fa3ef5ca0f817af287c9de2047d5d65ed32

8 files changed, 20 insertions(+), 37 deletions(-)

changed files
M system/hosts/installer.nix → system/hosts/installer.nix
@@ -11,14 +11,11 @@ ../settings/programs/base.nix
     ../settings/hardware/nvidia-gpu.nix
     ../settings/hardware/keyboard.nix
     ../settings/hardware/keyboard-lofree.nix
+
+    ../roles/base.nix
   ];
 
   services.picom.enable = false;
-
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-  };
 
   environment.systemPackages = with pkgs; [
     ghq
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -164,14 +164,6 @@ package = pkgs.nix-serve-ng;
     secretKeyFile = config.age.secrets.binarycache.path;
   };
 
-  programs.vim.defaultEditor = false;
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
-
   networking = {
     hostName = hostname;
     inherit domain;
M system/hosts/nano.nix → system/hosts/nano.nix
@@ -300,14 +300,6 @@ "--advertise-routes=10.0.0.0/16,fd12:d04f:65d:42::/56"
     ];
   };
 
-  programs.vim.defaultEditor = false;
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    vimAlias = true;
-    viAlias = true;
-  };
-
   environment.systemPackages = with pkgs; [
     file
     tree
M system/hosts/r5s.nix → system/hosts/r5s.nix
@@ -57,14 +57,6 @@ services.tailscale = {
     enable = true;
   };
 
-  programs.vim.defaultEditor = false;
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    vimAlias = true;
-    viAlias = true;
-  };
-
   environment.systemPackages = with pkgs; [
     file
     tree
M system/hosts/smrk.nix → system/hosts/smrk.nix
@@ -51,14 +51,6 @@ hide_kernel_threads = true;
     };
   };
 
-  programs.vim.defaultEditor = false;
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
-
   networking = {
     hostName = hostname;
     domain = domain;
A system/roles/base.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ../settings/programs/neovim.nix
+  ];
+}
M system/roles/server.nix → system/roles/server.nix
@@ -7,6 +7,8 @@ ../settings/configuration/locale.nix
 
     ../settings/services/tailscale.nix
     ../settings/services/caddy.nix
+
+    ./base.nix
   ];
 
   services.tailscale = {
A system/settings/programs/neovim.nix
@@ -0,0 +1,10 @@
+{ ... }:
+{
+  programs.vim.defaultEditor = false;
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+}