refactor: switch to new luks config setup

This commit is contained in:
Felix Schröter 2020-01-19 10:45:38 +01:00
parent 2dde331bbb
commit f779d246bc
No known key found for this signature in database
GPG key ID: A12D7C9D2FD34458
2 changed files with 32 additions and 6 deletions

View file

@ -1,14 +1,12 @@
{ config, pkgs, ... }:
{
boot.initrd.luks.devices = [
{
name = "root";
boot.initrd.luks.devices = {
root = {
device = "/dev/disk/by-partlabel/nixos";
preLVM = true;
allowDiscards = true;
}
];
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

View file

@ -27,11 +27,39 @@ with pkgs;
night = "0.9";
};
};
programs.direnv = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
programs.ssh = {
enable = true;
};
services.gpg-agent = {
enable = true;
extraConfig = ''
pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
'';
};
programs.gpg.enable = true;
programs.git = {
enable = true;
userName = "Felix Tenley";
userEmail = "dev@felschr.com";
ignores = [".direnv"];
signing = {
key = "22A6 DD21 EE66 E73D D4B9 3F20 A12D 7C9D 2FD3 4458";
signByDefault = true;
};
extraConfig = {
pull = { rebase = true; };
rebase = { autoStash = true; };
};
};
home.packages = with pkgs; [