aboutsummaryrefslogtreecommitdiff
path: root/home/fish/default.nix
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 /home/fish/default.nix
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 '')
-rw-r--r--home/fish/default.nix30
1 files changed, 0 insertions, 30 deletions
diff --git a/home/fish/default.nix b/home/fish/default.nix
deleted file mode 100644
index 7ff4bbe..0000000
--- a/home/fish/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
- cfg = config.my.home.fish;
- swayEnabled = config.my.home.wm.windowManager == "sway";
-in
-{
- options.my.home.fish = with lib; {
- enable = mkEnableOption "fish configuration";
- };
- config.programs.fish = lib.mkIf cfg.enable {
- enable = true;
- interactiveShellInit = ''
- set fish_greeting
-
- # Tmux on terminal start, unless we're in a SSH connection
- if status is-interactive
- if test -z "$SSH_CONNECTION"
- if not tmux has-session 2>/dev/null; or test -z "$TMUX"
- exec tmux new-session -A -s 0
- end
- end
- end
- '';
- loginShellInit = lib.mkIf swayEnabled ''
- if test -z "$DISPLAY"; and test (tty) = "/dev/tty1"
- exec sway
- end
- '';
- };
-}