From 03e501e606d74c65d81782e5a689c70922a1af36 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 4 Mar 2022 23:43:10 -0500 Subject: [PATCH] Refactoring --- modules/applications/sway/sway.nix | 1 - modules/profiles/minimal.nix | 4 ++-- readme.md | 27 +++------------------------ 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/modules/applications/sway/sway.nix b/modules/applications/sway/sway.nix index 6ea1c82..b3ea790 100644 --- a/modules/applications/sway/sway.nix +++ b/modules/applications/sway/sway.nix @@ -46,7 +46,6 @@ in with lib; { ''; }) ]; - }; programs.sway = { diff --git a/modules/profiles/minimal.nix b/modules/profiles/minimal.nix index 1c96215..ce68c36 100644 --- a/modules/profiles/minimal.nix +++ b/modules/profiles/minimal.nix @@ -10,8 +10,8 @@ in { # Allow Cleanup, nix, & flakes nix = { settings = { - auto-optimise-store = true; - allowed-users = [ "@wheel" ]; + auto-optimise-store = true; + allowed-users = [ "@wheel" ]; }; gc = { automatic = true; diff --git a/readme.md b/readme.md index f7efede..11085a6 100644 --- a/readme.md +++ b/readme.md @@ -1,25 +1,4 @@ -# Nil Install Guide - -This is the nix configuration for a 2021 Thinkpad T14 AMD g2 machine named `nil`. - -The boot media looks like - -``` -NAME TYPE MOUNTPOINT -nvme0n1 disk -├─nvme0n1p1 part /boot -└─nvme0n1p2 part - └─crypt crypt /dev/mapper/root - └─partitions lvm - ├─swap swap /dev/partitions/swap - └─lvm_root lvm /dev/partitions/lvm_root - └─rpool zpool - ├─rpool/root zfs - ├─rpool/root/nixos zfs / - └─rpool/home zfs /home -``` - -## Install +# Install A makefile is used for ease of use. To set this up on a new machine you will need the following: @@ -42,13 +21,13 @@ Once you have set the `PASSPHRASE` & `DISK` vars run sudo make nix_install ``` -## TODO +# TODO - Document setting the `networking.hostId` variable. - Use [NixOS Hardware](https://github.com/NixOS/nixos-hardware) Modules. - Fix wireless driver issue :: This uses the Realtek 8852AE 802.11AX WWAN. -## References +# References - [Installing NixOS with encrypted ZFS on a netcup.de root server](https://florianfranke.dev/posts/2020/03/installing-nixos-with-encrypted-zfs-on-a-netcup.de-root-server/) - [NixOS on Framework laptop](http://kvark.github.io/linux/framework/2021/10/17/framework-nixos.html)