added fonts and programs nix
This commit is contained in:
@@ -7,16 +7,4 @@
|
||||
./hardware-configuration.nix
|
||||
../../modules/system/default.nix
|
||||
];
|
||||
|
||||
programs = {
|
||||
ssh.extraConfig = myConfig.ssh.extraConfig;
|
||||
bash.interactiveShellInit = ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
|
||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
zsh.enable = true;
|
||||
fish.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
../../system/services.nix
|
||||
../../system/user.nix
|
||||
../../system/version.nix
|
||||
../../system/fonts.nix
|
||||
../../system/programs.nix
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{pkgs, ...}: {
|
||||
programs = {
|
||||
ssh.extraConfig = myConfig.ssh.extraConfig;
|
||||
bash.interactiveShellInit = ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
|
||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
fish.enable = true;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user