From a01bf8fb4349d98855d30d72ce441f88576b0ade Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me> Date: Wed, 10 Jan 2024 20:24:02 -0500 Subject: [PATCH] Added silversin computer --- config/silversin/config.nix | 1 + config/silversin/default.nix | 40 ++++++++++++++++-------------- pkgs/multimedia/stylix/default.nix | 5 +++- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/config/silversin/config.nix b/config/silversin/config.nix index 6a9d74c..fdf23b1 100644 --- a/config/silversin/config.nix +++ b/config/silversin/config.nix @@ -35,5 +35,6 @@ ../../pkgs/social_media ../../pkgs/virtualisation ../../pkgs/productivity + ../../pkgs/multimedia/stylix ]; } diff --git a/config/silversin/default.nix b/config/silversin/default.nix index e7a1f13..9fddef4 100644 --- a/config/silversin/default.nix +++ b/config/silversin/default.nix @@ -12,8 +12,6 @@ networking.hostName = "silversin"; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" "v4l2loopback" ]; boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; @@ -53,24 +51,30 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - luks = { - # Support for Yubikey PBA - yubikeySupport = true; + boot.initrd = { + availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + # Required to open the EFI partition and Yubikey + kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ]; - devices."pv_main" = { - device = "/dev/disk/by-uuid/83988b6e-ad46-4fc7-b133-db1a3941d0b6"; # nvme0n1p2 - preLVM = true; # You may want to set this to false if you need to start a network service first - yubikey = { - slot = 2; - twoFactor = true; # Set to false for 1FA - #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted - keyLength = 64; # Set to $KEY_LENGTH/8 - saltLength = 16; # Set to $SALT_LENGTH + luks = { + # Support for Yubikey PBA + yubikeySupport = true; - storage = { - device = "/dev/disk/by-uuid/CCC2-5AFE"; #nvme0n1p1 - fsType = "vfat"; - path = "/crypt-storage/default"; + devices."pv_main" = { + device = "/dev/disk/by-uuid/83988b6e-ad46-4fc7-b133-db1a3941d0b6"; # nvme0n1p2 + preLVM = true; # You may want to set this to false if you need to start a network service first + yubikey = { + slot = 2; + twoFactor = true; # Set to false for 1FA + #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted + keyLength = 64; # Set to $KEY_LENGTH/8 + saltLength = 16; # Set to $SALT_LENGTH + + storage = { + device = "/dev/disk/by-uuid/CCC2-5AFE"; #nvme0n1p1 + fsType = "vfat"; + path = "/crypt-storage/default"; + }; }; }; }; diff --git a/pkgs/multimedia/stylix/default.nix b/pkgs/multimedia/stylix/default.nix index 91fc673..3461c10 100644 --- a/pkgs/multimedia/stylix/default.nix +++ b/pkgs/multimedia/stylix/default.nix @@ -10,7 +10,10 @@ in stylix.image = background; #stylix.polarity = "dark"; - + #stylix.image = pkgs.fetchurl { + # url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; + # sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; + #}; # Comment the following line to automatically generate colors from image stylix.base16Scheme = ./colors.yaml; -- GitLab