diff --git a/flake.lock b/flake.lock index 2e45b38..cd26ff6 100644 --- a/flake.lock +++ b/flake.lock @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1783221248, - "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { @@ -575,11 +575,11 @@ ] }, "locked": { - "lastModified": 1783233851, - "narHash": "sha256-jzisD+3wWZPC4QvAsKtYguiGsmlH2SN3Mjx5LWd68Ok=", + "lastModified": 1782636943, + "narHash": "sha256-ripjZa7BBLwL1uS5VJF3s/VpZpWt5ZIQEvkJ/FJNpQw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "fab14c7b63499d57cb6673d5690168c3ec42b99a", + "rev": "058b1f9381fa79fcda49982370a750ff92dbba43", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "lastModified": 1782467914, + "narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -644,11 +644,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1782467914, + "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1783148766, - "narHash": "sha256-H9+N+GFtsbVC8ZniHliChM7ndizxtqVZs6bnGOLM3WQ=", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "lastModified": 1782535326, + "narHash": "sha256-r4TA57SL7nvj1R+GY/FCLwFU48w9IixTQlzBTIYkt8E=", + "rev": "714a5f8c4ead6b31148d829288440ed033ccc041", "type": "tarball", - "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.4193.a50de1b7d8a5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.3494.714a5f8c4ead/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -768,11 +768,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1783148766, - "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", + "lastModified": 1782375420, + "narHash": "sha256-wiPYmEuHbJvleW489n6+lamL7JSJg3pcKUYwURU9CkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "rev": "4062d36ebeae843c750011eef6b61ec9a9dbc9a9", "type": "github" }, "original": { @@ -926,11 +926,11 @@ ] }, "locked": { - "lastModified": 1783174389, - "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", + "lastModified": 1782165805, + "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", + "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", "type": "github" }, "original": { @@ -1093,11 +1093,11 @@ "ruby-lxc": "ruby-lxc" }, "locked": { - "lastModified": 1783331081, - "narHash": "sha256-sJS1tI/SqjOGBm/8RqEIi7M/rSFVtzTIshYdZYmPqWA=", + "lastModified": 1782540463, + "narHash": "sha256-OpSw3D1naT34lbIcRSykz2T7JY66ZduL56qfxEoRdXQ=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "849282e6be436743a47fb0e592041e6fba9ad41f", + "rev": "503684bcfbe3e9be442ce5282cdbb22e250b225c", "type": "github" }, "original": { diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 868ba1c..0dbc10a 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -63,8 +63,6 @@ in "zenpower" ]; - boot.kernelPackages = pkgs.linuxPackages_7_1; - systemd.sleep.settings.Sleep = { HibernateDelaySec = "30s"; SuspendState = "mem"; @@ -122,14 +120,9 @@ in virtualisation.virtualbox.host.enable = true; services.udev.extraRules = '' - # Arm all USB root hubs (vendor 1d6b) so any USB device can wake the system. - # Wakeup only fires if the device on the end also has wakeup enabled, so we still - # disable it individually for devices that must NOT wake the system (see below). - ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="1d6b" ATTR{power/wakeup}="enabled" # Fix broken suspend with Logitech USB dongle - # The mouse/mousepad receiver wakes the system right after suspend, so disable its wakeup. # `lsusb | grep Logitech` will return "vendor:product" - ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c53a" ATTR{power/wakeup}="disabled" + ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled" # Force all disks to use kyber scheduler # For some reason "noop" is used by default which is kinda bad when io is saturated ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="kyber" diff --git a/overlays/default.nix b/overlays/default.nix index a7a3073..01125e3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -71,6 +71,11 @@ rec { patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); }; + deluge = prev.deluge.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + prev.libappindicator-gtk3 + ]; + }); } ); diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index f510f4e..5ed05bb 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.77"; + version = "2.0.76"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-xO/BFSn3TTfJaTPikeDbc/2fWqRziRPZMBskaAs+lH8="; + hash = "sha256-7zZj9mFG12NC98CaP3Q3kmNvjNlcOeomz8pb0uDpJDA="; }; }) diff --git a/scripts/default.nix b/scripts/default.nix index 39fe853..e8e1462 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -153,9 +153,6 @@ gnused gawk ]; - obs-studio-autostart = [ - obs-studio - ]; print-battery-icon = [ ]; controller-battery = [ print-battery-icon ]; mouse-battery = [ print-battery-icon ]; diff --git a/scripts/obs-studio-autostart b/scripts/obs-studio-autostart deleted file mode 100755 index 6ab23d1..0000000 --- a/scripts/obs-studio-autostart +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# The --disable-shutdown-check has been removed apparently -rm -rf "$HOME/.config/obs-studio/.sentinel" - -exec obs --startreplaybuffer "$@" \ No newline at end of file diff --git a/system/media-packages.nix b/system/media-packages.nix index 0f8f58a..3f9af01 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -17,7 +17,6 @@ in unstable.yt-dlp ffmpeg obs-studio - obs-studio-autostart imagemagick mpc crosspipe diff --git a/user/kde/kde-sync-xkbmap.nix b/user/kde/kde-sync-xkbmap.nix index 85eb543..6a8dc00 100644 --- a/user/kde/kde-sync-xkbmap.nix +++ b/user/kde/kde-sync-xkbmap.nix @@ -8,8 +8,8 @@ lib.mkIf (config.my.desktop == "kde") { systemd.user.services.kde-sync-xkbmap = { Unit = { Description = "Sync xkbmap with KDE keyboard layout"; - PartOf = [ "plasma-workspace.target" ]; - After = [ "plasma-workspace.target" ]; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; }; Service = { ExecStart = lib.getExe pkgs.kde-sync-xkbmap;