m3ta-chiron
7601583928
The exported M3_SHELL_TO_NU marker leaked into programs started from
nu (zellij, zed, herdr), keeping their spawned terminals in bash.
Decide via /proc/$PPID/comm instead: interactive bash whose parent is
neither nu nor bash execs into nu; a deliberate 'bash' started from
nu/bash stays bash. Non-interactive bash (ssh command exec, Mosh app
bootstrap, see 765ae15) is still covered by the $- == *i* check.
98 lines
2.7 KiB
Nix
98 lines
2.7 KiB
Nix
# Common configuration for all hosts
|
|
{
|
|
config,
|
|
pkgs,
|
|
lib,
|
|
inputs,
|
|
outputs,
|
|
system,
|
|
...
|
|
}: {
|
|
imports = [
|
|
./extraServices
|
|
./ports.nix
|
|
./users
|
|
inputs.home-manager.nixosModules.home-manager
|
|
];
|
|
|
|
environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
|
|
|
|
home-manager = {
|
|
useGlobalPkgs = true;
|
|
useUserPackages = true;
|
|
extraSpecialArgs = {
|
|
inputs = inputs // {agents = null;};
|
|
inherit outputs system;
|
|
videoDrivers = config.services.xserver.videoDrivers or [];
|
|
};
|
|
};
|
|
|
|
nixpkgs = {
|
|
# You can add overlays here
|
|
overlays = [
|
|
# Add overlays your own flake exports (from overlays and pkgs dir):
|
|
#outputs.overlays.additions
|
|
outputs.overlays.modifications
|
|
outputs.overlays.stable-packages
|
|
# outputs.overlays.locked-packages
|
|
# outputs.overlays.pinned-packages
|
|
outputs.overlays.master-packages
|
|
|
|
inputs.m3ta-nixpkgs.overlays.default
|
|
# inputs.m3ta-nixpkgs.overlays.modifications
|
|
(outputs.lib.mkLlmAgentsOverlay system)
|
|
# You can also add overlays exported from other flakes:
|
|
# neovim-nightly-overlay.overlays.default
|
|
|
|
# Or define it inline, for example:
|
|
# (final: prev: {
|
|
# hi = final.hello.overrideAttrs (oldAttrs: {
|
|
# patches = [ ./change-hello-to-hi.patch ];
|
|
# });
|
|
# })
|
|
];
|
|
# Configure your nixpkgs instance
|
|
config = {
|
|
# Disable if you don't want unfree packages
|
|
allowUnfree = true;
|
|
};
|
|
};
|
|
|
|
nix = {
|
|
settings = {
|
|
experimental-features = "nix-command flakes";
|
|
cores = 2;
|
|
max-jobs = 8;
|
|
trusted-users = [
|
|
"root"
|
|
"m3tam3re"
|
|
]; # Set users that are allowed to use the flake command
|
|
};
|
|
# Garbage collection is handled by programs.nh.clean on each host.
|
|
# Keep nix.gc.automatic disabled to avoid dueling GC timers.
|
|
optimise.automatic = true;
|
|
registry =
|
|
(lib.mapAttrs (_: flake: {inherit flake;}))
|
|
((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
|
nixPath = ["/etc/nix/path"];
|
|
};
|
|
users.defaultUserShell = pkgs.bashInteractive;
|
|
programs.bash = {
|
|
enable = true;
|
|
interactiveShellInit = ''
|
|
# Interactive bash -> nushell, unless started deliberately from
|
|
# nu/bash (parent check — an exported env marker would leak into
|
|
# zellij/zed/herdr children). Non-interactive bash (ssh command
|
|
# exec, Mosh app bootstrap) stays bash.
|
|
if [[ $- == *i* ]]; then
|
|
parent=""
|
|
[[ -r /proc/$PPID/comm ]] && IFS= read -r parent < /proc/$PPID/comm
|
|
if [[ "$parent" != "nu" && "$parent" != "bash" ]]; then
|
|
exec ${pkgs.nushell}/bin/nu --login
|
|
fi
|
|
unset parent
|
|
fi
|
|
'';
|
|
};
|
|
}
|