From d5b8363d3d56f99fecbf657542a512e58951547d Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Mon, 20 Jun 2022 11:41:27 -0700
Subject: ref(home/shell): move all shell aliases to a shared configuration

By moving the aliases to a shared module, they can be used between zsh
and fish.

Change-Id: Ifcfe0af3b90825fe3a67bc1796d4cf65a58d3ff2
Reviewed-on: https://cl.fcuny.net/c/world/+/456
Reviewed-by: Franck Cuny <franck@fcuny.net>
Tested-by: CI
---
 home/shell/aliases.nix      |  4 ++++
 home/shell/default.nix      | 11 ++++++++++-
 home/shell/fish/default.nix |  2 ++
 home/shell/zsh/default.nix  |  9 ++++-----
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 home/shell/aliases.nix

(limited to 'home')

diff --git a/home/shell/aliases.nix b/home/shell/aliases.nix
new file mode 100644
index 0000000..003f253
--- /dev/null
+++ b/home/shell/aliases.nix
@@ -0,0 +1,4 @@
+{
+  ll = "ls -l --color=auto";
+  lt = "ls -ltrh --color=auto";
+}
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 35a6275..f34d997 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -1,7 +1,9 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-let cfg = config.my.home.shell;
+let
+  cfg = config.my.home.shell;
+  aliases = import ./aliases.nix;
 in
 {
   options.my.home.shell = {
@@ -10,6 +12,13 @@ in
       type = types.enum [ "fish" "zsh" ];
       example = "zsh";
     };
+    aliases = mkOption {
+      default = aliases;
+      description = ''
+        A wrapper for shellAliases for zsh and fish
+      '';
+      type = types.attrsOf types.str;
+    };
   };
 
   imports = [ ./fish ./zsh ];
diff --git a/home/shell/fish/default.nix b/home/shell/fish/default.nix
index 3a21b24..c81f188 100644
--- a/home/shell/fish/default.nix
+++ b/home/shell/fish/default.nix
@@ -2,11 +2,13 @@
 let
   cfg = config.my.home.shell;
   swayEnabled = config.my.home.wm.windowManager == "sway";
+  aliases = config.my.home.shell.aliases;
 in
 {
   config = lib.mkIf (cfg.name == "fish") {
     programs.fish = {
       enable = true;
+      shellAliases = aliases;
       interactiveShellInit = ''
         set fish_greeting
 
diff --git a/home/shell/zsh/default.nix b/home/shell/zsh/default.nix
index 14ddd6c..b5858e9 100644
--- a/home/shell/zsh/default.nix
+++ b/home/shell/zsh/default.nix
@@ -1,5 +1,7 @@
 { config, pkgs, lib, ... }:
-let cfg = config.my.home.shell;
+let
+  cfg = config.my.home.shell;
+  aliases = config.my.home.shell.aliases;
 in
 {
   config = lib.mkIf (cfg.name == "zsh") {
@@ -28,10 +30,7 @@ in
         REPORTTIME = 5;
       };
 
-      shellAliases = {
-        ll = "ls -l --color=auto";
-        lt = "ls -ltrh --color=auto";
-      };
+      shellAliases = aliases;
 
       defaultKeymap = "emacs";
 
-- 
cgit 1.4.1