feat(homes/rafiq): switch to fish shell

This commit is contained in:
Mohammad Rafiq 2025-07-02 17:48:27 +08:00
parent b9ad8ac2ca
commit 1f70a57e11
No known key found for this signature in database
3 changed files with 10 additions and 29 deletions

View file

@ -7,23 +7,8 @@ let
in in
{ {
home.shell.enableShellIntegration = true; home.shell.enableShellIntegration = true;
#TODO: change to fish home.sessionVariables.SHELL = "fish";
home.sessionVariables.SHELL = "zsh"; programs.fish.enable = true;
programs.zsh = {
enable = true;
enableVteIntegration = true;
syntaxHighlighting.enable = true;
historySubstringSearch.enable = true;
history = {
append = true;
extended = true;
ignoreDups = true;
ignoreSpace = true;
save = 10000;
share = true;
size = 10000;
};
};
programs.zsh.initContent = programs.zsh.initContent =
mkOrder 1200 mkOrder 1200
# zsh # zsh

View file

@ -11,6 +11,7 @@ let
str str
coercedTo coercedTo
submodule submodule
shellPackage
; ;
inherit (lib.pantheon) mkStrOption; inherit (lib.pantheon) mkStrOption;
inherit (lib.snowfall.fs) get-file; inherit (lib.snowfall.fs) get-file;
@ -43,6 +44,9 @@ in
name = mkStrOption; name = mkStrOption;
publicKey = mkStrOption; publicKey = mkStrOption;
email = mkStrOption; email = mkStrOption;
shell = mkOption {
type = shellPackage;
};
}; };
persistDirs = mkOption { persistDirs = mkOption {
type = listOf (coercedTo str (d: { directory = d; }) rootDir); type = listOf (coercedTo str (d: { directory = d; }) rootDir);
@ -78,6 +82,7 @@ in
members = [ "${config.mainUser.name}" ]; members = [ "${config.mainUser.name}" ];
}; };
users."${config.mainUser.name}" = { users."${config.mainUser.name}" = {
inherit (config.mainUser) shell;
uid = 1000; uid = 1000;
isNormalUser = true; isNormalUser = true;
hashedPasswordFile = config.sops.secrets."${config.mainUser.name}/hashedPassword".path; hashedPasswordFile = config.sops.secrets."${config.mainUser.name}/hashedPassword".path;

View file

@ -1,22 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
let
inherit (pkgs) zsh;
in
{ {
mainUser = { mainUser = {
name = "rafiq"; name = "rafiq";
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n";
email = "rafiq@rrv.sh"; email = "rafiq@rrv.sh";
shell = pkgs.fish;
}; };
server.mountHelios = true; server.mountHelios = true;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml"; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
users.defaultUserShell = zsh; programs.fish.enable = true;
programs = { programs.nix-ld.enable = true;
zsh.enable = true;
zsh.enableCompletion = true;
nix-ld = {
enable = true;
libraries = with pkgs; [ ];
};
};
} }