diff options
| -rw-r--r-- | modules/core/tests.nix | 3 | ||||
| -rw-r--r-- | modules/system/kernel/zswap.nix | 10 | ||||
| -rw-r--r-- | modules/user/devhell/profiles/base.nix | 2 | ||||
| -rw-r--r-- | modules/user/devhell/profiles/packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/games/gog/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/gog/epistory.nix | 35 | ||||
| -rw-r--r-- | pkgs/games/gog/stardew-valley.nix | 4 | ||||
| -rw-r--r-- | tests/programs/gnupg/default.nix | 2 |
8 files changed, 43 insertions, 25 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix index 709b3b9e..4fb80448 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -520,9 +520,6 @@ let { check = config.services.smokeping.enable; path = ["nixos" "smokeping"]; } - { check = config.services.statsd.enable; - path = ["nixos" "statsd"]; - } { check = config.services.strongswan-swanctl.enable; path = ["nixos" "strongswan-swanctl"]; } diff --git a/modules/system/kernel/zswap.nix b/modules/system/kernel/zswap.nix index 007c6ae4..3b8d4bca 100644 --- a/modules/system/kernel/zswap.nix +++ b/modules/system/kernel/zswap.nix @@ -20,15 +20,7 @@ in { config = lib.mkIf config.vuizvui.system.kernel.zswap.enable { boot.kernelPatches = lib.singleton { name = "zswap-config"; - # This patch is needed until it hits stable/mainline to prevent z3fold - # crashes. - # - # See also: https://bugs.chromium.org/p/chromium/issues/detail?id=822360 - patch = pkgs.fetchpatch { - name = "z3fold-fix-wrong-handling-of-headless-pages.patch"; - url = "https://patchwork.kernel.org/patch/10510583/raw/"; - sha256 = "0c9l912zgxwy31b7m4xkf31imzvjs11n1i6v5w2sykqfx3sk6a3b"; - }; + patch = null; extraConfig = '' CRYPTO_${if hasZstd then "ZSTD" else "LZO"} y ZSWAP y diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix index bd724f7e..28087744 100644 --- a/modules/user/devhell/profiles/base.nix +++ b/modules/user/devhell/profiles/base.nix @@ -48,7 +48,7 @@ in { users.users.dev = { isNormalUser = true; - extraGroups = [ "plugdev" "docker" "vboxusers" "wheel" "mpd" "networkmanager" "libvirtd" "wireshark" ]; + extraGroups = [ "plugdev" "docker" "vboxusers" "wheel" "mpd" "libvirtd" "wireshark" ]; uid = 1000; shell = "${pkgs.zsh}/bin/zsh"; }; diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix index acf123f1..7bd662f6 100644 --- a/modules/user/devhell/profiles/packages.nix +++ b/modules/user/devhell/profiles/packages.nix @@ -89,10 +89,8 @@ in { ddrescue dhcping di - dmenu dmidecode dos2unix - dosbox duff e2fsprogs easytag @@ -124,9 +122,11 @@ in { gnumake gnupg gopass + gotop gource gparted gpgme + gpodder gptfdisk graphviz gstreamer @@ -134,9 +134,7 @@ in { hexedit hplipWithPlugin htop - i3lock i3lock-color - i3status iftop imagemagick iotop @@ -180,11 +178,9 @@ in { netrw netsniff-ng nitrogen - nix-prefetch-scripts nixops nload nmap - notmuch ntfs3g ntfsprogs ntopng @@ -200,8 +196,6 @@ in { posix_man_pages powertop profanity - profile-cleaner - profile-sync-daemon pulsemixer pv pxz @@ -273,7 +267,6 @@ in { wireshark xfsprogs xlibs.xev - xpra xscreensaver youtube-dl zathura diff --git a/pkgs/games/gog/default.nix b/pkgs/games/gog/default.nix index 964fd054..1ef58c30 100644 --- a/pkgs/games/gog/default.nix +++ b/pkgs/games/gog/default.nix @@ -14,6 +14,7 @@ let albion = callPackage_i686 ./albion {}; crosscode = callPackage ./crosscode.nix {}; dungeons3 = callPackage ./dungeons3.nix {}; + epistory = callPackage ./epistory.nix { }; overload = callPackage ./overload.nix {}; party-hard = callPackage ./party-hard.nix {}; satellite-reign = callPackage ./satellite-reign.nix {}; diff --git a/pkgs/games/gog/epistory.nix b/pkgs/games/gog/epistory.nix new file mode 100644 index 00000000..8e9815c9 --- /dev/null +++ b/pkgs/games/gog/epistory.nix @@ -0,0 +1,35 @@ +{ buildUnity, fetchGog, fixFmodHook }: + +buildUnity rec { + name = "epistory"; + fullName = "Epistory"; + saveDir = "Fishing Cactus/Epistory"; + version = "1.4-gog0"; + + src = fetchGog { + productId = 1986504189; + downloadName = "en3installer0"; + sha256 = "05v9i4d7h2id5w6mfpnz3ig62v5dqibl74vahx3gqw9ya4jpgwv8"; + }; + + buildInputs = [ fixFmodHook ]; + + meta = { + homepage = [ + https://www.gog.com/game/epistory_typing_chronicles + http://epistorygame.com + ]; + downloadPage = https://embed.gog.com/account/gameDetails/1986504189.json; + description = "a beautiful atmospheric 3D action/adventure typing game"; + longDescription = '' + Epistory - Typing Chronicles is a beautiful atmospheric 3D + action/adventure typing game that tells the story of a writer lacking + inspiration who asks her muse to help write her latest book. + + It features a visually stunning papercraft art style and blends light RPG + elements with exploration and unique combat mechanics solely using the + keyboard. + ''; + }; + +} diff --git a/pkgs/games/gog/stardew-valley.nix b/pkgs/games/gog/stardew-valley.nix index 8afd88cd..820e98de 100644 --- a/pkgs/games/gog/stardew-valley.nix +++ b/pkgs/games/gog/stardew-valley.nix @@ -4,12 +4,12 @@ buildGame rec { name = "stardew-valley-${version}"; - version = "1.3.28"; + version = "1.3.32"; src = fetchGog { productId = 1453375253; downloadName = "en3installer0"; - sha256 = "0lazp9zbgvg33wc5cvmf3fwvsdx3xkslr8nqdh3sm2grhchqqpfn"; + sha256 = "1j6zzdjif2xbihcmpf66af4mbnxnvzjnfn0sq597i9a26h3caia2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/tests/programs/gnupg/default.nix b/tests/programs/gnupg/default.nix index 43ba9f05..064770c9 100644 --- a/tests/programs/gnupg/default.nix +++ b/tests/programs/gnupg/default.nix @@ -126,7 +126,7 @@ in { 'echo encrypt me | gpg -sea -r ECC15FE1 > encrypted_x.asc & echo $!' ); chomp $pid; - $machine->waitForText(qr/Passphrase/); + $machine->waitForText(qr/[Pp]assphrase/); $machine->screenshot("passphrase_dialog"); $machine->sendChars("supersecret\n"); $machine->waitUntilFails("kill -0 $pid"); |