From f5400b6fb0c3cb57a2950b027da41d44204cdcd4 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 19 Apr 2024 09:20:57 -0700 Subject: switch to fish as the default shell --- nix/hosts/mba/default.nix | 6 +++++- nix/hosts/work/default.nix | 6 +++++- nix/profiles/home-manager/fish.nix | 8 ++++++++ nix/profiles/home-manager/personal.nix | 1 + nix/profiles/home-manager/work.nix | 1 + 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 nix/profiles/home-manager/fish.nix diff --git a/nix/hosts/mba/default.nix b/nix/hosts/mba/default.nix index d583df6..a9779f8 100644 --- a/nix/hosts/mba/default.nix +++ b/nix/hosts/mba/default.nix @@ -1,10 +1,14 @@ -{ self, ... }: +{ pkgs, self, ... }: { services.nix-daemon.enable = true; programs.zsh.enable = true; + programs.fish.enable = true; + + environment.shells = [ pkgs.fish pkgs.zsh ]; users.users.fcuny.home = "/Users/fcuny"; + users.users.fcuny.shell = pkgs.fish; # Touch ID for sudo auth security.pam.enableSudoTouchIdAuth = true; diff --git a/nix/hosts/work/default.nix b/nix/hosts/work/default.nix index 24cb95e..895d9af 100644 --- a/nix/hosts/work/default.nix +++ b/nix/hosts/work/default.nix @@ -1,10 +1,14 @@ -{ self, ... }: +{ pkgs, self, ... }: { services.nix-daemon.enable = true; programs.zsh.enable = true; + programs.fish.enable = true; + + environment.shells = [ pkgs.fish pkgs.zsh ]; users.users.fcuny.home = "/Users/fcuny"; + users.users.fcuny.shell = pkgs.fish; # Touch ID for sudo auth security.pam.enableSudoTouchIdAuth = true; diff --git a/nix/profiles/home-manager/fish.nix b/nix/profiles/home-manager/fish.nix new file mode 100644 index 0000000..5a2610c --- /dev/null +++ b/nix/profiles/home-manager/fish.nix @@ -0,0 +1,8 @@ +{ ... }: { + programs.fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting "" + ''; + }; +} diff --git a/nix/profiles/home-manager/personal.nix b/nix/profiles/home-manager/personal.nix index dd4c9f9..68bcc8f 100644 --- a/nix/profiles/home-manager/personal.nix +++ b/nix/profiles/home-manager/personal.nix @@ -5,6 +5,7 @@ imports = [ ./dev.nix ./firefox.nix + ./fish.nix ./git.nix ./shell.nix ./ssh.nix diff --git a/nix/profiles/home-manager/work.nix b/nix/profiles/home-manager/work.nix index a9800cd..0643426 100644 --- a/nix/profiles/home-manager/work.nix +++ b/nix/profiles/home-manager/work.nix @@ -5,6 +5,7 @@ imports = [ ./dev.nix ./firefox.nix + ./fish.nix ./git.nix ./shell.nix ./ssh.nix -- cgit 1.4.1