summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/2configs/shack/glados/default.nix1
-rw-r--r--krebs/2configs/shack/prometheus/alert-rules.nix4
-rw-r--r--makefu/1systems/x/config.nix2
-rw-r--r--makefu/1systems/x/x13/default.nix2
-rw-r--r--makefu/2configs/editor/vim.nix2
-rw-r--r--makefu/2configs/gui/automatic-diskmount.nix1
-rw-r--r--makefu/2configs/gui/base.nix2
-rw-r--r--makefu/2configs/gui/wbob-kiosk.nix6
-rw-r--r--makefu/2configs/home/ham/automation/check-in.nix19
-rw-r--r--makefu/2configs/home/ham/default.nix2
-rw-r--r--makefu/2configs/home/photoprism.nix2
-rw-r--r--makefu/2configs/hw/bluetooth.nix1
-rw-r--r--makefu/2configs/hw/network-manager.nix2
-rw-r--r--makefu/2configs/tools/consoles.nix2
-rw-r--r--makefu/2configs/tools/core-gui.nix4
-rw-r--r--makefu/2configs/tools/pcmanfm-extra.nix3
-rw-r--r--makefu/2configs/tools/studio.nix2
-rw-r--r--makefu/2configs/virtualisation/docker.nix2
-rw-r--r--makefu/5pkgs/chitubox/default.nix4
-rw-r--r--makefu/5pkgs/ns-atmosphere-programmer/default.nix6
20 files changed, 41 insertions, 28 deletions
diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix
index e7860338c..7c941a66a 100644
--- a/krebs/2configs/shack/glados/default.nix
+++ b/krebs/2configs/shack/glados/default.nix
@@ -46,7 +46,6 @@ in {
services.home-assistant =
{
enable = true;
- autoExtraComponents = true;
package = unstable.home-assistant.overrideAttrs (old: {
doInstallCheck = false;
});
diff --git a/krebs/2configs/shack/prometheus/alert-rules.nix b/krebs/2configs/shack/prometheus/alert-rules.nix
index 65e5d9005..5ba49ede6 100644
--- a/krebs/2configs/shack/prometheus/alert-rules.nix
+++ b/krebs/2configs/shack/prometheus/alert-rules.nix
@@ -8,7 +8,7 @@ in {
{ name = "shack-env";
rules = [
{
- alert = "RootPartitionFull";
+ alert = "Wolf RootPartitionFull";
for = "30m";
expr = ''(node_filesystem_avail_bytes{alias="wolf.shack",mountpoint="/"} * 100) / node_filesystem_size_bytes{alias="wolf.shack",mountpoint="/"} < ${disk_free_threshold}'';
labels.severity = "warning";
@@ -24,7 +24,7 @@ in {
6. as a last resort the root disk can be expanded via `lvresize -L +10G /dev/pool/root && btrfs filesystem resize max /` '';
}
{
- alert = "RootPartitionFull";
+ alert = "Puyak RootPartitionFull";
for = "30m";
expr = ''(node_filesystem_avail_bytes{alias="puyak.shack",mountpoint="/"} * 100) / node_filesystem_size_bytes{alias="puyak.shack",mountpoint="/"} < ${disk_free_threshold}'';
labels.severity = "warning";
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index a4aa0cbab..0377c336f 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -74,7 +74,7 @@
#}
# { systemd.services.docker.wantedBy = lib.mkForce []; }
- <stockholm/makefu/2configs/dict.nix>
+ # <stockholm/makefu/2configs/dict.nix>
# <stockholm/makefu/2configs/legacy_only.nix>
#<stockholm/makefu/3modules/netboot_server.nix>
#{
diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix
index 7e9f4a6ac..d652229f9 100644
--- a/makefu/1systems/x/x13/default.nix
+++ b/makefu/1systems/x/x13/default.nix
@@ -8,7 +8,7 @@
<nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
# <stockholm/makefu/2configs/hw/tpm.nix>
<stockholm/makefu/2configs/hw/ssd.nix>
- <stockholm/makefu/2configs/hw/xmm7360.nix>
+ # <stockholm/makefu/2configs/hw/xmm7360.nix>
];
boot.zfs.requestEncryptionCredentials = true;
networking.hostId = "f8b8e0a2";
diff --git a/makefu/2configs/editor/vim.nix b/makefu/2configs/editor/vim.nix
index 07f80719d..b37f2409a 100644
--- a/makefu/2configs/editor/vim.nix
+++ b/makefu/2configs/editor/vim.nix
@@ -3,7 +3,7 @@
{
environment.systemPackages = [
- ((pkgs.vim_configurable.override { python = pkgs.python3; }).customize {
+ ((pkgs.vim_configurable).customize {
name = "vim";
vimrcConfig.customRC = builtins.readFile ./vimrc;
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { start = [
diff --git a/makefu/2configs/gui/automatic-diskmount.nix b/makefu/2configs/gui/automatic-diskmount.nix
index 19933111a..ad3774be8 100644
--- a/makefu/2configs/gui/automatic-diskmount.nix
+++ b/makefu/2configs/gui/automatic-diskmount.nix
@@ -12,7 +12,6 @@ with import <stockholm/lib>; #genid
users.users.makefu.packages = with pkgs;[
gvfs pcmanfm lxmenu-data
];
- environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
## allow users in group "storage" to mount disk
# https://github.com/coldfix/udiskie/wiki/Permissions
diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 2ba7f125c..4ae816d5f 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -36,7 +36,7 @@ in
user = mainUser;
};
};
- environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
+ environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
# lid switch is handled via button presses
services.logind.lidSwitch = lib.mkDefault "ignore";
makefu.awesome.enable = true;
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 55df23640..c67aa7cfb 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -23,8 +23,8 @@
displayManager.defaultSession = "gnome";
desktopManager.gnome.enable = true;
displayManager.sessionCommands = ''
- ${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
- ${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
+ ${pkgs.xorg.xset}/bin/xset -display :0 s off -dpms
+ ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
'';
# xrandrHeads = [ "HDMI1" "HDMI2" ];
# prevent screen from turning off, disable dpms
@@ -38,7 +38,7 @@
after = [ "display-manager.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms";
+ ExecStart = "${pkgs.xorg.xset}/bin/xset -display :0 s off -dpms";
RemainAfterExit = "yes";
TimeoutSec = "5s";
RestartSec="5s";
diff --git a/makefu/2configs/home/ham/automation/check-in.nix b/makefu/2configs/home/ham/automation/check-in.nix
index 3a7ebe9ac..d589a6971 100644
--- a/makefu/2configs/home/ham/automation/check-in.nix
+++ b/makefu/2configs/home/ham/automation/check-in.nix
@@ -7,8 +7,25 @@ let
in
{
services.home-assistant.config.input_boolean.felix_at_work.name = "Felix auf Arbeit";
+ services.home-assistant.config.script.start_office_radio.sequence =
+ [
+ { service = "media_player.play_media";
+ data = {
+ media_content_id = "http://radio.lassul.us:8000/radio.mp3";
+ media_content_type = "music";
+ };
+ target.entity_id = "media_player.office";
+ }
+ ];
services.home-assistant.config.automation =
[
+ { service = "media_player.play_media";
+ data = {
+ media_content_id = "http://radio.lassul.us:8000/radio.mp3";
+ media_content_type = "music";
+ };
+ target.entity_id = "media_player.office";
+ }
{ alias = "Push Check-in Button Felix with button";
trigger = [
{
@@ -41,7 +58,7 @@ in
[
{ service = "media_player.play_media";
data = {
- media_content_id = "https://radio.lassul.us/radio.mp3";
+ media_content_id = "http://radio.lassul.us:8000/radio.mp3";
media_content_type = "music";
};
target.entity_id = "media_player.office";
diff --git a/makefu/2configs/home/ham/default.nix b/makefu/2configs/home/ham/default.nix
index 31e7ba419..f63ba3434 100644
--- a/makefu/2configs/home/ham/default.nix
+++ b/makefu/2configs/home/ham/default.nix
@@ -59,7 +59,7 @@ in {
})).override {
extraPackages = p: [
(p.callPackage ./deps/dwdwfsapi.nix {})
- (p.callPackage ./signal-rest/pkg.nix {})
+ # (p.callPackage ./signal-rest/pkg.nix {})
(p.callPackage ./deps/pykodi.nix {})
];
};
diff --git a/makefu/2configs/home/photoprism.nix b/makefu/2configs/home/photoprism.nix
index ea15f645a..1cd04fd9a 100644
--- a/makefu/2configs/home/photoprism.nix
+++ b/makefu/2configs/home/photoprism.nix
@@ -46,7 +46,7 @@ in
script = ''
${pkgs.docker}/bin/docker network create --driver bridge photoprism ||:
'';
- after = [ "docker" ];
+ after = [ "docker.service" ];
before = [
"docker-photoprism.service"
"docker-mysql-photoprism.service"
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
index 1b1675f14..171973ac5 100644
--- a/makefu/2configs/hw/bluetooth.nix
+++ b/makefu/2configs/hw/bluetooth.nix
@@ -5,7 +5,6 @@
hardware.pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
- extraModules = [ pkgs.pulseaudio-modules-bt ];
# systemWide = true;
support32Bit = true;
configFile = pkgs.writeText "default.pa" ''
diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix
index 050787df8..5a1018df0 100644
--- a/makefu/2configs/hw/network-manager.nix
+++ b/makefu/2configs/hw/network-manager.nix
@@ -4,7 +4,7 @@
extraGroups = [ "networkmanager" ];
packages = with pkgs;[
networkmanagerapplet
- gnome3.gnome_keyring gnome3.dconf
+ gnome3.gnome-keyring dconf
];
};
networking.wireless.enable = lib.mkForce false;
diff --git a/makefu/2configs/tools/consoles.nix b/makefu/2configs/tools/consoles.nix
index f213a9b0e..427ea38a9 100644
--- a/makefu/2configs/tools/consoles.nix
+++ b/makefu/2configs/tools/consoles.nix
@@ -17,6 +17,6 @@
nsrenamer
ns-usbloader
sfo
- exfatprogs exfat-utils exfat
+ exfatprogs exfat
];
}
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 65393264f..57c8c96f1 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -2,7 +2,7 @@
{
users.users.makefu.packages = with pkgs; [
- at_spi2_core
+ at-spi2-core
chromium
feh
clipit
@@ -12,7 +12,7 @@
evince
# replacement for mirage:
sxiv
- gnome3.dconf
+ dconf
xdotool
xorg.xbacklight
scrot
diff --git a/makefu/2configs/tools/pcmanfm-extra.nix b/makefu/2configs/tools/pcmanfm-extra.nix
index f28f9a91a..4e8246a42 100644
--- a/makefu/2configs/tools/pcmanfm-extra.nix
+++ b/makefu/2configs/tools/pcmanfm-extra.nix
@@ -3,9 +3,8 @@
users.users.makefu.packages = with pkgs; [
pcmanfm
lxqt.lxqt-policykit
- shared_mime_info
+ shared-mime-info
lxmenu-data
];
- environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
services.gvfs.enable = true;
}
diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index 0998a695e..2786be408 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -8,7 +8,7 @@
obs-studio
studio-link
audacity
- darkice
+ #darkice
# owncloudclient
(pkgs.writeScriptBin "prepare-pulseaudio" ''
pactl load-module module-null-sink sink_name=stream sink_properties=device.description="Streaming"
diff --git a/makefu/2configs/virtualisation/docker.nix b/makefu/2configs/virtualisation/docker.nix
index b830bc39e..1c204db85 100644
--- a/makefu/2configs/virtualisation/docker.nix
+++ b/makefu/2configs/virtualisation/docker.nix
@@ -3,7 +3,7 @@
virtualisation.docker.enable = true;
environment.systemPackages = with pkgs;[
docker
- docker_compose
+ docker-compose
];
users.users.${config.krebs.build.user.name}.extraGroups = [ "docker" ];
}
diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
index d0596e700..afec1144e 100644
--- a/makefu/5pkgs/chitubox/default.nix
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -2,7 +2,7 @@
, libgcrypt,zlib,glib,fontconfig,freetype,libdrm
, libxkbcommon
, libpulseaudio
-, xlibs
+, xorg
, gst_all_1
, krb5
, alsaLib
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoPatchelfHook ];
- buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm
+ buildInputs = with xorg; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm
libxkbcommon libpulseaudio alsaLib
xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
gst_all_1.gst-plugins-base gst_all_1.gstreamer krb5
diff --git a/makefu/5pkgs/ns-atmosphere-programmer/default.nix b/makefu/5pkgs/ns-atmosphere-programmer/default.nix
index c17e0ac76..aa7af9922 100644
--- a/makefu/5pkgs/ns-atmosphere-programmer/default.nix
+++ b/makefu/5pkgs/ns-atmosphere-programmer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, lib
, makeWrapper
, autoPatchelfHook
-, xlibs
+, xorg
, gnome3
, libpng12
}:
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
sha256 = "1cnyydsmrcpfwpdiry7qybh179499wpbvlzq5rk442hq9ak416ri";
};
- buildInputs = with xlibs; [ libX11 libXxf86vm libSM gnome3.gtk libpng12 ];
+ buildInputs = with xorg; [ libX11 libXxf86vm libSM gnome3.gtk libpng12 ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
installPhase = ''
install -D -m755 NS-Atmosphere $out/bin/NS-Atmosphere
wrapProgram $out/bin/NS-Atmosphere --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
---suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
+--suffix XDG_DATA_DIRS : '${pkgs.gnome.adwaita-icon-theme}/share'
'';
dontStrip = true;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:16:58 +0000