mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-02-07 12:19:07 +00:00
users/foo-dogsquared/setups: reinit certain modules into setups
This commit is contained in:
parent
65cf940db7
commit
880738787f
@ -5,7 +5,6 @@
|
||||
|
||||
# All of the home-manager-user-specific setup are here.
|
||||
users.foo-dogsquared = {
|
||||
music.enable = true;
|
||||
dotfiles.enable = false;
|
||||
|
||||
programs = {
|
||||
@ -22,7 +21,10 @@
|
||||
terminal-multiplexer.enable = true;
|
||||
};
|
||||
|
||||
services.desktop.enable = true;
|
||||
setups = {
|
||||
desktop.enable = true;
|
||||
music.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# The keyfile required to decrypt the secrets.
|
||||
|
@ -1,7 +1,6 @@
|
||||
# Only optional modules should be imported here.
|
||||
{
|
||||
imports = [
|
||||
./music-setup.nix
|
||||
./dotfiles.nix
|
||||
|
||||
./programs/browsers.nix
|
||||
@ -12,6 +11,7 @@
|
||||
./programs/shell.nix
|
||||
./programs/terminal-multiplexer.nix
|
||||
|
||||
./services/desktop.nix
|
||||
./setups/desktop.nix
|
||||
./setups/music.nix
|
||||
];
|
||||
}
|
||||
|
@ -3,10 +3,10 @@
|
||||
|
||||
let
|
||||
userCfg = config.users.foo-dogsquared;
|
||||
cfg = userCfg.services.desktop;
|
||||
cfg = userCfg.setups.desktop;
|
||||
in
|
||||
{
|
||||
options.users.foo-dogsquared.services.desktop.enable = lib.mkEnableOption "a set of usual desktop productivity services";
|
||||
options.users.foo-dogsquared.setups.desktop.enable = lib.mkEnableOption "a set of usual desktop productivity services";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Self-inflicted telemetry.
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
userCfg = config.users.foo-dogsquared;
|
||||
cfg = userCfg.music;
|
||||
cfg = userCfg.setups.music;
|
||||
|
||||
ytdlpAudio = pkgs.writeScriptBin "yt-dlp-audio" ''
|
||||
${pkgs.yt-dlp}/bin/yt-dlp --config-location "${../../config/yt-dlp-audio.conf}" $@
|
||||
@ -12,7 +12,7 @@ let
|
||||
playlistsDir = "${musicDir}/playlists";
|
||||
in
|
||||
{
|
||||
options.users.foo-dogsquared.music = {
|
||||
options.users.foo-dogsquared.setups.music = {
|
||||
enable = lib.mkEnableOption "foo-dogsquared's music setup";
|
||||
mpd.enable = lib.mkEnableOption "foo-dogsquared's MPD server setup";
|
||||
};
|
Loading…
Reference in New Issue
Block a user