diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-19T22·09+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-20T10·43+0000 |
| commit | b75dd136cbfccdd27dd836eea92aeda5569699fd (patch) | |
| tree | 62af9ba36783d017ee1d447bbccef9da4e6d387f /users/grfn/system/system | |
| parent | 5f19e8e6a73f7d76fa4bb62036891e824b64b515 (diff) | |
refactor(grfn): Stop importing nixpkgs a bunch of times r/2528
Once is enough! <grfn> https://tazj.in/blobs/touch-garbage.jpg Change-Id: I68f66669e82d35a71752638450fa4b820e137172 Signed-Off-By: Florian Klink <flokli@flokli.de> Reviewed-on: https://cl.tvl.fyi/c/depot/+/3048 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to '')
| -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 9db9570ea0..503b3a2046 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 9662f255b6..f25c9ff328 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 15c8dd5e3f..07a67a1ec4 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 |