From 325a9aa0cf6671e18b5371754932e3b067f2ed02 Mon Sep 17 00:00:00 2001 From: Veneficium <85629831+veneficium42@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:56:54 +0100 Subject: [PATCH] nixos-modules: add dash shell and enable by default --- modules/nixos/default.nix | 22 +++++++++++++++------- modules/nixos/programs/dash.nix | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 modules/nixos/programs/dash.nix diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index f5122b8..042ee53 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -26,6 +26,7 @@ ./programs/tailscale.nix ./programs/powertop.nix ./programs/gnupg.nix + ./programs/dash.nix ./programs/tuigreet.nix ./programs/niri.nix @@ -35,13 +36,20 @@ users.fedfer.enable = lib.mkDefault false; users.veneficium.enable = lib.mkDefault false; - programs.docker.enable = lib.mkDefault false; - programs.tailscale.enable = lib.mkDefault false; - programs.powertop.enable = lib.mkDefault true; - programs.gnupg.enable = lib.mkDefault true; - programs.gnupg.ssh = lib.mkDefault true; - programs.niri.enable = lib.mkDefault false; - programs.tuigreet.enable = lib.mkDefault false; + programs = { + tailscale.enable = lib.mkDefault false; + + powertop.enable = lib.mkDefault true; + gnupg.enable = lib.mkDefault true; + gnupg.ssh = lib.mkDefault true; + + niri.enable = lib.mkDefault false; + tuigreet.enable = lib.mkDefault false; + docker.enable = lib.mkDefault false; + + dash.enable = lib.mkDefault true; + dash.symlink_sh = lib.mkDefault true; + }; drivers = { printer.M2020.enable = lib.mkDefault false; diff --git a/modules/nixos/programs/dash.nix b/modules/nixos/programs/dash.nix new file mode 100644 index 0000000..6d8d0b3 --- /dev/null +++ b/modules/nixos/programs/dash.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + options.programs.dash = { + enable = lib.mkEnableOption "Enable the dash shell"; + symlink_sh = lib.mkEnableOption "Symlink dash to /bin/sh"; + }; + + config = lib.mkIf config.programs.dash.enable { + environment.systemPackages = [ pkgs.dash ]; + environment.binsh = lib.mkIf config.programs.dash.symlink_sh "${pkgs.dash}/bin/dash"; + }; +}