From 6e941e28f63f96962ac8e440394c0277413dcd65 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 3 Oct 2019 22:38:41 +0200 Subject: Simplify nix configuration --- user/config.nix | 3 +++ user/modules/nix.nix | 3 +-- user/nix/.config/nixpkgs/config.nix | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 user/config.nix delete mode 100644 user/nix/.config/nixpkgs/config.nix diff --git a/user/config.nix b/user/config.nix new file mode 100644 index 00000000..2a93c4b9 --- /dev/null +++ b/user/config.nix @@ -0,0 +1,3 @@ +{ pkgs }: { + allowUnfree = true; +} diff --git a/user/modules/nix.nix b/user/modules/nix.nix index 4097598b..d0de3cab 100644 --- a/user/modules/nix.nix +++ b/user/modules/nix.nix @@ -1,6 +1,5 @@ { config, pkgs, ... }: { - nixpkgs.config = import ../nix/.config/nixpkgs/config.nix; - xdg.configFile."nixpkgs.config.nix".source = ../nix/.config/nixpkgs/config.nix; + nixpkgs.config = import ../config.nix; } diff --git a/user/nix/.config/nixpkgs/config.nix b/user/nix/.config/nixpkgs/config.nix deleted file mode 100644 index 2a93c4b9..00000000 --- a/user/nix/.config/nixpkgs/config.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ pkgs }: { - allowUnfree = true; -} -- cgit 1.4.1