about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <fcuny@roblox.com>2024-04-19 09:20:57 -0700
committerFranck Cuny <fcuny@roblox.com>2024-04-19 09:20:57 -0700
commitf5400b6fb0c3cb57a2950b027da41d44204cdcd4 (patch)
tree11c157a4178b6a76b7ba52d402e3c8042e3004f1
parentmove the `slocalc` to a python script (diff)
downloadworld-f5400b6fb0c3cb57a2950b027da41d44204cdcd4.tar.gz
switch to fish as the default shell
-rw-r--r--nix/hosts/mba/default.nix6
-rw-r--r--nix/hosts/work/default.nix6
-rw-r--r--nix/profiles/home-manager/fish.nix8
-rw-r--r--nix/profiles/home-manager/personal.nix1
-rw-r--r--nix/profiles/home-manager/work.nix1
5 files changed, 20 insertions, 2 deletions
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