diff options
Diffstat (limited to 'users/grfn/system/system')
-rw-r--r-- | users/grfn/system/system/default.nix | 6 | ||||
-rw-r--r-- | users/grfn/system/system/modules/common.nix | 2 | ||||
-rw-r--r-- | users/grfn/system/system/modules/sound.nix | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/users/grfn/system/system/default.nix b/users/grfn/system/system/default.nix index 9db9570ea00e..503b3a2046b5 100644 --- a/users/grfn/system/system/default.nix +++ b/users/grfn/system/system/default.nix @@ -21,12 +21,12 @@ rec { "${pkgs.home-manager.src}/nixos" ]; + # Use the same nixpkgs as everything else + home-manager.useGlobalPkgs = true; + home-manager.users.grfn = { config, lib, ... }: { imports = [ ../home/machines/roswell.nix ]; lib.depot = depot; - _module.args.pkgs = lib.mkForce - (import pkgs.path - (lib.filterAttrs (n: v: v != null) config.nixpkgs)); }; })).system; diff --git a/users/grfn/system/system/modules/common.nix b/users/grfn/system/system/modules/common.nix index 9662f255b679..f25c9ff3288c 100644 --- a/users/grfn/system/system/modules/common.nix +++ b/users/grfn/system/system/modules/common.nix @@ -56,8 +56,6 @@ with lib; shell = pkgs.zsh; }; - nixpkgs.config.allowUnfree = true; - nix = { trustedUsers = [ "grfn" ]; autoOptimiseStore = true; diff --git a/users/grfn/system/system/modules/sound.nix b/users/grfn/system/system/modules/sound.nix index 15c8dd5e3f92..07a67a1ec43b 100644 --- a/users/grfn/system/system/modules/sound.nix +++ b/users/grfn/system/system/modules/sound.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: + { # Enable sound. sound.enable = true; hardware.pulseaudio.enable = true; - nixpkgs.config.pulseaudio = true; environment.systemPackages = with pkgs; [ pulseaudio-ctl |