diff options
| -rw-r--r-- | nixos/modules/desktop.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/generic.nix | 1 | ||||
| -rw-r--r-- | pkgs/default.nix | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index 6979252..87dc12e 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -193,7 +193,7 @@ in { programs.usbkey = { enable = true; - devicesUUID = []; + devicesUUID = ["de269652-2070-46b2-84f8-409dc9dd50ee" "16a089d0-a663-4047-bd88-3885dd7fdee2"]; }; programs.gnupg.agent = { @@ -254,8 +254,10 @@ in { services.udev.extraRules = '' ACTION=="add|change", KERNEL=="sd*[!0-9]", ATTR{queue/scheduler}="bfq" ''; - hardware.opengl.driSupport = true; - hardware.opengl.driSupport32Bit = true; + hardware.opengl = { + driSupport = true; + driSupport32Bit = true; + }; hardware.bluetooth.enable = mkIf cnf.laptop true; diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix index 232fbda..a3e8dd1 100644 --- a/nixos/modules/generic.nix +++ b/nixos/modules/generic.nix @@ -164,7 +164,6 @@ in { } ]; networking.dhcpcd.extraConfig = "controlgroup wheel"; - environment.etc."dhcpcd.conf".text = "controlgroup wheel"; services.openssh.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index bed1bc4..38ce6b8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -20,4 +20,9 @@ final: prev: { lorem-text = final.callPackage ./lorem-text {}; bigclown-leds = final.callPackage ./bigclown-leds {}; + + # nixpkgs patches + #zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: { + # npmInstallFlags = ["--no-optional"]; # Fix cross build + #}); } |