aboutsummaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-06-19 15:57:45 -0700
committerFranck Cuny <franck@fcuny.net>2022-06-20 14:39:35 -0700
commitb5c428822468b9a2dfb00a673c39e809f4ac0651 (patch)
tree54e2190f9b20ce11827d0d5b10da2a96c135437a /hosts
parentfeat(tools/seqstat): add a tool to report stats about a sequence (diff)
downloadinfra-b5c428822468b9a2dfb00a673c39e809f4ac0651.tar.gz
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 <franck@fcuny.net>
Diffstat (limited to 'hosts')
-rw-r--r--hosts/aptos/home.nix2
-rw-r--r--hosts/carmel/home.nix2
-rw-r--r--hosts/tahoe/home.nix4
3 files changed, 4 insertions, 4 deletions
diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix
index e317788..106497d 100644
--- a/hosts/aptos/home.nix
+++ b/hosts/aptos/home.nix
@@ -23,11 +23,11 @@
# terminal
direnv.enable = true;
gcloud.enable = true;
+ shell.name = "zsh";
ssh.enable = true;
terminal.program = "alacritty";
tmux.enable = true;
xdg.enable = true;
- zsh.enable = true;
# software development
emacs.enable = true;
diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix
index e317788..106497d 100644
--- a/hosts/carmel/home.nix
+++ b/hosts/carmel/home.nix
@@ -23,11 +23,11 @@
# terminal
direnv.enable = true;
gcloud.enable = true;
+ shell.name = "zsh";
ssh.enable = true;
terminal.program = "alacritty";
tmux.enable = true;
xdg.enable = true;
- zsh.enable = true;
# software development
emacs.enable = true;
diff --git a/hosts/tahoe/home.nix b/hosts/tahoe/home.nix
index dc9c0aa..c58d0d4 100644
--- a/hosts/tahoe/home.nix
+++ b/hosts/tahoe/home.nix
@@ -6,9 +6,9 @@
packages.enable = true;
# terminal
- tmux.enable = true;
+ shell.name = "zsh";
ssh.enable = true;
- zsh.enable = true;
+ tmux.enable = true;
# software development
git.enable = true;