From e5a70822adf466d7a1eba954fc153a4aed0e3e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20K=C3=A4nner?= Date: Sat, 18 May 2024 23:05:04 +0200 Subject: [PATCH] 316 current 1970-01-01 01:00:00 23.11.20240514.9ddcaff 6.1.90 * --- hosts/MaxNixosLaptop/configuration.nix | 9 +-------- modules/nixos/default.nix | 7 +++++++ modules/nixos/music.nix | 18 ++++++++++++++++++ modules/nixos/sway.nix | 2 +- 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 modules/nixos/default.nix create mode 100644 modules/nixos/music.nix diff --git a/hosts/MaxNixosLaptop/configuration.nix b/hosts/MaxNixosLaptop/configuration.nix index 91071aa..2b7faa2 100644 --- a/hosts/MaxNixosLaptop/configuration.nix +++ b/hosts/MaxNixosLaptop/configuration.nix @@ -10,14 +10,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - # script for rebuilding nixos - ../../modules/nixos/rebuild.nix - ../../modules/nixos/wifi.nix - ../../modules/nixos/sops.nix - # greetd login manager - ../../modules/nixos/greetd.nix - # sway as window manager - ../../modules/nixos/sway.nix + ../../modules/nixos inputs.home-manager.nixosModules.default ]; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..ff67e0d --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [./greetd.nix ./rebuild.nix ./sops.nix ./sway.nix ./wifi.nix ./music.nix]; + + config = { + music.enable = true; + }; +} diff --git a/modules/nixos/music.nix b/modules/nixos/music.nix new file mode 100644 index 0000000..0b330f6 --- /dev/null +++ b/modules/nixos/music.nix @@ -0,0 +1,18 @@ +{ + lib, + config, + ... +}: let + cfg = config.music; +in { + options = { + music.enable = lib.mkEnableOption "sound system"; + }; + + config = lib.mkIf cfg.enable { + musnix = { + enable = true; + rtcqs.enable = true; + }; + }; +} diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index 1c7af82..29592c0 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -1,7 +1,7 @@ { + lib, config, pkgs, - lib, ... }: { environment.systemPackages = with pkgs; [