all repos — nixfiles @ 78db0c79f0e4b37ce16b5c468b52526dab2e2e31

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

centralise fish system configuration

Alin
commit

78db0c79f0e4b37ce16b5c468b52526dab2e2e31

parent

029e0f1dd9f5949dbbb1d07399516104cf377460

7 files changed, 8 insertions(+), 30 deletions(-)

changed files
M system/hosts/installer.nix → system/hosts/installer.nix
@@ -20,10 +20,4 @@ environment.systemPackages = with pkgs; [
     ghq
     git
   ];
-
-  programs.fish = {
-    enable = true;
-  };
-  users.users.nixos.shell = pkgs.fish;
-  users.users.root.shell = pkgs.fish;
 }
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -296,14 +296,6 @@ security.sudo.extraConfig = ''
     Defaults:root,%wheel env_keep+=EDITOR
   '';
 
-  users.defaultUserShell = config.programs.fish.package;
-  programs.fish = {
-    enable = true;
-    package = pkgs.fishMinimal;
-    interactiveShellInit = ''
-      set --universal fish_greeting ""
-    '';
-  };
   users.users.root = {
     openssh.authorizedKeys.keys = [
       "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin"
M system/hosts/r5.nix → system/hosts/r5.nix
@@ -58,12 +58,6 @@ lsof
     knot-dns
   ];
 
-  programs.fish = {
-    enable = true;
-    package = pkgs.fishMinimal;
-  };
-  users.defaultUserShell = config.programs.fish.package;
-
   users.users.alin = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
M system/hosts/r6.nix → system/hosts/r6.nix
@@ -309,8 +309,6 @@ tcpdump
     conntrack-tools
   ];
 
-  programs.fish.enable = true;
-  users.defaultUserShell = pkgs.fish;
   users.mutableUsers = lib.mkForce true;
 
   users.users.alan = {
M system/hosts/smrk.nix → system/hosts/smrk.nix
@@ -68,13 +68,6 @@ dates = [ "02:30" ];
     };
   };
 
-  users.defaultUserShell = config.programs.fish.package;
-  programs.fish = {
-    enable = true;
-    package = pkgs.fishMinimal;
-    interactiveShellInit = ''
-      set --universal fish_greeting ""
-    '';
   };
   users.users.root = {
     openssh.authorizedKeys.keys = [
M system/roles/base.nix → system/roles/base.nix
@@ -2,6 +2,7 @@ { ... }:
 {
   imports = [
     ../settings/programs/neovim.nix
+    ../settings/programs/shell.nix
     ../settings/programs/base.nix
   ];
 }
M system/settings/programs/shell.nix → system/settings/programs/shell.nix
@@ -1,11 +1,17 @@
 {
+  config,
   pkgs,
+  lib,
   ...
 }:
 {
   programs.fish = {
     enable = true;
+    package = lib.mkDefault pkgs.fishMinimal;
     useBabelfish = true;
+    interactiveShellInit = ''
+      set --universal fish_greeting ""
+    '';
   };
-  users.users.alin.shell = pkgs.fish;
+  users.defaultUserShell = config.programs.fish.package;
 }