Compare commits

..

7 commits

8 changed files with 48 additions and 36 deletions

52
flake.lock generated
View file

@ -457,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781981105, "lastModified": 1783221248,
"narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7bfff44b465909f69a442701293bc0badcf476dc", "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +575,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782636943, "lastModified": 1783233851,
"narHash": "sha256-ripjZa7BBLwL1uS5VJF3s/VpZpWt5ZIQEvkJ/FJNpQw=", "narHash": "sha256-jzisD+3wWZPC4QvAsKtYguiGsmlH2SN3Mjx5LWd68Ok=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "058b1f9381fa79fcda49982370a750ff92dbba43", "rev": "fab14c7b63499d57cb6673d5690168c3ec42b99a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -630,11 +630,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1782467914, "lastModified": 1783224372,
"narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=",
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "rev": "d407951447dcd00442e97087bf374aad70c04cea",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@ -644,11 +644,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1782467914, "lastModified": 1783224372,
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "rev": "d407951447dcd00442e97087bf374aad70c04cea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -722,11 +722,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1782535326, "lastModified": 1783148766,
"narHash": "sha256-r4TA57SL7nvj1R+GY/FCLwFU48w9IixTQlzBTIYkt8E=", "narHash": "sha256-H9+N+GFtsbVC8ZniHliChM7ndizxtqVZs6bnGOLM3WQ=",
"rev": "714a5f8c4ead6b31148d829288440ed033ccc041", "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.3494.714a5f8c4ead/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.4193.a50de1b7d8a5/nixexprs.tar.xz"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@ -768,11 +768,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1782375420, "lastModified": 1783148766,
"narHash": "sha256-wiPYmEuHbJvleW489n6+lamL7JSJg3pcKUYwURU9CkI=", "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4062d36ebeae843c750011eef6b61ec9a9dbc9a9", "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,11 +926,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782165805, "lastModified": 1783174389,
"narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1093,11 +1093,11 @@
"ruby-lxc": "ruby-lxc" "ruby-lxc": "ruby-lxc"
}, },
"locked": { "locked": {
"lastModified": 1782540463, "lastModified": 1783331081,
"narHash": "sha256-OpSw3D1naT34lbIcRSykz2T7JY66ZduL56qfxEoRdXQ=", "narHash": "sha256-sJS1tI/SqjOGBm/8RqEIi7M/rSFVtzTIshYdZYmPqWA=",
"owner": "vpsfreecz", "owner": "vpsfreecz",
"repo": "vpsadminos", "repo": "vpsadminos",
"rev": "503684bcfbe3e9be442ce5282cdbb22e250b225c", "rev": "849282e6be436743a47fb0e592041e6fba9ad41f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -63,6 +63,8 @@ in
"zenpower" "zenpower"
]; ];
boot.kernelPackages = pkgs.linuxPackages_7_1;
systemd.sleep.settings.Sleep = { systemd.sleep.settings.Sleep = {
HibernateDelaySec = "30s"; HibernateDelaySec = "30s";
SuspendState = "mem"; SuspendState = "mem";
@ -120,9 +122,14 @@ in
virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enable = true;
services.udev.extraRules = '' 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 # 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" # `lsusb | grep Logitech` will return "vendor:product"
ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled" ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c53a" ATTR{power/wakeup}="disabled"
# Force all disks to use kyber scheduler # Force all disks to use kyber scheduler
# For some reason "noop" is used by default which is kinda bad when io is saturated # 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" 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"

View file

@ -71,11 +71,6 @@ rec {
patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
}); });
}; };
deluge = prev.deluge.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
prev.libappindicator-gtk3
];
});
} }
); );

View file

@ -1,10 +1,10 @@
{ factorio-headless, pkgs }: { factorio-headless, pkgs }:
factorio-headless.overrideAttrs (_: rec { factorio-headless.overrideAttrs (_: rec {
version = "2.0.76"; version = "2.0.77";
src = pkgs.fetchurl { src = pkgs.fetchurl {
name = "factorio_headless_x64-${version}.tar.xz"; name = "factorio_headless_x64-${version}.tar.xz";
url = "https://www.factorio.com/get-download/${version}/headless/linux64"; url = "https://www.factorio.com/get-download/${version}/headless/linux64";
hash = "sha256-7zZj9mFG12NC98CaP3Q3kmNvjNlcOeomz8pb0uDpJDA="; hash = "sha256-xO/BFSn3TTfJaTPikeDbc/2fWqRziRPZMBskaAs+lH8=";
}; };
}) })

View file

@ -153,6 +153,9 @@
gnused gnused
gawk gawk
]; ];
obs-studio-autostart = [
obs-studio
];
print-battery-icon = [ ]; print-battery-icon = [ ];
controller-battery = [ print-battery-icon ]; controller-battery = [ print-battery-icon ];
mouse-battery = [ print-battery-icon ]; mouse-battery = [ print-battery-icon ];

6
scripts/obs-studio-autostart Executable file
View file

@ -0,0 +1,6 @@
#!/bin/sh
# The --disable-shutdown-check has been removed apparently
rm -rf "$HOME/.config/obs-studio/.sentinel"
exec obs --startreplaybuffer "$@"

View file

@ -17,6 +17,7 @@ in
unstable.yt-dlp unstable.yt-dlp
ffmpeg ffmpeg
obs-studio obs-studio
obs-studio-autostart
imagemagick imagemagick
mpc mpc
crosspipe crosspipe

View file

@ -8,8 +8,8 @@ lib.mkIf (config.my.desktop == "kde") {
systemd.user.services.kde-sync-xkbmap = { systemd.user.services.kde-sync-xkbmap = {
Unit = { Unit = {
Description = "Sync xkbmap with KDE keyboard layout"; Description = "Sync xkbmap with KDE keyboard layout";
PartOf = [ "graphical-session.target" ]; PartOf = [ "plasma-workspace.target" ];
After = [ "graphical-session.target" ]; After = [ "plasma-workspace.target" ];
}; };
Service = { Service = {
ExecStart = lib.getExe pkgs.kde-sync-xkbmap; ExecStart = lib.getExe pkgs.kde-sync-xkbmap;