From 8b759c24e6551b274b96e7c54047d874fe8373d2 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Tue, 23 Jul 2019 23:55:41 +0200
Subject: [PATCH] bash: add logoutExtra option

---
 modules/programs/bash.nix                     | 17 ++++++++++++++
 tests/modules/programs/bash/default.nix       |  1 +
 .../modules/programs/bash/logout-expected.txt |  4 ++++
 tests/modules/programs/bash/logout.nix        | 22 +++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 tests/modules/programs/bash/logout-expected.txt
 create mode 100644 tests/modules/programs/bash/logout.nix

diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 98f149066..82a9fbe8f 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -123,6 +123,15 @@ in
           interactive shell.
         '';
       };
+
+      logoutExtra = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra commands that should be run when logging out of an
+          interactive shell.
+        '';
+      };
     };
   };
 
@@ -195,6 +204,14 @@ in
         ${cfg.bashrcExtra}
       '';
 
+      home.file.".bash_logout" = mkIf (cfg.logoutExtra != "") {
+        text = ''
+          # -*- mode: sh -*-
+
+          ${cfg.logoutExtra}
+        '';
+      };
+
       home.packages =
         optional (cfg.enableAutojump) pkgs.autojump;
     }
diff --git a/tests/modules/programs/bash/default.nix b/tests/modules/programs/bash/default.nix
index 0d361adf7..e9f431cd2 100644
--- a/tests/modules/programs/bash/default.nix
+++ b/tests/modules/programs/bash/default.nix
@@ -1,3 +1,4 @@
 {
+  bash-logout = ./logout.nix;
   bash-session-variables = ./session-variables.nix;
 }
diff --git a/tests/modules/programs/bash/logout-expected.txt b/tests/modules/programs/bash/logout-expected.txt
new file mode 100644
index 000000000..9462f58f7
--- /dev/null
+++ b/tests/modules/programs/bash/logout-expected.txt
@@ -0,0 +1,4 @@
+# -*- mode: sh -*-
+
+clear-console
+
diff --git a/tests/modules/programs/bash/logout.nix b/tests/modules/programs/bash/logout.nix
new file mode 100644
index 000000000..8f96dc7e1
--- /dev/null
+++ b/tests/modules/programs/bash/logout.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    programs.bash = {
+      enable = true;
+
+      logoutExtra = ''
+        clear-console
+      '';
+    };
+
+    nmt.script = ''
+      assertFileExists home-files/.bash_logout
+      assertFileContent \
+        home-files/.bash_logout \
+        ${./logout-expected.txt}
+    '';
+  };
+}