diff options
-rw-r--r-- | README.org | 3 | ||||
-rw-r--r-- | disk-config.nix | 55 | ||||
-rw-r--r-- | flake.nix | 1 | ||||
-rw-r--r-- | home.nix | 2 |
4 files changed, 21 insertions, 40 deletions
@@ -5,7 +5,8 @@ keybindings. Note that at the time of writing, This entire configuration uses th Because emacs is blocking, and I want to use wayland because it's much better and there's much less cruft. * Installation -Install NixOS, install git (and maybe vim) on your NixOS system, and then on your NixOS system, run: +Install NixOS, get internet with ~nmtui~ or ethernet, install git (and maybe vim) on your NixOS system, +and then on your NixOS system, run: #+begin_src shell mkdir -p ~/src git clone https://git.nullring.xyz/toughnix.git ~/src/ diff --git a/disk-config.nix b/disk-config.nix index c7a6dc4..115f2cd 100644 --- a/disk-config.nix +++ b/disk-config.nix @@ -1,58 +1,37 @@ +# USAGE in your configuration.nix. +# Update devices to match your hardware. +# { +# imports = [ ./disko-config.nix ]; +# disko.devices.disk.main.device = "/dev/sda"; +# } { disko.devices = { disk = { - vdb = { + main = { type = "disk"; - device = "/dev/sda"; content = { type = "gpt"; partitions = { + boot = { + size = "1M"; + type = "EF02"; # for grub MBR + }; ESP = { - size = "512M"; + size = "1G"; type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "umask=0077" ]; }; }; - luks = { + root = { size = "100%"; content = { - type = "luks"; - name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; - #keyFile = "/tmp/secret.key"; - }; - #additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/swap" = { - mountpoint = "/.swapvol"; - swap.swapfile.size = "20M"; - }; - }; - }; + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; }; }; }; @@ -19,6 +19,7 @@ url = "github:nix-community/lanzaboote/v0.4.1"; inputs.nixpkgs.follows = "nixpkgs"; }; + nur.url = "github:nix-community/NUR"; sops-nix.url = "github:Mic92/sops-nix"; scripts.url = "github:ret2pop/scripts"; @@ -37,7 +37,7 @@ in enableNixpkgsReleaseCheck = false; username = vars.userName; homeDirectory = "/home/${vars.userName}"; - stateVersion = "23.11"; + stateVersion = "24.11"; packages = with pkgs; [ # kicad |