Merge branch 'fish' into 'main'

switch to fish

See merge request https://git.cything.io/cy/infra/-/merge_requests/4

home/fish.nix

@@ -0,0 +1,46 @@
+{ ... }:
+{
+  programs.fish = {
+    enable = true;
+    shellAliases = {
+      "vi" = "nvim";
+      "vim" = "nvim";
+      "t" = "tmux";
+      "tl" = "tmux list-sessions";
+      "ta" = "tmux new-session -A -s";
+      "se" = "sudoedit";
+      "s" = "sudo";
+      "nrs" = "sudo nixos-rebuild switch --flake .";
+      "nrt" = "sudo nixos-rebuild test --flake .";
+      "hrs" = "home-manager switch --flake .";
+      "g" = "git";
+      "ga" = "git add";
+      "gaa" = "git add --all";
+      "gb" = "git branch";
+      "gc" = "git commit --verbose";
+      "gcmsg" = "git commit --message";
+      "gd" = "git diff";
+      "gdca" = "git diff --cached";
+      "gds" = "git diff --staged";
+      "gl" = "git log --stat";
+      "glg" = "git log --graph";
+      "glga" = "git log --graph --decorate --all";
+      "glo" = "git log --oneline --decorate";
+      "gp" = "git push";
+      "gr" = "git remote";
+      "gra" = "git remote add";
+      "grv" = "git remote --verbose";
+      "gs" = "git status --short";
+      "gss" = "git status";
+    };
+
+    shellInit = ''
+      set fish_greeting
+    '';
+  };
+
+  programs.fzf.enableFishIntegration = true;
+  programs.zoxide.enableFishIntegration = true;
+  programs.eza.enableFishIntegration = true;
+  programs.nix-index.enableFishIntegration = true;
+}

home/yt/common.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ../tmux.nix
-    ../zsh
+    ../fish.nix
   ];
 
   home.sessionVariables = {
@@ -19,4 +19,9 @@
     man
     man-db
   ];
+
+  programs.zoxide.options = [ "--cmd cd" ];
+  programs.fzf.enable = true;
+  programs.zoxide.enable = true;
+  programs.eza.enable = true;
 }

home/zsh/default.nix

@@ -84,19 +84,8 @@
     };
   };
 
-  programs.fzf = {
+  programs.fzf.enableZshIntegration = true;
-    enable = true;
+  programs.zoxide.enableZshIntegration = true;
-    enableZshIntegration = true;
+  programs.eza.enableZshIntegration = true;
-  };
+  programs.nix-index.enableZshIntegration = true;
-
-  programs.zoxide = {
-    enable = true;
-    enableZshIntegration = true;
-    options = [ "--cmd cd" ];
-  };
-
-  programs.eza = {
-    enable = true;
-    enableZshIntegration = true;
-  };
 }

hosts/chunk/default.nix

@@ -156,9 +156,7 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdhAQYy0+vS+QmyCd0MAbqbgzyMGcsuuFyf6kg2yKge yt@ytlinux"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINyn2+OoRN4nExti+vFQ1NHEZip0slAoCH9C5/FzvgZD yt@ytnix"
     ];
-    shell = pkgs.zsh;
   };
-  programs.zsh.enable = true;
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdhAQYy0+vS+QmyCd0MAbqbgzyMGcsuuFyf6kg2yKge yt@ytlinux"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINyn2+OoRN4nExti+vFQ1NHEZip0slAoCH9C5/FzvgZD yt@ytnix"

hosts/common.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{pkgs, ... }:
 {
   nix = {
     settings = {
@@ -20,4 +20,12 @@
   };
   time.timeZone = "America/Toronto";
   networking.firewall.logRefusedConnections = false;
+
+  # this is true by default and mutually exclusive with
+  # programs.nix-index
+  programs.command-not-found.enable = false;
+  programs.nix-index.enable = true;
+
+  users.users.yt.shell = pkgs.fish;
+  programs.fish.enable = true;
 }

hosts/ytnix/default.nix

@@ -115,9 +115,7 @@
       "libvirtd"
       "docker"
     ];
-    shell = pkgs.zsh;
   };
-  programs.zsh.enable = true;
 
   environment.systemPackages = with pkgs; [
     tmux
@@ -281,14 +279,6 @@
   programs.nix-ld.enable = true;
   programs.evolution.enable = true;
 
-  # this is true by default and mutually exclusive with
-  # programs.nix-index
-  programs.command-not-found.enable = false;
-  programs.nix-index = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
   xdg.portal = {
     enable = true;
     wlr.enable = true;