steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge staging to master #12

Merged
steveej merged 30 commits from staging into master 2018-11-10 11:10:55 +00:00
Conversation 5 Commits 30 Files changed 46 +1 -5
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4ded9d0d70 - Show all commits

5
nix/os/devices/steveej-laptop/configuration.nix
View file

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

1
nix/os/profiles/common/system.nix
View file

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