diff options
author | lassulus <lassulus@lassul.us> | 2019-10-16 11:39:55 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2019-10-16 11:39:55 +0200 |
commit | 1cfe17faa0b5b2d062da0b3cdbda34b1241dac02 (patch) | |
tree | 2ae25beec60641929e65d22b05a241eff656b8c0 /makefu/2configs/hw | |
parent | 005d456ef42ca1a371131a558e834944ce2e616f (diff) | |
parent | 349ccf95e76dec7d3eb87b96cc8bb8bcb3317dc0 (diff) |
Merge remote-tracking branch 'gum/19.09'
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r-- | makefu/2configs/hw/tp-x230.nix | 1 | ||||
-rw-r--r-- | makefu/2configs/hw/tp-x2x0.nix | 1 | ||||
-rw-r--r-- | makefu/2configs/hw/upower.nix | 6 |
3 files changed, 7 insertions, 1 deletions
diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix index a6ded0a3e..37d1affb7 100644 --- a/makefu/2configs/hw/tp-x230.nix +++ b/makefu/2configs/hw/tp-x230.nix @@ -7,7 +7,6 @@ with import <stockholm/lib>; # configured media keys inside awesomerc # sound.mediaKeys.enable = true; - hardware.bluetooth.enable = true; # possible i915 powersave options: # options i915 enable_rc6=1 enable_fbc=1 semaphores=1 diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index 5570bec55..564925db5 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -4,6 +4,7 @@ imports = [ ./tpm.nix ./ssd.nix + ./bluetooth.nix ]; boot.kernelModules = [ diff --git a/makefu/2configs/hw/upower.nix b/makefu/2configs/hw/upower.nix new file mode 100644 index 000000000..a3932fed3 --- /dev/null +++ b/makefu/2configs/hw/upower.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + services.upower.enable = true; + users.users.makefu.packages = [ pkgs.gnome3.gnome-power-manager ]; +} + |