refactor(systemModules:shell): move shell module to reflect changes to how user shell is defined
This commit is contained in:
parent
956ae9448e
commit
f2e28fa618
7 changed files with 57 additions and 64 deletions
|
|
@ -1,17 +0,0 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkIf;
|
||||
userShell = config.systemModules.user.shell;
|
||||
in
|
||||
|
||||
{
|
||||
config = mkIf (userShell == "bash") {
|
||||
users.users.ooks.shell = pkgs.bash;
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
};
|
||||
environment.pathsToLink = ["/share/bash-completion"];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) types mkOption;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
./fish
|
||||
./bash
|
||||
./zsh
|
||||
];
|
||||
|
||||
options.systemModules.user.shell = mkOption {
|
||||
type = types.enum ["fish" "zsh" "bash"];
|
||||
default = "zsh";
|
||||
description = "The user shell to use. Select from 'zsh' 'bash' 'fish'";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkIf;
|
||||
userShell = config.systemModules.user.shell;
|
||||
in
|
||||
|
||||
{
|
||||
config = mkIf (userShell == "fish") {
|
||||
users.users.ooks.shell = pkgs.fish;
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
vendor = {
|
||||
completions.enable = true;
|
||||
config.enable = true;
|
||||
functions.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkIf;
|
||||
userShell = config.systemModules.user.shell;
|
||||
in
|
||||
|
||||
{
|
||||
config = mkIf (userShell == "zsh") {
|
||||
users.users.ooks.shell = pkgs.zsh;
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
autosuggestions = {
|
||||
enable = true;
|
||||
async = true;
|
||||
};
|
||||
};
|
||||
environment.pathsToLink = ["/share/zsh"];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue