Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
4377c32297
@ -130,7 +130,7 @@
|
|||||||
# Virtualization
|
# Virtualization
|
||||||
# <stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
# <stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
||||||
<stockholm/makefu/2configs/virtualisation/docker.nix>
|
<stockholm/makefu/2configs/virtualisation/docker.nix>
|
||||||
# <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
|
<stockholm/makefu/2configs/virtualisation/virtualbox.nix>
|
||||||
#{
|
#{
|
||||||
# networking.firewall.allowedTCPPorts = [ 8080 ];
|
# networking.firewall.allowedTCPPorts = [ 8080 ];
|
||||||
# networking.nat = {
|
# networking.nat = {
|
||||||
|
@ -32,5 +32,9 @@
|
|||||||
|
|
||||||
users.groups.video = {};
|
users.groups.video = {};
|
||||||
users.users.makefu.extraGroups = [ "video" ];
|
users.users.makefu.extraGroups = [ "video" ];
|
||||||
|
|
||||||
|
boot.extraModprobeConfig = ''
|
||||||
|
options thinkpad_acpi fan_control=1
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
channel = "#binaergewitter";
|
channel = "#binaergewitter";
|
||||||
notifyErrors = false;
|
notifyErrors = false;
|
||||||
irc = {
|
irc = {
|
||||||
host = "irc.freenode.net";
|
host = "irc.libera.chat";
|
||||||
port = 6667;
|
port = 6667;
|
||||||
};
|
};
|
||||||
#controller = {
|
#controller = {
|
||||||
|
@ -15,7 +15,7 @@ in {
|
|||||||
inputConfig = ''
|
inputConfig = ''
|
||||||
irc {
|
irc {
|
||||||
channels => [ "#krebs", "#afra" ]
|
channels => [ "#krebs", "#afra" ]
|
||||||
host => "irc.freenode.net"
|
host => "irc.hackint.org"
|
||||||
nick => "dirctator"
|
nick => "dirctator"
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
@ -17,7 +17,7 @@ in {
|
|||||||
echo "$message"
|
echo "$message"
|
||||||
LOGNAME=sec-announcer
|
LOGNAME=sec-announcer
|
||||||
HOSTNAME=$(${pkgs.systemd}/bin/hostnamectl --transient)
|
HOSTNAME=$(${pkgs.systemd}/bin/hostnamectl --transient)
|
||||||
IRC_SERVER=irc.freenode.net
|
IRC_SERVER=irc.hackint.org
|
||||||
IRC_PORT=6667
|
IRC_PORT=6667
|
||||||
IRC_NICK=$HOSTNAME-$$
|
IRC_NICK=$HOSTNAME-$$
|
||||||
IRC_CHANNEL='#eloop'
|
IRC_CHANNEL='#eloop'
|
||||||
|
@ -36,6 +36,7 @@ let
|
|||||||
platform = "state";
|
platform = "state";
|
||||||
entity_id = entity;
|
entity_id = entity;
|
||||||
to = "off";
|
to = "off";
|
||||||
|
for.seconds = 10;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
condition = [
|
condition = [
|
||||||
@ -61,12 +62,13 @@ let
|
|||||||
in {
|
in {
|
||||||
services.home-assistant.config = {
|
services.home-assistant.config = {
|
||||||
input_boolean = {
|
input_boolean = {
|
||||||
badezimmerfinester_lang_offen.name = "Badezimmer lange offen";
|
badezimmerfenster_lang_offen.name = "Badezimmer lange offen";
|
||||||
duschfenster_lang_offen.name = "Duschfenster lange offen";
|
duschfenster_lang_offen.name = "Duschfenster lange offen";
|
||||||
};
|
};
|
||||||
automation = [
|
automation = [
|
||||||
(fenster_geschlossen_lang "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
(fenster_geschlossen_lang "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
||||||
(fenster_geschlossen_lang "Duschfenster" "binary_sensor.badezimmer_fenster_contact")
|
(fenster_geschlossen_lang "Duschfenster" "binary_sensor.dusche_fenster_contact")
|
||||||
|
|
||||||
(fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
(fenster_offen "Badezimmerfenster" "binary_sensor.badezimmer_fenster_contact")
|
||||||
(fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact")
|
(fenster_offen "Duschfenster" "binary_sensor.dusche_fenster_contact")
|
||||||
];
|
];
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
config = {
|
config = {
|
||||||
channel = "#systemdultras";
|
channel = "#systemdultras";
|
||||||
irc = {
|
irc = {
|
||||||
host = "irc.freenode.net";
|
host = "irc.hackint.org";
|
||||||
port = 6667;
|
port = 6667;
|
||||||
};
|
};
|
||||||
notifyErrors = false;
|
notifyErrors = false;
|
||||||
|
66
makefu/5pkgs/chitubox/default.nix
Normal file
66
makefu/5pkgs/chitubox/default.nix
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
{ stdenv, autoPatchelfHook, libglvnd
|
||||||
|
, libgcrypt,zlib,glib,fontconfig,freetype,libdrm
|
||||||
|
, libxkbcommon
|
||||||
|
, libpulseaudio
|
||||||
|
, xlibs
|
||||||
|
, gst_all_1
|
||||||
|
, kerberos
|
||||||
|
, alsaLib
|
||||||
|
}:
|
||||||
|
# via https://raw.githubusercontent.com/simon-the-sourcerer-ab/chitubox/main/default.nix
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "chitubox";
|
||||||
|
|
||||||
|
version = "1.8.1";
|
||||||
|
|
||||||
|
src = builtins.fetchTarball {
|
||||||
|
url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
|
||||||
|
sha256 = "08fh8w7s5qvlx6bhdg24g81a7zprq7n8m27w2vdv0cd8j0wixbsx";
|
||||||
|
};
|
||||||
|
nativeBuildInputs = [ autoPatchelfHook ];
|
||||||
|
|
||||||
|
buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm
|
||||||
|
libxkbcommon libpulseaudio kerberos alsaLib
|
||||||
|
xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
|
||||||
|
gst_all_1.gst-plugins-base gst_all_1.gstreamer
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
mkdir -p bin
|
||||||
|
mv CHITUBOX bin/chitubox
|
||||||
|
|
||||||
|
# Remove unused stuff
|
||||||
|
rm AppRun
|
||||||
|
|
||||||
|
# Place resources where ChiTuBox can expect to find them
|
||||||
|
mkdir ChiTuBox
|
||||||
|
mv resource ChiTuBox/
|
||||||
|
|
||||||
|
# Configure Qt paths
|
||||||
|
cat << EOF > bin/qt.conf
|
||||||
|
[Paths]
|
||||||
|
Prefix = $out
|
||||||
|
Plugins = plugins
|
||||||
|
Imports = qml
|
||||||
|
Qml2Imports = qml
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out
|
||||||
|
mv * $out/
|
||||||
|
'';
|
||||||
|
|
||||||
|
autoPatchelfIgnoreMissingDeps=true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A Revolutionary Tool to Change 3D Printing Processes within One Click";
|
||||||
|
homepage = "https://www.chitubox.com";
|
||||||
|
license = {
|
||||||
|
fullName = "ChiTuBox EULA";
|
||||||
|
shortName = "ChiTuBox";
|
||||||
|
url = "https://www.chitubox.com";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user