Merge staging to master #12

Merged
steveej merged 30 commits from staging into master 2018-11-10 11:10:55 +00:00
2 changed files with 1 additions and 5 deletions
Showing only changes of commit 4ded9d0d70 - Show all commits

View file

@ -1,11 +1,6 @@
{ ... }:
{
nixpkgs.config = {
allowBroken = false;
allowUnfree = true;
};
imports = [
../../profiles/common/configuration.nix
../../profiles/graphical/configuration.nix

View file

@ -48,6 +48,7 @@
# Activation scripts for impure set up of paths in /
system.activationScripts.bin = ''
echo "setting up /bin..."
mkdir -p /bin
ln -sfT ${pkgs.bash}/bin/bash /bin/.bash
mv -Tf /bin/.bash /bin/bash
'';