diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-12-05 23:10:17 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-12-05 23:10:17 +0100 |
| commit | 969d9cb28307bad62c283bd9aadf676b0019a333 (patch) | |
| tree | ea30c87fc804e164724f95e532578def0895f752 | |
| parent | 078a23e415f2cfe17dff477608d405905c26c208 (diff) | |
| parent | c87d8523e6ae7e254b90b73189d7c51e99de5a9e (diff) | |
| download | nixos-969d9cb28307bad62c283bd9aadf676b0019a333.tar nixos-969d9cb28307bad62c283bd9aadf676b0019a333.tar.gz nixos-969d9cb28307bad62c283bd9aadf676b0019a333.tar.bz2 nixos-969d9cb28307bad62c283bd9aadf676b0019a333.tar.xz nixos-969d9cb28307bad62c283bd9aadf676b0019a333.zip | |
Merge branch 'master' of git.yggdrasil.li:nixos
| m--------- | dotfiles | 0 | ||||
| -rw-r--r-- | users/gkleen@vali.nix | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/dotfiles b/dotfiles | |||
| Subproject 90b2c5292b310130cef2daee0f4e2f91195646d | Subproject 7041a9939e8b015d372f3bfd1b3503860fde6c0 | ||
diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 0ac360dc..4bf61072 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix | |||
| @@ -2,4 +2,6 @@ | |||
| 2 | packageOverrides = pkgs: rec { | 2 | packageOverrides = pkgs: rec { |
| 3 | redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; | 3 | redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; |
| 4 | } // (import ../utils/nix/default.nix) {}; | 4 | } // (import ../utils/nix/default.nix) {}; |
| 5 | |||
| 6 | allowUnfree = true; | ||
| 5 | } | 7 | } |