jan-leila/nix-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

disabled impermanence

Browse source
This commit is contained in:
Leyla Becker 2024-11-11 19:06:51 -06:00
parent 0bea01b6ba
commit 5ba3a082e6
4 changed files with 80 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
enviroments/common/default.nix
View file

@ -178,13 +178,6 @@
environment = {
# List packages installed in system profile.
systemPackages = with pkgs; [
qemu
(pkgs.writeShellScriptBin "qemu-system-x86_64-uefi" ''
qemu-system-x86_64 \
-bios ${OVMF.fd}/FV/OVMF.fd \
"$@"
'')
wget
# version control

16
flake.lock
View file

@ -122,21 +122,6 @@
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1731242966,
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "impermanence",
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
@ -250,7 +235,6 @@
"disko": "disko",
"flake-compat": "flake-compat",
"home-manager": "home-manager",
"impermanence": "impermanence",
"lix-module": "lix-module",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware",

10
flake.nix
View file

@ -23,9 +23,9 @@
inputs.nixpkgs.follows = "nixpkgs";
};
impermanence = {
url = "github:nix-community/impermanence";
};
# impermanence = {
# url = "github:nix-community/impermanence";
# };
# users home directories
home-manager = {
@ -62,7 +62,7 @@
outputs = {
nixpkgs,
disko,
impermanence,
# impermanence,
nixos-hardware,
home-manager,
lix-module,
@ -132,7 +132,7 @@
modules = [
lix-module.nixosModules.default
./overlays
impermanence.nixosModules.impermanence
# impermanence.nixosModules.impermanence
disko.nixosModules.disko
home-manager.nixosModules.home-manager
home-manager-config

151
hosts/defiant/hardware-configuration.nix
View file

@ -2,7 +2,6 @@
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
pkgs,
config,
lib,
modulesPath,
@ -24,38 +23,38 @@
# zfs rollback -r rpool/root@blank
# zfs rollback -r rpool/home@blank
# '';
systemd = {
enable = lib.mkDefault true;
services.rollback = {
description = "Rollback root filesystem to a pristine state on boot";
wantedBy = [
"zfs.target"
"initrd.target"
];
after = [
"zfs-import-rpool.service"
];
before = [
"sysroot.mount"
"fs.target"
];
path = with pkgs; [
zfs
];
unitConfig.DefaultDependencies = "no";
# serviceConfig = {
# Type = "oneshot";
# ExecStart =
# "${config.boot.zfs.package}/sbin/zfs rollback -r rpool/home@blank";
# };
serviceConfig.Type = "oneshot";
script = ''
zfs list -t snapshot || echo
zfs rollback -r rpool/root@blank
zfs rollback -r rpool/home@blank
'';
};
};
# systemd = {
# enable = lib.mkDefault true;
# services.rollback = {
# description = "Rollback root filesystem to a pristine state on boot";
# wantedBy = [
# "zfs.target"
# "initrd.target"
# ];
# after = [
# "zfs-import-rpool.service"
# ];
# before = [
# "sysroot.mount"
# "fs.target"
# ];
# path = with pkgs; [
# zfs
# ];
# unitConfig.DefaultDependencies = "no";
# # serviceConfig = {
# # Type = "oneshot";
# # ExecStart =
# # "${config.boot.zfs.package}/sbin/zfs rollback -r rpool/home@blank";
# # };
# serviceConfig.Type = "oneshot";
# script = ''
# zfs list -t snapshot || echo
# zfs rollback -r rpool/root@blank
# zfs rollback -r rpool/home@blank
# '';
# };
# };
};
kernelModules = ["kvm-amd"];
kernelParams = ["quiet"];
@ -68,19 +67,19 @@
swapDevices = [];
fileSystems = {
"/" = {
neededForBoot = true;
};
# fileSystems = {
# "/" = {
# neededForBoot = true;
# };
"/home" = {
neededForBoot = true;
};
# "/home" = {
# neededForBoot = true;
# };
"/persistent" = {
neededForBoot = true;
};
};
# "/persistent" = {
# neededForBoot = true;
# };
# };
networking = {
hostId = "c51763d6";
@ -88,43 +87,43 @@
useNetworkd = true;
};
environment.persistence."/persistent" = {
enable = true;
hideMounts = true;
directories = [
# "/run/secrets"
# environment.persistence."/persistent" = {
# enable = true;
# hideMounts = true;
# directories = [
# # "/run/secrets"
"/etc/ssh"
# "/etc/ssh"
"/var/log"
"/var/lib/nixos"
"/var/lib/systemd/coredump"
# "/var/log"
# "/var/lib/nixos"
# "/var/lib/systemd/coredump"
# config.apps.pihole.directory.root
# # config.apps.pihole.directory.root
# config.apps.jellyfin.mediaDirectory
# config.services.jellyfin.configDir
# config.services.jellyfin.cacheDir
# config.services.jellyfin.dataDir
# # config.apps.jellyfin.mediaDirectory
# # config.services.jellyfin.configDir
# # config.services.jellyfin.cacheDir
# # config.services.jellyfin.dataDir
# "/var/hass" # config.users.users.hass.home
# "/var/postgresql" # config.users.users.postgresql.home
# "/var/forgejo" # config.users.users.forgejo.home
# "/var/nextcloud" # config.users.users.nextcloud.home
# "/var/headscale" # config.users.users.headscale.home
];
files = [
"/etc/machine-id"
# config.environment.sessionVariables.SOPS_AGE_KEY_FILE
];
users.leyla = {
directories = [
"documents"
".ssh"
];
files = [];
};
};
# # "/var/hass" # config.users.users.hass.home
# # "/var/postgresql" # config.users.users.postgresql.home
# # "/var/forgejo" # config.users.users.forgejo.home
# # "/var/nextcloud" # config.users.users.nextcloud.home
# # "/var/headscale" # config.users.users.headscale.home
# ];
# files = [
# "/etc/machine-id"
# # config.environment.sessionVariables.SOPS_AGE_KEY_FILE
# ];
# users.leyla = {
# directories = [
# "documents"
# ".ssh"
# ];
# files = [];
# };
# };
# systemd.services = {
# # https://github.com/openzfs/zfs/issues/10891