rayandrew/nix-v0
rayandrew/nix-v0
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use zfs as snapshot #1

Merged
rayandrew merged 8 commits from zfs into main 2024-10-26 21:07:15 -05:00
Conversation 0 Commits 8 Files changed 32 +75 -51
6 changed files with 75 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a8366161d4 - Show all commits

21
flake.lock
View file

@ -55,6 +55,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1729394935,
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1729742320, "lastModified": 1729742320,
@ -92,6 +112,7 @@
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }

4
flake.nix
View file

@ -21,7 +21,7 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
lib = import ./lib.nix { lib = import ./src/lib.nix {
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit pkgs; inherit pkgs;
inherit (inputs) home-manager; inherit (inputs) home-manager;
@ -52,7 +52,7 @@
in in
{ {
inherit lib self; inherit lib self;
nixosConfigurations = (import ./src/hosts/nixos.nix commonArgs); nixosConfigurations = (import ./src/hosts/default.nix commonArgs);
}; };
# outputs = {nixpkgs, ...} @ inputs: # outputs = {nixpkgs, ...} @ inputs:

7
src/hosts/default.nix
View file

@ -27,10 +27,9 @@ let
modules = [ modules = [
inputs.disko.nixosModules.default inputs.disko.nixosModules.default
inputs.home-manager.nixosModules.home-manager
inputs.impermanence.nixosModules.impermanence
./${host} ./${host}
./${host}/hardware.nix ./${host}/hardware.nix
../nixos
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
@ -44,7 +43,7 @@ let
imports = [ imports = [
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
# ./${host}/home.nix # ./${host}/home.nix
../../home ../home
]; ];
}; };
}; };
@ -55,6 +54,8 @@ let
"users" "users"
user user
]) ])
inputs.home-manager.nixosModules.home-manager
inputs.impermanence.nixosModules.impermanence
]; ];
}; };
in in

78
src/hosts/pickwick/default.nix
View file

@ -1,17 +1,15 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, ... }:
{ {
imports = [ imports = [];
];
nixpkgs.config.allowUnfree = true;
boot.kernelParams = [ "resume_offset=533760" ]; boot.kernelParams = [ "resume_offset=533760" ];
boot.resumeDevice = "/dev/pool/root"; # boot.resumeDevice = "/dev/pool/root";
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "pickwick"; networking.hostName = "pickwick";
networking.hostId = builtins.substring 0 8 (builtins.hashString "md5" config.networking.hostName);
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
time.timeZone = "America/Chicago"; time.timeZone = "America/Chicago";
@ -24,7 +22,6 @@
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.xkb.layout = "us"; services.xserver.xkb.layout = "us";
security.sudo.extraConfig = "Defaults lecture=never";
security.pam.services.login.fprintAuth = false; security.pam.services.login.fprintAuth = false;
security.pam.services.sudo.fprintAuth = false; security.pam.services.sudo.fprintAuth = false;
@ -47,17 +44,17 @@
services.libinput.enable = true; services.libinput.enable = true;
users.users.root.hashedPasswordFile = "/persist/passwords/root"; # users.users.root.hashedPasswordFile = "/persist/passwords/root";
users.users.rayandrew = { # users.users.rayandrew = {
isNormalUser = true; # isNormalUser = true;
# initialPassword = "12345"; # # initialPassword = "12345";
hashedPasswordFile = "/persist/passwords/rayandrew"; # hashedPasswordFile = "/persist/passwords/rayandrew";
extraGroups = [ "wheel" "audio" "keyd" ]; # extraGroups = [ "wheel" "audio" "keyd" ];
packages = with pkgs; [ # packages = with pkgs; [
firefox # firefox
tree # tree
]; # ];
}; # };
users.groups.keyd = {}; users.groups.keyd = {};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -99,32 +96,31 @@
programs.dconf.enable = true; programs.dconf.enable = true;
fileSystems."/persist".neededForBoot = true; # environment.persistence."/persist/system" = {
environment.persistence."/persist/system" = { # hideMounts = true;
hideMounts = true; # directories = [
directories = [ # "/var/log"
"/var/log" # "/var/lib/fprint"
"/var/lib/fprint" # "/var/lib/nixos"
"/var/lib/nixos" # "/var/lib/bluetooth"
"/var/lib/bluetooth" # "/var/lib/systemd/coredump"
"/var/lib/systemd/coredump" # "/etc/NetworkManager/system-connections"
"/etc/NetworkManager/system-connections" # { directory = "/var/lib/colord"; user = "colord"; group = "colord"; mode = "u=rwx,g=rx,o="; }
{ directory = "/var/lib/colord"; user = "colord"; group = "colord"; mode = "u=rwx,g=rx,o="; } # ];
]; # files = [
files = [ # "/etc/machine-id"
"/etc/machine-id" # ];
]; # };
};
programs.fuse.userAllowOther = true; programs.fuse.userAllowOther = true;
home-manager = { # home-manager = {
extraSpecialArgs = {inherit inputs pkgs;}; # extraSpecialArgs = {inherit inputs pkgs;};
users = { # users = {
"rayandrew" = import ./home.nix; # "rayandrew" = import ./home.nix;
}; # };
useGlobalPkgs = true; # useGlobalPkgs = true;
useUserPackages = true; # useUserPackages = true;
}; # };
services.keyd = { services.keyd = {
enable = true; enable = true;

9
src/hosts/pickwick/disko.nix
View file

@ -71,23 +71,24 @@
zpool = { zpool = {
zroot = { zroot = {
type = "zpool"; type = "zpool";
mode = "mirror"; # mode = "mirror";
options = { options = {
cachefile = "none"; cachefile = "none";
ashift = 12; ashift = "12";
autotrim = "on"; autotrim = "on";
}; };
rootFsOptions = { rootFsOptions = {
compression = "zstd"; compression = "zstd";
acltype = "posixacl"; acltype = "posixacl";
xattr = "sa"; xattr = "sa";
"com.sun:auto-snapshot" = "false";
mountpoint = "none"; mountpoint = "none";
encryption = "aes-256-gcm"; encryption = "aes-256-gcm";
keyformat = "passphrase"; keyformat = "passphrase";
keylocation = "prompt"; keylocation = "prompt";
normalization = "formD";
"com.sun:auto-snapshot" = "false";
}; };
mountpoint = "none"; mountpoint = null;
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank"; postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank";
datasets = { datasets = {
nix = { nix = {

7
src/hosts/pickwick/hardware.nix
View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# 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.
{ input, config, lib, pkgs, modulesPath, ... }: { inputs, config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ imports = [
@ -25,4 +25,9 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# filesystems
fileSystems."/cache".neededForBoot = true;
fileSystems."/persist".neededForBoot = true;
} }