add base-plus construct

This commit is contained in:
Tyler Starr 2025-03-18 22:21:07 -07:00
parent cb14ec7287
commit f5d2dbcbf2
12 changed files with 31 additions and 27 deletions

View File

@ -10,7 +10,7 @@
# Modules # Modules
modules = { modules = {
extra.enable = true; base-plus.enable = true;
desktop = { desktop = {
enable = true; enable = true;
gnome.enable = true; gnome.enable = true;

View File

@ -32,7 +32,7 @@
# Modules # Modules
modules = { modules = {
extra.enable = true; base-plus.enable = true;
desktop = { desktop = {
enable = true; enable = true;
gnome.enable = true; gnome.enable = true;

View File

@ -28,7 +28,7 @@
# Modules # Modules
modules = { modules = {
extra.enable = true; base-plus.enable = true;
desktop = { desktop = {
enable = true; enable = true;
gnome.enable = true; gnome.enable = true;

View File

@ -14,7 +14,7 @@
# Modules # Modules
modules = { modules = {
extra.enable = true; base-plus.enable = true;
desktop = { desktop = {
enable = true; enable = true;
gnome.enable = true; gnome.enable = true;

View File

@ -92,7 +92,7 @@
# Modules # Modules
modules = { modules = {
extra.enable = true; base-plus.enable = true;
services = { services = {
ssh.enable = true; ssh.enable = true;
syncthing = { syncthing = {

View File

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
./terminal.nix ./terminal.nix
./plus
../programs/chezmoi.nix ../programs/chezmoi.nix
../programs/git.nix ../programs/git.nix
../programs/nvim.nix ../programs/nvim.nix

View File

@ -0,0 +1,9 @@
{ lib, ... }:
{
imports = [
../../programs/beancount.nix
../../programs/borg.nix
../../programs/yt-dlp.nix
];
options.modules.base-plus.enable = lib.mkEnableOption "base-plus";
}

View File

@ -4,7 +4,6 @@
./base ./base
./desktop ./desktop
./devel ./devel
./extra
./gaming ./gaming
./programs ./programs
./services ./services

View File

@ -1,9 +0,0 @@
{ lib, ... }:
{
imports = [
../programs/beancount.nix
../programs/borg.nix
../programs/yt-dlp.nix
];
options.modules.extra.enable = lib.mkEnableOption "extra";
}

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
let cfg = config.modules.extra; let cfg = config.modules.base-plus;
in { in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@ -1,6 +1,6 @@
{ config, pkgs, user, lib, ... }: { config, pkgs, user, lib, ... }:
let cfg = config.modules.extra; let cfg = config.modules.base-plus;
in { in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@ -1,12 +1,16 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
{
environment.systemPackages = with pkgs; [ let cfg = config.modules.base-plus;
yt-dlp # Command-line tool to download videos in {
(pkgs.writeScriptBin "ytd_audio" '' config = lib.mkIf cfg.enable {
#!/usr/bin/env bash environment.systemPackages = with pkgs; [
yt-dlp -x \ yt-dlp # Command-line tool to download videos
-ciw -o "%(title)s.%(ext)s" \ (pkgs.writeScriptBin "ytd_audio" ''
--embed-thumbnail -S acodec:m4a "$1" #!/usr/bin/env bash
'') yt-dlp -x \
]; -ciw -o "%(title)s.%(ext)s" \
--embed-thumbnail -S acodec:m4a "$1"
'')
];
};
} }