Commit 56f3859b authored by Christopher League's avatar Christopher League
Browse files

cleanup, try setup script to apply to nixos-minimal

parent f7c39118
SUBDIRS = fonts www
RECURSE = for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
default:
qemu:
......@@ -5,12 +8,13 @@ qemu:
clean:
$(RM) *.qcow2
$(RECURSE)
reallyclean: clean
$(RM) result
$(RECURSE)
.PHONY: default qemu clean reallyclean pre-push
.PHONY: default qemu clean reallyclean push
pre-push:
$(MAKE) -C fonts push
$(MAKE) -C www push
push:
$(RECURSE)
{pkgs, ...}:
{
environment.systemPackages = [pkgs.cachix];
nix = {
......
......@@ -20,7 +20,7 @@ do
refs/heads/master)
echo pre-push: preparing $local_sha
tree=$(PRINT_PATH=1 nix-prefetch-git --quiet $PWD $local_sha |tail -n1)
make -C $tree pre-push
make -C $tree push
;;
*)
echo pre-push: ignoring push to $remote_ref
......
#!/bin/sh
set -e
set -o xtrace
nix-channel --add https://gitlab.liu.edu/league/nixvm/-/archive/master/nixvm-master.tar.gz liucs
nix-channel --update liucs
sed -i '/hardware-configuration\.nix$/a <liucs\/cache.nix>' /etc/nixos/configuration.nix
mkdir -p ~/.config/nixpkgs
echo '{ allowUnfree = true; }' > ~/.config/nixpkgs/config.nix
nixos-rebuild switch
sed -i '/cache\.nix>$/a <liucs\/vbox.nix>' /etc/nixos/configuration.nix
nixos-rebuild switch
......@@ -4,6 +4,7 @@ pkgs.writeShellScriptBin "liucs-update" ''
[[ $(id -un) == root ]] || {
exec sudo -H $0 "$@"
}
nix-channel --update liucs --option tarball-ttl 0
set -o xtrace
nix-channel --update liucs
nixos-rebuild switch
''
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment