Testing new packages (for pbp)

profiles/cachix/aciceri-fleet.nix

@@ -1,9 +1,9 @@
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://aciceri-fleet.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI="
     ];
   };

profiles/cachix/arm.nix

@@ -1,9 +1,9 @@
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://arm.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8="
     ];
   };

profiles/cachix/default.nix

@@ -7,5 +7,5 @@ let
 in
 {
   inherit imports;
-  nix.binaryCaches = [ "https://cache.nixos.org/" ];
+  nix.settings.substituters = [ "https://cache.nixos.org/" ];
 }

profiles/cachix/haskell.nix

@@ -1,9 +1,9 @@
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://hydra.iohk.io"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
     ];
   };

profiles/cachix/nix-community.nix

@@ -1,9 +1,9 @@
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://nix-community.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };

profiles/cachix/nixpkgs-wayland.nix

@@ -1,9 +1,9 @@
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://nixpkgs-wayland.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
     ];
   };

profiles/cachix/nrdxp.nix

@@ -1,9 +1,9 @@
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://nrdxp.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
     ];
   };

profiles/core/default.nix

@@ -5,8 +5,6 @@ in
 {
   imports = [ ../cachix ];
 
-  nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-
   environment = {
 
     systemPackages = with pkgs; [
@@ -52,12 +50,15 @@ in
   ];
 
   nix = {
-    autoOptimiseStore = true;
     gc.automatic = true;
     optimise.automatic = true;
-    useSandbox = true;
-    allowedUsers = [ "@wheel" ];
-    trustedUsers = [ "root" "@wheel" ];
+    settings = {
+      sandbox = true;
+      trusted-users = [ "root" "@wheel" ];
+      allowed-users = [ "@wheel" ];
+      system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+      auto-optimise-store = true;
+    };
     extraOptions = ''
       min-free = 536870912
       keep-outputs = true

profiles/dbus/default.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }:
 {
-  services.dbus.packages = with pkgs; [ gnome3.dconf ];
+  services.dbus.packages = with pkgs; [ dconf ];
   programs.dconf.enable = true;
 }

profiles/qmk-udev/default.nix

@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  services.udev.packages = [ pkgs.qmk-udev-rules ];
+}