diff --git a/home-manager/jujutsu.nix b/home-manager/jujutsu.nix index 28ab139..58c4285 100644 --- a/home-manager/jujutsu.nix +++ b/home-manager/jujutsu.nix @@ -11,4 +11,9 @@ }; }; }; + + # Difftastic config + programs.difftastic = { + enable = true; + }; } diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix index 4813cfd..31ad546 100644 --- a/hosts/sachiel/configuration.nix +++ b/hosts/sachiel/configuration.nix @@ -45,18 +45,6 @@ secureBoot = true; }; }; - swapDevices = [ - { - device = "/swapfile"; - size = 2048; - randomEncryption = { - enable = true; - source = "/dev/random"; - #sectorSize = 4096; - }; - options = ["nofail"]; - } - ]; nixpkgs = { # You can add overlays here @@ -100,28 +88,6 @@ nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; }; - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; - - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - - autoGenerateKeys.enable = true; - # autoEnrollKeys = { - # includeMicrosoftKeys = false; - # allowBrickingMyMachine = true; - # enable = true; - # autoReboot = true; - # }; - }; - # Load the TPM drivers in the initram to allow for decryption of agenix - # secrets. - boot.initrd.availableKernelModules = ["tpm_crb" "tpm_tis"]; - networking.hostName = "sachiel-vm"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/hosts/sachiel/disko-config.nix b/hosts/sachiel/disko-config.nix index 1332ccd..6204005 100644 --- a/hosts/sachiel/disko-config.nix +++ b/hosts/sachiel/disko-config.nix @@ -74,5 +74,17 @@ }; }; + swapDevices = [ + { + device = "/swapfile"; + size = 2048; + randomEncryption = { + enable = true; + source = "/dev/random"; + #sectorSize = 4096; + }; + options = ["nofail"]; + } + ]; fileSystems."/persistent".neededForBoot = true; }