From eafa0569c58dd2f1053329324c63e244a720f1e0 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 15 May 2024 14:27:01 +0300 Subject: [PATCH] Actually use crash --- flake.lock | 21 +++++++++++++++++++++ hosts/cube/forgejo/default.nix | 2 +- modules/nushell/default.nix | 9 ++++++++- modules/ssh/default.nix | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1657c83..907e909 100644 --- a/flake.lock +++ b/flake.lock @@ -41,6 +41,26 @@ "type": "gitlab" } }, + "crash": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715772335, + "narHash": "sha256-UJqH5daLJL9xWwMSUtxN+Fes3eGZZtcV+Vbj2am8+FY=", + "owner": "RGBCube", + "repo": "crash", + "rev": "d17a8c9d054d8404c94a1dff8356a36eea428698", + "type": "github" + }, + "original": { + "owner": "RGBCube", + "repo": "crash", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -629,6 +649,7 @@ "root": { "inputs": { "ageNix": "ageNix", + "crash": "crash", "fenix": "fenix", "ghostty": "ghostty", "ghosttyModule": "ghosttyModule", diff --git a/hosts/cube/forgejo/default.nix b/hosts/cube/forgejo/default.nix index 7e4c721..7244ccb 100644 --- a/hosts/cube/forgejo/default.nix +++ b/hosts/cube/forgejo/default.nix @@ -63,7 +63,7 @@ in systemConfiguration { }; }; - services.openssh.settings.AcceptEnv = mkForce "COLORTERM GIT_PROTOCOL"; + services.openssh.settings.AcceptEnv = mkForce "SHELLS COLOTERM GIT_PROTOCOL"; services.forgejo = enabled { lfs = enabled; diff --git a/modules/nushell/default.nix b/modules/nushell/default.nix index be6f692..c633ae6 100644 --- a/modules/nushell/default.nix +++ b/modules/nushell/default.nix @@ -1,7 +1,14 @@ { config, lib, pkgs, ... }: with lib; merge (systemConfiguration { - users.defaultUserShell = pkgs.nushellFull; + users.defaultUserShell = pkgs.crash; + environment.sessionVariables.SHELLS = pipe [ + pkgs.nushellFull + pkgs.fish + ] [ + (map getExe) + (concatStringsSep ":") + ]; environment.shellAliases = { la = "ls --all"; diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix index b2f8981..80d3a59 100644 --- a/modules/ssh/default.nix +++ b/modules/ssh/default.nix @@ -68,7 +68,7 @@ in serverSystemConfiguration { KbdInteractiveAuthentication = false; PasswordAuthentication = false; - AcceptEnv = "COLORTERM"; + AcceptEnv = "SHELLS COLORTERM"; }; }; })