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 = { environment = {
# List packages installed in system profile. # List packages installed in system profile.
systemPackages = with pkgs; [ systemPackages = with pkgs; [
qemu
(pkgs.writeShellScriptBin "qemu-system-x86_64-uefi" ''
qemu-system-x86_64 \
-bios ${OVMF.fd}/FV/OVMF.fd \
"$@"
'')
wget wget
# version control # version control

16
flake.lock
View file

@ -122,21 +122,6 @@
"type": "github" "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": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -250,7 +235,6 @@
"disko": "disko", "disko": "disko",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence",
"lix-module": "lix-module", "lix-module": "lix-module",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

10
flake.nix
View file

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

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

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