From b5c428822468b9a2dfb00a673c39e809f4ac0651 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 19 Jun 2022 15:57:45 -0700 Subject: ref(home/shell): make it easier to share common things between shells I'm considering trying again fish, and there are a number of things that should be common between zsh and fish (aliases, environment variables, ...). Instead of duplicating these settings multiple time, I'm consolidating the shell configurations under `home/shell`, and I can set the shell I want to use with `my.home.shell.name`. The first step is to move the modules for fish and zsh under `home/shell`, add an interface to pick which one I want to use, and modify the `host/home.nix` configuration to keep using zsh with the new interface. Change-Id: Idb66b1a6fcc11a6eeaf5fd2d32dd3698d2d85bdf Reviewed-on: https://cl.fcuny.net/c/world/+/455 Tested-by: CI Reviewed-by: Franck Cuny --- home/direnv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/direnv/default.nix') diff --git a/home/direnv/default.nix b/home/direnv/default.nix index f36a66c..9d8d419 100644 --- a/home/direnv/default.nix +++ b/home/direnv/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.direnv; - fishEnabled = config.my.home.fish.enable; + fishEnabled = config.my.home.shell.name == "fish"; in { options.my.home.direnv = with lib; { -- cgit 1.4.1