Skip to content

Commit eb80919

Browse files
committed
Fix readme with latest workflow
1 parent 4d08f7b commit eb80919

File tree

2 files changed

+9
-22
lines changed

2 files changed

+9
-22
lines changed

.github/README.md

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,28 @@ Versioning `$HOME`. Contains nix configs, dotfiles, scripts.
44

55
Config for NixOS only.
66

7-
## Fresh install, wat do
7+
## Fresh install, NixOS
88

9+
1. Do the whole NixOS install thing, and in another machine put together a basic config in the `flake.nix`
910
1. Clone this repo in the home folder: `git clone https://github.com/f-f/home.git ~`
11+
1. Copy out all the content: `cd home && find . -maxdepth 1 -exec mv {} .. \;`
1012
1. Fetch everything: `cd ~ && git submodule update --init --recursive --remote`
13+
1. Integrate into the config for this hostname the autogenerated `hardware-configuration.nix` and `configuration.nix` files, then `nixos-switch`
14+
15+
At this point is should be possible to ssh from another machine, so the rest can be done remotely:
1116
1. Add the fzf module:
1217
```bash
1318
mkdir -p .zprezto/contrib && cd $_
1419
git clone https://github.com/gpanders/fzf-prezto.git fzf
1520
cd fzf
1621
git submodule update --init
1722
```
18-
1. Write down the config for the new machine, start from the example: `cd ~/nixos-config && cp local-example.nix $(hostname).nix`, and integrate with what's in `/etc/nixos/configuration.nix`
19-
1. Import it as a local configuration: `echo "import ./$(hostname).nix" > local.nix`
20-
1. `mv /etc/nixos/hardware-configuration.nix ~`
21-
1. Add channels:
22-
```
23-
sudo nix-channel --add http://nixos.org/channels/nixos-21.05 nixos
24-
sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable
25-
sudo nix-channel --update
26-
```
27-
28-
Then: `nixos-switch`
29-
30-
Next:
3123
1. Make a new ssh key for github: `ssh-keygen -t ed25519 -C "$USER+github@$(hostname)" -f github`, add it as deploy key here
32-
2. Replace this repo remote from http to git: `git remote set-url origin git@github.com:f-f/home.git`
24+
1. Replace this repo remote from http to git: `git remote set-url origin git@github.com:f-f/home.git`
3325

3426
### On macOS
3527

36-
It's a little harder to bootstrap Nix on macOS, but it can be done. After cloning the stuff:
28+
It's a little more involved to bootstrap Nix on macOS, but it can be done. After cloning the stuff:
3729
```bash
3830
# In case of M1
3931
softwareupdate --install-rosetta
@@ -61,7 +53,3 @@ Useful reads:
6153
- https://gist.github.com/jmatsushita/5c50ef14b4b96cb24ae5268dab613050
6254
- https://github.com/srstrong/nix-env
6355
- https://daiderd.com/nix-darwin/manual/index.html
64-
65-
66-
TODO: refactor readme. With the flakes it's not quite the right approach
67-
Reference this link: https://colinramsay.co.uk/2021/10/19/migrating-a-nixos-install-to-flakes.html

nixos-config/claudius.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,11 @@ in
149149

150150
services.tailscale.enable = true;
151151

152-
153152
# Virtualisation
154153
security.polkit.enable = true;
155154

156155
# Networking
157-
networking.hostName = "claudius";
156+
networking.hostName = "claudius";
158157
networking.hostId = "454f37c2";
159158
networking.enableIPv6 = false;
160159
networking.defaultGateway = {

0 commit comments

Comments
 (0)