ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(treewide): clean-up, flatten, rework module system

Browse source
This commit is contained in:
ooks-io 2024-06-05 22:56:07 +12:00
parent 4ddf9d2b35
commit 5590c8a951
58 changed files with 397 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

10
home/modules/console/shell/bash/default.nix
View file

@ -1,9 +1,13 @@
{ config, lib, ... }:
{ config, lib, osConfig, ... }:
let
cfg = config.ooknet.console.shell.bash;
inherit (lib) mkIf;
cfg = config.ooknet.shell.bash;
admin = osConfig.ooknet.host.admin;
in
{
config = lib.mkIf cfg.enable {
config = mkIf (cfg.enable || admin.shell == "bash") {
programs.bash.enable = true;
};
}

10
home/modules/console/shell/default.nix
View file

@ -1,17 +1,7 @@
{ lib, ... }:
{
imports = [
./fish
./bash
./zsh
];
options.ooknet.console.shell = {
fish = {
enable = lib.mkEnableOption "Enable fish configuration";
};
bash = {
enable = lib.mkEnableOption "Enable bash configuration";
};
};
}

13
home/modules/console/shell/fish/default.nix
View file

@ -1,14 +1,15 @@
{ lib, config, ... }:
{ lib, config, osConfig, ... }:
let
cfg = config.ooknet.console.shell.fish;
inherit (lib) mkIf;
hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages;
inherit (lib) mkIf any;
cfg = config.ooknet.shell.fish;
admin = osConfig.ooknet.host.admin;
hasPackage = pname: any (p: p ? pname && p.pname == pname) config.home.packages;
hasEza = hasPackage "eza";
hasBat = hasPackage "bat";
in
{
config = {
programs.fish = mkIf cfg.enable {
config = mkIf (cfg.enable || admin.shell == "fish") {
programs.fish = {
enable = true;
shellAbbrs = {
fe = "cd $FLAKE; $EDITOR $FLAKE";

11
home/modules/console/shell/zsh/default.nix
View file

@ -1,14 +1,13 @@
{ lib, config, ... }:
{ lib, config, osConfig, ... }:
let
inherit (lib) mkIf mkEnableOption;
cfg = config.ooknet.console.shell.zsh;
inherit (lib) mkIf;
cfg = config.ooknet.shell.zsh;
admin = osConfig.ooknet.host.admin;
in
{
options.ooknet.console.shell.zsh.enable = mkEnableOption "";
config = mkIf cfg.enable {
config = mkIf (cfg.enable || admin.shell == "zsh") {
programs.zsh = {
enable = true;
autocd = true;