diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index bae5f56..84368e8 100644 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -76,32 +76,32 @@ in # Secureboot keys # ------------------------------ "secureboot/GUID" = lib.mkIf isx86 { - path = "/etc/secureboot/GUID"; - mode = "0640"; + # path = "/etc/secureboot/GUID"; + mode = "0600"; }; "secureboot/keys/db-key" = lib.mkIf isx86 { - path = "/etc/secureboot/keys/db/db.key"; - mode = "0640"; + # path = "/etc/secureboot/keys/db/db.key"; + mode = "0600"; }; "secureboot/keys/db-pem" = lib.mkIf isx86 { - path = "/etc/secureboot/keys/db/db.pem"; - mode = "0640"; + # path = "/etc/secureboot/keys/db/db.pem"; + mode = "0600"; }; "secureboot/keys/KEK-key" = lib.mkIf isx86 { - path = "/etc/secureboot/keys/KEK/KEK.key"; - mode = "0640"; + # path = "/etc/secureboot/keys/KEK/KEK.key"; + mode = "0600"; }; "secureboot/keys/KEK-pem" = lib.mkIf isx86 { - path = "/etc/secureboot/keys/KEK/KEK.pem"; - mode = "0640"; + # path = "/etc/secureboot/keys/KEK/KEK.pem"; + mode = "0600"; }; "secureboot/keys/PK-key" = lib.mkIf isx86 { - path = "/etc/secureboot/keys/PK/PK.key"; - mode = "0640"; + # path = "/etc/secureboot/keys/PK/PK.key"; + mode = "0600"; }; "secureboot/keys/PK-pem" = lib.mkIf isx86 { - path = "/etc/secureboot/keys/PK/PK.pem"; - mode = "0640"; + # path = "/etc/secureboot/keys/PK/PK.pem"; + mode = "0600"; }; }; diff --git a/systems/x86_64-linux/nuc-nixos/configuration.nix b/systems/x86_64-linux/nuc-nixos/configuration.nix new file mode 100644 index 0000000..0f18584 --- /dev/null +++ b/systems/x86_64-linux/nuc-nixos/configuration.nix @@ -0,0 +1,123 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # networking.hostName = "nixos"; # Define your hostname. + + # Configure network connections interactively with nmcli or nmtui. + networking.networkmanager.enable = true; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # 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 xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # services.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.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; [ + # tree + # ]; + # }; + + # programs.firefox.enable = true; + + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # 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 option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "25.11"; # Did you read the comment? + +} + diff --git a/systems/x86_64-linux/nuc-nixos/default.nix b/systems/x86_64-linux/nuc-nixos/default.nix index 30e4f60..ef761b9 100644 --- a/systems/x86_64-linux/nuc-nixos/default.nix +++ b/systems/x86_64-linux/nuc-nixos/default.nix @@ -4,6 +4,7 @@ ... }: { + # imports = [ ./hardware-configuration.nix ]; ${namespace} = { # ################################################### # # Boot # # diff --git a/systems/x86_64-linux/nuc-nixos/hardware-configuration.nix b/systems/x86_64-linux/nuc-nixos/hardware-configuration.nix new file mode 100644 index 0000000..c08296b --- /dev/null +++ b/systems/x86_64-linux/nuc-nixos/hardware-configuration.nix @@ -0,0 +1,69 @@ +# 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 = [ "ahci" "nvme" "xhci_pci" "thunderbolt" "uas" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + boot.initrd.luks.devices."nuc-nixos-cryptroot".device = "/dev/disk/by-uuid/6564be77-2b7f-4078-a791-cc74ffccc561"; + + fileSystems."/" = + { device = "none"; + fsType = "tmpfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/08E3-88DB"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/nix" = + { device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; + fsType = "bcachefs"; + options = [ "noatime" "X-mount.subdir=nix" ]; + }; + + fileSystems."/etc" = + { device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; + fsType = "bcachefs"; + options = [ "noatime" "X-mount.subdir=etc" ]; + }; + + fileSystems."/var/log" = + { device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; + fsType = "bcachefs"; + options = [ "noatime" "X-mount.subdir=log" ]; + }; + + fileSystems."/root" = + { device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; + fsType = "bcachefs"; + options = [ "noatime" "X-mount.subdir=root" ]; + }; + + fileSystems."/persist" = + { device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; + fsType = "bcachefs"; + options = [ "noatime" "X-mount.subdir=persist" ]; + }; + + fileSystems."/home" = + { device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; + fsType = "bcachefs"; + options = [ "X-mount.subdir=home" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}