Update directory structure once more.

main
Joshua Potter 2023-12-10 10:23:26 -07:00
parent bb0436a974
commit 2e54749e77
41 changed files with 7 additions and 5 deletions

View File

@ -3,16 +3,17 @@
The collection of publically visible nixos-configuration files used for all of The collection of publically visible nixos-configuration files used for all of
my NixOS machines. Deployment (both local and remote) is managed using my NixOS machines. Deployment (both local and remote) is managed using
[colmena](https://github.com/zhaofengli/colmena). All machines can be found in [colmena](https://github.com/zhaofengli/colmena). All machines can be found in
the top-level `flake.nix` file. the `hive/flake.nix` file.
## Local Machines ## Local Machines
My personal laptop configuration is reflected in the top-level `framework` My personal laptop configuration is reflected in the `hive/framework` directory
directory (named after the [framework](https://frame.work/) laptop I use). This (named after the [framework](https://frame.work/) laptop I use). This flake
flake defines a [home-manager](https://nix-community.github.io/home-manager/) defines a [home-manager](https://nix-community.github.io/home-manager/)
configuration for a single user called `jrpotter`. We can apply a configuration for a single user called `jrpotter`. We can apply a
`nixos-rebuild switch` by running: `nixos-rebuild switch` by running:
```bash ```bash
$ cd hive
$ nix flake update # If any changes were made to local machines. $ nix flake update # If any changes were made to local machines.
$ colmena apply-local [--sudo] $ colmena apply-local [--sudo]
``` ```
@ -21,7 +22,7 @@ $ colmena apply-local [--sudo]
Remote machines are hosted on [DigitalOcean](https://www.digitalocean.com/). Remote machines are hosted on [DigitalOcean](https://www.digitalocean.com/).
The custom image used by each droplet can be built using the top-level The custom image used by each droplet can be built using the top-level
`images/digital-ocean-23.11pre-git` flake. This image disables a root password `digital-ocean/23.11pre-git` flake. This image disables a root password
in favor of SSH. A droplet running this image will automatically pull in any in favor of SSH. A droplet running this image will automatically pull in any
enabled SSH keys from your DigitalOcean account at creation time (so make sure enabled SSH keys from your DigitalOcean account at creation time (so make sure
to include them when creating a new droplet). to include them when creating a new droplet).
@ -80,6 +81,7 @@ $ ssh-add ~/.ssh/id_ed25519
``` ```
Afterward you can run the following: Afterward you can run the following:
```bash ```bash
$ cd hive
$ nix flake update # If any changes were made to remote machines. $ nix flake update # If any changes were made to remote machines.
$ colmena apply $ colmena apply
``` ```