summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-10-15 08:47:31 +0200
committermakefu <github@syntax-fehler.de>2019-10-15 08:47:31 +0200
commitd82b3b9b66d8493426bfff9936d34ff5d76734dd (patch)
treef738f2ab23df10969efb030d729780811c3aed27
parentfb121299ab56d9a36abafdab12b42b207d7bcb60 (diff)
ma: fix warnings and errors for 19.09
-rw-r--r--makefu/2configs/hw/tp-x230.nix1
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix1
-rw-r--r--makefu/2configs/tools/pcmanfm-extra.nix2
-rw-r--r--makefu/3modules/opentracker.nix2
-rw-r--r--makefu/5pkgs/default.nix16
5 files changed, 11 insertions, 11 deletions
diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index a6ded0a3..37d1affb 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 5570bec5..564925db 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/tools/pcmanfm-extra.nix b/makefu/2configs/tools/pcmanfm-extra.nix
index 2d5d20f8..f28f9a91 100644
--- a/makefu/2configs/tools/pcmanfm-extra.nix
+++ b/makefu/2configs/tools/pcmanfm-extra.nix
@@ -7,5 +7,5 @@
lxmenu-data
];
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
- services.gnome3.gvfs.enable = true;
+ services.gvfs.enable = true;
}
diff --git a/makefu/3modules/opentracker.nix b/makefu/3modules/opentracker.nix
index 202231fa..6c65b82b 100644
--- a/makefu/3modules/opentracker.nix
+++ b/makefu/3modules/opentracker.nix
@@ -18,7 +18,7 @@ let
};
args = mkOption {
- type = types.string;
+ type = types.separatedString;
description = ''
see https://erdgeist.org/arts/software/opentracker/ for all params
'';
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 0f87265a..bbd99ffe 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -25,15 +25,15 @@ in {
patches = [ ./custom/quodlibet/single-digit-discnumber.patch
./custom/quodlibet/remove-override-warning.patch ];
});
- rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
- postInstall = old.postInstall + ''
+ #rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
+ # postInstall = old.postInstall + ''
- $out/bin/rclone genautocomplete zsh _rclone
- install -D -m644 _rclone $out/share/zsh/vendor-completions/_rclone
- $out/bin/rclone genautocomplete bash _rclone
- install -D -m644 _rclone $out/etc/bash_completion.d/rclone
- '';
- });
+ # $out/bin/rclone genautocomplete zsh _rclone
+ # install -D -m644 _rclone $out/share/zsh/vendor-completions/_rclone
+ # $out/bin/rclone genautocomplete bash _rclone
+ # install -D -m644 _rclone $out/etc/bash_completion.d/rclone
+ # '';
+ #});
alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};