From b75dd136cbfccdd27dd836eea92aeda5569699fd Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 20 Apr 2021 00:09:39 +0200 Subject: refactor(grfn): Stop importing nixpkgs a bunch of times Once is enough! https://tazj.in/blobs/touch-garbage.jpg Change-Id: I68f66669e82d35a71752638450fa4b820e137172 Signed-Off-By: Florian Klink Reviewed-on: https://cl.tvl.fyi/c/depot/+/3048 Tested-by: BuildkiteCI Reviewed-by: grfn --- users/grfn/system/home/common/legacy-dotfiles.nix | 8 -------- users/grfn/system/home/default.nix | 13 ++++++++----- users/grfn/system/home/machines/roswell.nix | 3 --- users/grfn/system/home/modules/common.nix | 2 -- users/grfn/system/home/modules/emacs.nix | 7 ------- users/grfn/system/home/modules/email.nix | 4 ---- users/grfn/system/system/default.nix | 6 +++--- users/grfn/system/system/modules/common.nix | 2 -- users/grfn/system/system/modules/sound.nix | 2 +- 9 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 users/grfn/system/home/common/legacy-dotfiles.nix (limited to 'users/grfn') diff --git a/users/grfn/system/home/common/legacy-dotfiles.nix b/users/grfn/system/home/common/legacy-dotfiles.nix deleted file mode 100644 index 33d9581e6a61..000000000000 --- a/users/grfn/system/home/common/legacy-dotfiles.nix +++ /dev/null @@ -1,8 +0,0 @@ -with import {}; -fetchgit { - url = "https://github.com/glittershark/dotfiles.git"; - rev = "e0c7f2592fbc2f9942763d2146d362a1314630e9"; - # date = "2020-03-25T20:38:51-04:00"; - sha256 = "126zy4ff6nl2vma2s74waksim7j5h3n6qpaxnnn17vkc1cq0fcd9"; - fetchSubmodules = false; -} diff --git a/users/grfn/system/home/default.nix b/users/grfn/system/home/default.nix index 1efba3f3c1e5..6221df95c3d3 100644 --- a/users/grfn/system/home/default.nix +++ b/users/grfn/system/home/default.nix @@ -5,13 +5,16 @@ with lib; rec { home = confPath: (import "${pkgs.home-manager.src}/modules" { inherit pkgs; - configuration = { config, lib, ... }: { - imports = [confPath]; - - _module.args.pkgs = mkForce - (import pkgs.path (filterAttrs (n: v: v != null) config.nixpkgs)); + configuration = { config, lib, ... }: { + imports = [ confPath ]; lib.depot = depot; + + # home-manager exposes no API to override the package set that + # is used, unless called from the NixOS module. + # + # To get around it, the module argument is overridden here. + _module.args.pkgs = mkForce pkgs; }; }); diff --git a/users/grfn/system/home/machines/roswell.nix b/users/grfn/system/home/machines/roswell.nix index 1b1bbf29c616..f68f3a7be36f 100644 --- a/users/grfn/system/home/machines/roswell.nix +++ b/users/grfn/system/home/machines/roswell.nix @@ -37,9 +37,6 @@ in cachix ]; - - nixpkgs.config.allowUnfree = true; - programs.password-store.enable = true; programs.home-manager.enable = true; diff --git a/users/grfn/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix index 882488763d32..86e4ba400e7c 100644 --- a/users/grfn/system/home/modules/common.nix +++ b/users/grfn/system/home/modules/common.nix @@ -13,8 +13,6 @@ ../modules/lib/cloneRepo.nix ]; - nixpkgs.config.allowUnfree = true; - programs.password-store.enable = true; grfn.impure.clonedRepos.passwordStore = { diff --git a/users/grfn/system/home/modules/emacs.nix b/users/grfn/system/home/modules/emacs.nix index b7520085f835..e434de8aea00 100644 --- a/users/grfn/system/home/modules/emacs.nix +++ b/users/grfn/system/home/modules/emacs.nix @@ -43,13 +43,6 @@ in { gnutls ]; - nixpkgs.overlays = [ - (import (builtins.fetchTarball { - url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz"; - sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j"; - })) - ]; - programs.emacs = { enable = true; package = pkgs.emacsUnstable; diff --git a/users/grfn/system/home/modules/email.nix b/users/grfn/system/home/modules/email.nix index cdfcbecb7c00..0a3e58205ba6 100644 --- a/users/grfn/system/home/modules/email.nix +++ b/users/grfn/system/home/modules/email.nix @@ -37,10 +37,6 @@ in { msmtp ]; - # nixpkgs.overlays = [(self: super: { - # notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {}; - # })]; - systemd.user.services = mapAttrs' (name: account: { name = escapeUnitName "lieer-${name}"; value.Service = { 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 -- cgit 1.4.1