From 032333a83e7d9ee7d75a323ee23b8414979d24c5 Mon Sep 17 00:00:00 2001 From: Haak Saxberg Date: Sat, 27 May 2023 20:34:09 -0700 Subject: [PATCH] clean up deprecated fields, update nix format for some files --- nix/system/framework/configuration.nix | 5 +++++ nix/system/framework/hardware-configuration.nix | 2 -- nix/system/svalbard/hardware-configuration.nix | 2 -- nix/system/xps11/hardware-configuration.nix | 14 +++++++------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/nix/system/framework/configuration.nix b/nix/system/framework/configuration.nix index 25e95a6..f943d6e 100644 --- a/nix/system/framework/configuration.nix +++ b/nix/system/framework/configuration.nix @@ -67,6 +67,11 @@ zsh ]; + # nixopsUnstable relies on an insecure package via poetry. + nixpkgs.config.permittedInsecurePackages = [ + "python3.10-cryptography-3.4.8" + ]; + nixpkgs.config.allowUnfree = true; # Open ports in the firewall. diff --git a/nix/system/framework/hardware-configuration.nix b/nix/system/framework/hardware-configuration.nix index df3cf30..fddb639 100644 --- a/nix/system/framework/hardware-configuration.nix +++ b/nix/system/framework/hardware-configuration.nix @@ -36,6 +36,4 @@ [{ device = "/dev/disk/by-uuid/97c769a2-55da-475a-8dc0-d74d8bbde514"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/nix/system/svalbard/hardware-configuration.nix b/nix/system/svalbard/hardware-configuration.nix index 57f02cf..726fd80 100644 --- a/nix/system/svalbard/hardware-configuration.nix +++ b/nix/system/svalbard/hardware-configuration.nix @@ -50,6 +50,4 @@ # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/nix/system/xps11/hardware-configuration.nix b/nix/system/xps11/hardware-configuration.nix index 21b6125..070daa5 100644 --- a/nix/system/xps11/hardware-configuration.nix +++ b/nix/system/xps11/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "rtsx_pci_sdmmc" ]; @@ -14,18 +15,19 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/0c611a53-c0a2-44e9-bfcb-b1eb5a0eb091"; + { + device = "/dev/disk/by-uuid/0c611a53-c0a2-44e9-bfcb-b1eb5a0eb091"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CD83-9304"; + { + device = "/dev/disk/by-uuid/CD83-9304"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/6383cc5e-aa54-4d75-a7f2-1368df9b6ecf"; } - ]; + [{ device = "/dev/disk/by-uuid/6383cc5e-aa54-4d75-a7f2-1368df9b6ecf"; }]; # 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 @@ -37,6 +39,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; }