foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-07 18:19:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

users/foo-dogsquared/setups: reinit certain modules into setups

Browse Source
This commit is contained in:
Gabriel Arazas 2023-12-13 11:13:52 +08:00
parent 65cf940db7
commit 880738787f
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
users/home-manager/foo-dogsquared/default.nix
View File

@ -5,7 +5,6 @@
# All of the home-manager-user-specific setup are here. # All of the home-manager-user-specific setup are here.
users.foo-dogsquared = { users.foo-dogsquared = {
music.enable = true;
dotfiles.enable = false; dotfiles.enable = false;
programs = { programs = {
@ -22,7 +21,10 @@
terminal-multiplexer.enable = true; terminal-multiplexer.enable = true;
}; };
services.desktop.enable = true; setups = {
desktop.enable = true;
music.enable = true;
};
}; };
# The keyfile required to decrypt the secrets. # The keyfile required to decrypt the secrets.

4
users/home-manager/foo-dogsquared/modules/default.nix
View File

@ -1,7 +1,6 @@
# Only optional modules should be imported here. # Only optional modules should be imported here.
{ {
imports = [ imports = [
./music-setup.nix
./dotfiles.nix ./dotfiles.nix
./programs/browsers.nix ./programs/browsers.nix
@ -12,6 +11,7 @@
./programs/shell.nix ./programs/shell.nix
./programs/terminal-multiplexer.nix ./programs/terminal-multiplexer.nix
./services/desktop.nix ./setups/desktop.nix
./setups/music.nix
]; ];
} }

4
users/home-manager/foo-dogsquared/modules/services/desktop.nix → users/home-manager/foo-dogsquared/modules/setups/desktop.nix
View File

@ -3,10 +3,10 @@
let let
userCfg = config.users.foo-dogsquared; userCfg = config.users.foo-dogsquared;
cfg = userCfg.services.desktop; cfg = userCfg.setups.desktop;
in 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 { config = lib.mkIf cfg.enable {
# Self-inflicted telemetry. # Self-inflicted telemetry.

4
users/home-manager/foo-dogsquared/modules/music-setup.nix → users/home-manager/foo-dogsquared/modules/setups/music.nix
View File

@ -2,7 +2,7 @@
let let
userCfg = config.users.foo-dogsquared; userCfg = config.users.foo-dogsquared;
cfg = userCfg.music; cfg = userCfg.setups.music;
ytdlpAudio = pkgs.writeScriptBin "yt-dlp-audio" '' ytdlpAudio = pkgs.writeScriptBin "yt-dlp-audio" ''
${pkgs.yt-dlp}/bin/yt-dlp --config-location "${../../config/yt-dlp-audio.conf}" $@ ${pkgs.yt-dlp}/bin/yt-dlp --config-location "${../../config/yt-dlp-audio.conf}" $@
@ -12,7 +12,7 @@ let
playlistsDir = "${musicDir}/playlists"; playlistsDir = "${musicDir}/playlists";
in in
{ {
options.users.foo-dogsquared.music = { options.users.foo-dogsquared.setups.music = {
enable = lib.mkEnableOption "foo-dogsquared's music setup"; enable = lib.mkEnableOption "foo-dogsquared's music setup";
mpd.enable = lib.mkEnableOption "foo-dogsquared's MPD server setup"; mpd.enable = lib.mkEnableOption "foo-dogsquared's MPD server setup";
}; };