diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/darwin/home.nix | 3 | ||||
| -rw-r--r-- | hosts/nixos/audio.nix | 6 | ||||
| -rw-r--r-- | hosts/nixos/home.nix | 1 | ||||
| -rw-r--r-- | hosts/nixos/wooting.nix | 7 |
5 files changed, 7 insertions, 12 deletions
@@ -44,6 +44,7 @@ home-manager.users.leander = import ./hosts/nixos/home.nix; home-manager.sharedModules = [ + inputs.spicetify-nix.homeManagerModules.spicetify inputs.nixcord.homeModules.nixcord inputs.nvf.homeManagerModules.nvf ]; @@ -65,6 +66,7 @@ home-manager.users.${username} = import ./hosts/darwin/home.nix; home-manager.sharedModules = [ + inputs.spicetify-nix.homeManagerModules.spicetify inputs.nixcord.homeModules.nixcord inputs.nvf.homeManagerModules.nvf ]; diff --git a/hosts/darwin/home.nix b/hosts/darwin/home.nix index 11b0c96..cdd49b4 100644 --- a/hosts/darwin/home.nix +++ b/hosts/darwin/home.nix @@ -2,7 +2,6 @@ { imports = [ - inputs.spicetify-nix.homeManagerModules.spicetify ../../modules ]; @@ -44,4 +43,4 @@ vscode.enable = true; home.stateVersion = "24.11"; -} +}
\ No newline at end of file diff --git a/hosts/nixos/audio.nix b/hosts/nixos/audio.nix index e4d9bdf..e64e969 100644 --- a/hosts/nixos/audio.nix +++ b/hosts/nixos/audio.nix @@ -1,10 +1,8 @@ { config, pkgs, lib, ... }: -let - cfg = config.audio; -in { +{ options.audio.enable = lib.mkEnableOption "Enable audio with pipewire"; - config = lib.mkIf cfg.enable { + config = lib.mkIf config.audio.enable { security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/hosts/nixos/home.nix b/hosts/nixos/home.nix index a6226e2..efb5080 100644 --- a/hosts/nixos/home.nix +++ b/hosts/nixos/home.nix @@ -2,7 +2,6 @@ { imports = [ - inputs.spicetify-nix.homeManagerModules.spicetify ../../modules ]; diff --git a/hosts/nixos/wooting.nix b/hosts/nixos/wooting.nix index 2a4b66c..e6217cd 100644 --- a/hosts/nixos/wooting.nix +++ b/hosts/nixos/wooting.nix @@ -1,11 +1,8 @@ { config, lib, pkgs, ... }: -let - cfg = config.wooting; -in { +{ options.wooting.enable = lib.mkEnableOption "Enable Wooting udev rules"; - - config = lib.mkIf cfg.enable { + config = lib.mkIf config.wooting.enable { services.udev.extraRules = '' # Wooting One Legacy SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" |