From 74a7fbc33034ee30dedae1a102a08bb2321f20f5 Mon Sep 17 00:00:00 2001 From: alexandre Date: Fri, 20 Oct 2023 07:52:36 +0000 Subject: [PATCH] test config for FIDO2 systemd-cryptenroll --fido2-device=auto --fido2-with-user-verification=true /dev/sda2 systemd-cryptenroll --password /dev/sda2 export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" fido2luks credential "$FIDO2_LABEL" --- hosts/text-nixos/configuration.nix | 134 ++++++++++++++++++++ hosts/text-nixos/hardware-configuration.nix | 54 ++++++++ 2 files changed, 188 insertions(+) create mode 100644 hosts/text-nixos/configuration.nix create mode 100644 hosts/text-nixos/hardware-configuration.nix diff --git a/hosts/text-nixos/configuration.nix b/hosts/text-nixos/configuration.nix new file mode 100644 index 0000000..60cf7fb --- /dev/null +++ b/hosts/text-nixos/configuration.nix @@ -0,0 +1,134 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running `nixos-help`). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the GRUB 2 boot loader. + # boot.loader.grub.enable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Define on which hard drive you want to install Grub. + boot = { + loader.systemd-boot.enable = true; + loader.grub.efiSupport = true; + loader.grub.efiInstallAsRemovable = true; + loader.grub.device = "nodev"; # or "nodev" for efi only +## OK initrd.luks.fido2Support = true; +## OK initrd.luks.devices."partitions".device = "/dev/sda2"; +## OK initrd.luks.devices.partitions.crypttabExtraOpts = ["fido2-device=auto" "headless=true" ]; +## OK initrd.luks.devices."partitions".fallbackToPassword = true; +## OK initrd.luks.devices."partitions".fido2.credentials = [ +## OK "5cd4080973f89909db8f92dbb3f4352b" +## OK "a693320606d47eaf7049673fd2184332791a52aba4d077303277d98ea79da172488d52dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec014ea010000" +## OK ]; + plymouth.enable = true; + tmp.cleanOnBoot = true ; + kernelParams = [ "i915.enable_fbc=1" ]; + }; + networking.hostName = "d2nix"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; +time.timeZone = "Europe/Paris"; + +i18n.defaultLocale = "fr_FR.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = "fr"; + }; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # tree + # ]; + # }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + fido2luks + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It's perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.05"; # Did you read the comment? + +} + diff --git a/hosts/text-nixos/hardware-configuration.nix b/hosts/text-nixos/hardware-configuration.nix new file mode 100644 index 0000000..166fb22 --- /dev/null +++ b/hosts/text-nixos/hardware-configuration.nix @@ -0,0 +1,54 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = +# { device = "/dev/sda2"; + { device = "/dev/disk/by-uuid/20388412-0d02-4091-a320-c4096d1d4a4e"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/D96D-5573"; + fsType = "vfat"; + }; + +boot.initrd.luks.devices = { + "partitions" = { + device = "/dev/sda2"; + preLVM = true; + }; + }; +boot.initrd.luks.devices.root = { + crypttabExtraOpts = [ "fido2-device=auto" "fido2-with-user-verification=true" ]; + device = "/dev/sda2"; +}; +boot.initrd.systemd.enable = true; + + swapDevices = + [ { device = "/dev/disk/by-uuid/b4c59607-58e7-4af9-85c2-2fa5bf618f8e"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f0u10.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}