summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-12-04 18:33:43 +0100
committermakefu <github@syntax-fehler.de>2021-12-04 18:33:43 +0100
commitc22610c8e695cf9f8b48a1fa9040f57187064e77 (patch)
treede64a5cea287197a71dea4681d46c08919132dd7 /lass
parent33d13bff84c85ad9f22300598a0c4115e3361f7f (diff)
parent70be7f119b25f1913be9a219f5dad0b179405b4e (diff)
Merge remote-tracking branch 'lass/21.11' into 21.11
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/coaxmetal/physical.nix10
-rw-r--r--lass/2configs/bitlbee.nix17
-rw-r--r--lass/2configs/hass/default.nix11
-rw-r--r--lass/3modules/usershadow.nix17
4 files changed, 27 insertions, 28 deletions
diff --git a/lass/1systems/coaxmetal/physical.nix b/lass/1systems/coaxmetal/physical.nix
index b033477fe..6be047300 100644
--- a/lass/1systems/coaxmetal/physical.nix
+++ b/lass/1systems/coaxmetal/physical.nix
@@ -56,14 +56,4 @@
xinput set-prop 'ETPS/2 Elantech TrackPoint' 'Evdev Wheel Emulation Button' 2
xinput set-prop 'ETPS/2 Elantech TrackPoint' 'Evdev Wheel Emulation Axes' 6 7 4 5
'';
-
- # https://forums.lenovo.com/t5/Fedora/T14s-AMD-Trackpoint-almost-unusable/m-p/5064952?page=4
- # https://bugzilla.kernel.org/show_bug.cgi?id=209167#c1
- boot.kernelPatches = [{
- name = "fix-trackpoint-jumping";
- patch = pkgs.fetchurl {
- url = "https://patchwork.kernel.org/project/linux-input/patch/20210729010940.5752-1-phoenix@emc.com.tw/raw/";
- sha256 = "0apbf7c8w830dbdsrmxpip90d5zbg74a939x89jfgpvm5gbdqdjg";
- };
- }];
}
diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix
index d8f1ae888..b84221155 100644
--- a/lass/2configs/bitlbee.nix
+++ b/lass/2configs/bitlbee.nix
@@ -11,9 +11,22 @@ with (import <stockholm/lib>);
pkgs.bitlbee-discord
];
libpurple_plugins = [
- # pkgs.telegram-purple
- pkgs.tdlib-purple
+ pkgs.telegram-purple
+ # pkgs.tdlib-purple
# pkgs.purple-gowhatsapp
];
};
+
+ users.users.bitlbee = {
+ uid = genid_uint31 "bitlbee";
+ isSystemUser = true;
+ group = "bitlbee";
+ };
+ users.groups.bitlbee = {};
+
+ systemd.services.bitlbee.serviceConfig = {
+ DynamicUser = lib.mkForce false;
+ User = "bitlbee";
+ StateDirectory = lib.mkForce null;
+ };
}
diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index be9c32809..b303df938 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -119,13 +119,10 @@ in {
services.mosquitto = {
enable = true;
- host = "0.0.0.0";
- allowAnonymous = false;
- checkPasswords = true;
- users.gg23 = {
- password = "gg23-mqtt";
- acl = [ "topic readwrite #" ];
- };
+ listeners = [{
+ acl = [ "topic pattern readwrite #" ];
+ users.gg23 = { acl = [ "topic readwrite #" ]; password = "gg23-mqtt"; };
+ }];
};
environment.systemPackages = [ pkgs.mosquitto ];
diff --git a/lass/3modules/usershadow.nix b/lass/3modules/usershadow.nix
index c3d4de84d..b1011ced0 100644
--- a/lass/3modules/usershadow.nix
+++ b/lass/3modules/usershadow.nix
@@ -28,23 +28,22 @@
session required pam_permit.so
'';
- security.pam.services.dovecot2 = {
- text = ''
- auth required pam_exec.so expose_authtok /run/wrappers/bin/shadow_verify_pam ${cfg.pattern}
- auth required pam_permit.so
- account required pam_permit.so
- session required pam_permit.so
- session required pam_env.so envfile=${config.system.build.pamEnvironment}
- '';
- };
+ security.pam.services.dovecot2.text = ''
+ auth required pam_exec.so expose_authtok /run/wrappers/bin/shadow_verify_pam ${cfg.pattern}
+ auth required pam_permit.so
+ account required pam_permit.so
+ session required pam_permit.so
+ '';
security.wrappers.shadow_verify_pam = {
source = "${usershadow}/bin/verify_pam";
owner = "root";
+ group = "root";
};
security.wrappers.shadow_verify_arg = {
source = "${usershadow}/bin/verify_arg";
owner = "root";
+ group = "root";
};
};