Merge remote-tracking branch 'gum/21.11' into 21.11
This commit is contained in:
commit
503c0176c1
@ -269,6 +269,7 @@ let
|
|||||||
home = cfg.stateDir;
|
home = cfg.stateDir;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
|
group = "airdcpp";
|
||||||
inherit (cfg) extraGroups;
|
inherit (cfg) extraGroups;
|
||||||
};
|
};
|
||||||
groups.airdcpp.gid = genid "airdcpp";
|
groups.airdcpp.gid = genid "airdcpp";
|
||||||
|
@ -194,7 +194,9 @@ let
|
|||||||
home = cfg.dataDir;
|
home = cfg.dataDir;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
|
group = user.name;
|
||||||
};
|
};
|
||||||
|
users.groups.${user.name} = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
user = rec {
|
user = rec {
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
"date": "2021-12-01T16:06:54+01:00",
|
"date": "2021-12-01T16:06:54+01:00",
|
||||||
"path": "/nix/store/88zw2qrbzaq3bnnsmz9qc4lvkwg0168g-nixpkgs",
|
"path": "/nix/store/88zw2qrbzaq3bnnsmz9qc4lvkwg0168g-nixpkgs",
|
||||||
"sha256": "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj",
|
"sha256": "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj",
|
||||||
"fetchLFS": false,
|
|
||||||
"fetchSubmodules": false,
|
"fetchSubmodules": false,
|
||||||
"deepClone": false,
|
"deepClone": false,
|
||||||
"leaveDotGit": false
|
"leaveDotGit": false
|
||||||
|
@ -159,7 +159,7 @@ in {
|
|||||||
<stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix>
|
<stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix>
|
||||||
# <stockholm/makefu/2configs/deployment/systemdultras-rss.nix>
|
# <stockholm/makefu/2configs/deployment/systemdultras-rss.nix>
|
||||||
|
|
||||||
<stockholm/makefu/2configs/shiori.nix>
|
# <stockholm/makefu/2configs/shiori.nix>
|
||||||
# <stockholm/makefu/2configs/workadventure>
|
# <stockholm/makefu/2configs/workadventure>
|
||||||
|
|
||||||
<stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
|
<stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
|
||||||
|
@ -75,7 +75,7 @@ in {
|
|||||||
# Logging
|
# Logging
|
||||||
#influx + grafana
|
#influx + grafana
|
||||||
<stockholm/makefu/2configs/stats/server.nix>
|
<stockholm/makefu/2configs/stats/server.nix>
|
||||||
<stockholm/makefu/2configs/stats/nodisk-client.nix>
|
# <stockholm/makefu/2configs/stats/nodisk-client.nix>
|
||||||
# logs to influx
|
# logs to influx
|
||||||
<stockholm/makefu/2configs/stats/external/aralast.nix>
|
<stockholm/makefu/2configs/stats/external/aralast.nix>
|
||||||
<stockholm/makefu/2configs/stats/telegraf>
|
<stockholm/makefu/2configs/stats/telegraf>
|
||||||
|
@ -12,7 +12,7 @@ in
|
|||||||
services.zigbee2mqtt = {
|
services.zigbee2mqtt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit dataDir;
|
inherit dataDir;
|
||||||
config = {
|
settings = {
|
||||||
permit_join = true;
|
permit_join = true;
|
||||||
serial.port = "/dev/cc2531";
|
serial.port = "/dev/cc2531";
|
||||||
homeassistant = true;
|
homeassistant = true;
|
||||||
|
@ -39,7 +39,9 @@ in {
|
|||||||
home = stateDir;
|
home = stateDir;
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
|
group = ddclientUser;
|
||||||
};
|
};
|
||||||
|
users.groups.${ddclientUser} = {};
|
||||||
|
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
ddclient-nsupdate-uhub = {
|
ddclient-nsupdate-uhub = {
|
||||||
@ -83,32 +85,33 @@ in {
|
|||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
group = "uhub";
|
group = "uhub";
|
||||||
};
|
};
|
||||||
users.group.uhub = {};
|
users.groups.uhub = {};
|
||||||
services.uhub.home = {
|
services.uhub.home = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 1511;
|
|
||||||
enableTLS = true;
|
enableTLS = true;
|
||||||
hubConfig = ''
|
settings = {
|
||||||
hub_name = "krebshub"
|
server_port = 1511;
|
||||||
tls_certificate = ${uhubDir}/uhub.crt
|
hub_name = "krebshub";
|
||||||
tls_private_key = ${uhubDir}/uhub.key
|
tls_certificate = "${uhubDir}/uhub.crt";
|
||||||
registered_users_only = true
|
tls_private_key = "${uhubDir}/uhub.key";
|
||||||
'';
|
registered_users_only = true;
|
||||||
plugins = {
|
|
||||||
welcome = {
|
|
||||||
enable = true;
|
|
||||||
motd = "shareit";
|
|
||||||
rules = "1. Don't be an asshole";
|
|
||||||
};
|
|
||||||
history = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
authSqlite = {
|
|
||||||
enable = true;
|
|
||||||
file = "${uhubDir}/uhub.sql";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
plugins = [
|
||||||
|
{
|
||||||
|
plugin = "${pkgs.uhub}/plugins/mod_auth_sqlite.so";
|
||||||
|
settings.file = "${uhubDir}/uhub.sql";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
plugin = "${pkgs.uhub}/plugins/mod_welcome.so";
|
||||||
|
settings.motd = "shareit";
|
||||||
|
settings.rules = "1. Don't be an asshole";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
plugin = "${pkgs.uhub}/plugins/mod_history.so";
|
||||||
|
settings.motd = "shareit";
|
||||||
|
settings.rules = "1. Don't be an asshole";
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ 411 1511 ];
|
networking.firewall.allowedTCPPorts = [ 411 1511 ];
|
||||||
}
|
}
|
||||||
|
@ -11,8 +11,8 @@ with pkgs.python3Packages;buildPythonPackage rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "binaergewitter";
|
owner = "binaergewitter";
|
||||||
repo = "gecloudpad";
|
repo = "gecloudpad";
|
||||||
rev = "master";
|
rev = "1399ede4e609f63fbf1c4560979a6b22b924e0c5";
|
||||||
sha256 = "0p9lcphp3r7hyypxadzw4x9ix6d0anmspxnjnj0v2jjll8gxqlhf";
|
sha256 = "1w74j5ks7naalzrib87r0adq20ik5x3x5l520apagb7baszn17lb";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
user = "makefu";
|
user = "makefu";
|
||||||
};
|
};
|
||||||
displayManager.defaultSession = "gnome";
|
displayManager.defaultSession = "gnome";
|
||||||
desktopManager.gnome3.enable = true;
|
desktopManager.gnome.enable = true;
|
||||||
displayManager.sessionCommands = ''
|
displayManager.sessionCommands = ''
|
||||||
${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
|
${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
|
||||||
${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
|
${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
|
||||||
|
@ -9,8 +9,7 @@
|
|||||||
listeners = [
|
listeners = [
|
||||||
{
|
{
|
||||||
port = 1883;
|
port = 1883;
|
||||||
omitPasswordAuth = true;
|
omitPasswordAuth = false;
|
||||||
checkPasswords = true;
|
|
||||||
users.sensor = {
|
users.sensor = {
|
||||||
hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
|
hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
|
||||||
acl = [ "topic readwrite #" ];
|
acl = [ "topic readwrite #" ];
|
||||||
|
@ -28,14 +28,16 @@ let
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
in {
|
in {
|
||||||
users.extraUsers = singleton {
|
users.users.${ddclientUser} = {
|
||||||
name = ddclientUser;
|
name = ddclientUser;
|
||||||
uid = genid "ddclient";
|
uid = genid ddclientUser;
|
||||||
description = "ddclient daemon user";
|
description = "ddclient daemon user";
|
||||||
home = stateDir;
|
home = stateDir;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
|
group = ddclientUser;
|
||||||
};
|
};
|
||||||
|
users.groups.${ddclientUser} = {};
|
||||||
|
|
||||||
systemd.services = {
|
systemd.services = {
|
||||||
ddclient-nsupdate-elchos = {
|
ddclient-nsupdate-elchos = {
|
||||||
|
@ -14,7 +14,9 @@ in {
|
|||||||
uid = config.ids.uids.smbguest;
|
uid = config.ids.uids.smbguest;
|
||||||
description = "smb guest user";
|
description = "smb guest user";
|
||||||
home = "/var/empty";
|
home = "/var/empty";
|
||||||
|
group = "share";
|
||||||
};
|
};
|
||||||
|
users.groups.share = {};
|
||||||
services.samba = {
|
services.samba = {
|
||||||
enable = true;
|
enable = true;
|
||||||
shares = {
|
shares = {
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# mitmproxy
|
# mitmproxy
|
||||||
nmap
|
nmap
|
||||||
msf
|
msf
|
||||||
drozer
|
#drozer
|
||||||
#dex2jar
|
#dex2jar
|
||||||
apktool
|
apktool
|
||||||
jd-gui
|
jd-gui
|
||||||
|
@ -30,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
|
|||||||
homepage = https://github.com/mwrlabs/drozer/;
|
homepage = https://github.com/mwrlabs/drozer/;
|
||||||
description = "The Leading Security Assessment Framework for Android";
|
description = "The Leading Security Assessment Framework for Android";
|
||||||
license = lib.licenses.bsd2;
|
license = lib.licenses.bsd2;
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
|
|
||||||
, tlsSupport ? false }:
|
|
||||||
|
|
||||||
assert tlsSupport -> openssl != null;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "uhub";
|
|
||||||
version = "2019-06-18";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "janvidar";
|
|
||||||
repo = "uhub";
|
|
||||||
rev = "78a703924064a92cedeb0a5aab5a80d8f77db73e";
|
|
||||||
sha256 = "1dqmj08salhbcdlkglbi03hn9jzgmhjqlb0iysafpzrrwi0mca1z";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [ cmake sqlite systemd ] ++ lib.optional tlsSupport openssl;
|
|
||||||
|
|
||||||
outputs = [ "out"
|
|
||||||
"mod_example"
|
|
||||||
"mod_welcome"
|
|
||||||
"mod_logging"
|
|
||||||
"mod_auth_simple"
|
|
||||||
"mod_auth_sqlite"
|
|
||||||
"mod_chat_history"
|
|
||||||
"mod_chat_only"
|
|
||||||
"mod_topic"
|
|
||||||
"mod_no_guest_downloads"
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
<nixpkgs/pkgs/servers/uhub/plugin-dir.patch>
|
|
||||||
];
|
|
||||||
|
|
||||||
cmakeFlags = ''
|
|
||||||
-DSYSTEMD_SUPPORT=ON
|
|
||||||
${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"}
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "High performance peer-to-peer hub for the ADC network";
|
|
||||||
homepage = https://www.uhub.org/;
|
|
||||||
license = licenses.gpl3;
|
|
||||||
maintainers = [ maintainers.ehmry ];
|
|
||||||
platforms = platforms.unix;
|
|
||||||
};
|
|
||||||
}
|
|
@ -77,7 +77,7 @@
|
|||||||
(lib.mkIf ( host-src.home-manager ) {
|
(lib.mkIf ( host-src.home-manager ) {
|
||||||
home-manager.git = {
|
home-manager.git = {
|
||||||
url = https://github.com/rycee/home-manager;
|
url = https://github.com/rycee/home-manager;
|
||||||
ref = "fd5fbb0a241f644908cdf01ccd1821d0606fb4fd";
|
ref = "6ce1d64073f48b9bc9425218803b1b607454c1e7";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user