Merge branch 'nyarlathtop' of ssh://gitea.mathebau.de:3022/dennis/nixConfig into nyarlathtop
This commit is contained in:
commit
12a20c4c52
2 changed files with 3 additions and 1 deletions
|
@ -80,7 +80,10 @@ If you have a `nixos-rebuild` available on your system it can automatize these t
|
||||||
`--target-host` parameters. But there are some pitfalls so look at the `nixos-rebuild` documentation beforehand.
|
`--target-host` parameters. But there are some pitfalls so look at the `nixos-rebuild` documentation beforehand.
|
||||||
|
|
||||||
### On the machine
|
### On the machine
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> d89313e25d9c66bafdaed10bb11716589472bac3
|
||||||
clone this repo to `/etc/nixos/` and `nixos-rebuild boot` or `nixos-rebuild switch` that will select
|
clone this repo to `/etc/nixos/` and `nixos-rebuild boot` or `nixos-rebuild switch` that will select
|
||||||
the appropriate machine based on hostname.
|
the appropriate machine based on hostname.
|
||||||
|
|
||||||
|
|
|
@ -51,5 +51,4 @@ services = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
>>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue