impermanence fixes

This commit is contained in:
Rouven Seifert 2023-05-20 16:21:20 +02:00
parent 6e5876f2ff
commit 6da93d0250
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
5 changed files with 14 additions and 9 deletions

View file

@ -23,15 +23,15 @@ A ThinkPad L15 that I use for almost everything that one needs a monitor to.
#### Disk Layout #### Disk Layout
``` ```
NAME MOUNTPOINT COMMENT NAME MOUNTPOINT COMMENT
tmpfs / # root on tmpfs using impermanence
nvme0n1 nvme0n1
├─nvme0n1p1 /boot ├─nvme0n1p1 /boot
├─nvme0n1p2 # LUKS-encrypted partition ├─nvme0n1p2 # LUKS-encrypted partition
│ └─luksroot # btrfs with some subvolumes │ └─luksroot # btrfs with some subvolumes
│ ├─root /
│ ├─home /home │ ├─home /home
│ ├─lib /var/lib │ ├─lib /var/lib
│ ├─log /var/log │ ├─log /var/log
│ └─store /nix/store │ └─nix /nix
└─nvme0n1p3 └─nvme0n1p3
└─luksswap [SWAP] # encrypted swap partition └─luksswap [SWAP] # encrypted swap partition
``` ```

View file

@ -147,11 +147,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1684528365,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "narHash": "sha256-2b5IfkV6WPZ3S9SgIajbftinfGlBnwUwOcmLiyCck+w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "rev": "5ae23a806c7cb16e2ade63400d0c6e5aa8e54797",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,7 +21,7 @@
}; };
nix-colors.url = "github:Misterio77/nix-colors"; nix-colors.url = "github:Misterio77/nix-colors";
hyprland.url = "github:hyprwm/Hyprland/"; hyprland.url = "github:hyprwm/Hyprland";
purge = { purge = {
url = "github:therealr5/purge"; url = "github:therealr5/purge";

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
{ {
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -32,6 +32,10 @@
"/etc/machine-id" "/etc/machine-id"
]; ];
}; };
# impermanence fixes
sops.age.sshKeyPaths = lib.mkForce [ "/nix/persist/system/etc/ssh/ssh_host_ed25519_key" ];
sops.gnupg.sshKeyPaths = lib.mkForce [ ];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@ -108,6 +112,7 @@
fwupd.enable = true; # firmware updates fwupd.enable = true; # firmware updates
}; };
# fun fact: if I disable this, Hyprland breaks due to missing egl dependencies
programs.steam.enable = true; # putting steam in here cause in home manager it doesn't work programs.steam.enable = true; # putting steam in here cause in home manager it doesn't work
programs.ausweisapp = { programs.ausweisapp = {

View file

@ -41,14 +41,14 @@
{ {
device = "/dev/disk/by-uuid/3d44cde5-17a2-4023-b9ae-3a02ae68aa81"; device = "/dev/disk/by-uuid/3d44cde5-17a2-4023-b9ae-3a02ae68aa81";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=lib" "compress=zstd" "discard=async" "noatime" ]; options = [ "subvol=lib" "compress=zstd" "discard=async" "noatime" "x-mount.mkdir" ];
}; };
fileSystems."/var/log" = fileSystems."/var/log" =
{ {
device = "/dev/disk/by-uuid/3d44cde5-17a2-4023-b9ae-3a02ae68aa81"; device = "/dev/disk/by-uuid/3d44cde5-17a2-4023-b9ae-3a02ae68aa81";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=log" "compress=zstd" "discard=async" "noatime" ]; options = [ "subvol=log" "compress=zstd" "discard=async" "noatime" "x-mount.mkdir" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =