From a5dca5a1af3820c9a43df86f2ae073044387a20f Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 21 Dec 2023 04:09:03 +0800 Subject: [PATCH] hosts/mistral: gonic --- .gitignore | 4 +- hosts/mistral/configuration.nix | 248 +++++++++++++----------- hosts/riscake/configuration.nix | 7 +- modules/parts/home-manager.nix | 5 +- modules/parts/nix-darwin.nix | 5 +- modules/parts/nix-settings.nix | 53 ++--- modules/parts/nixos.nix | 5 +- modules/shared/home-manager/default.nix | 4 +- overlays/default.nix | 2 + overlays/derivations/fanbox-dl.nix | 22 +++ users/moni/home.nix | 9 +- 11 files changed, 202 insertions(+), 162 deletions(-) create mode 100644 overlays/derivations/fanbox-dl.nix diff --git a/.gitignore b/.gitignore index 22b1bdc..8f4afcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ \#* -result +result* *.swp -.DS_Store \ No newline at end of file +.DS_Store diff --git a/hosts/mistral/configuration.nix b/hosts/mistral/configuration.nix index d74df85..0f332d4 100644 --- a/hosts/mistral/configuration.nix +++ b/hosts/mistral/configuration.nix @@ -23,128 +23,146 @@ programs.fish.enable = true; - services.minecraft-servers = { - enable = true; - eula = true; + networking.firewall = { + allowedTCPPorts = [ 4747 ]; + allowedUDPPorts = [ 4747 ]; + }; - servers.volta = { + services = { + gonic = { enable = true; - autoStart = true; - package = pkgs.paperServers.paper-1_20_1; - openFirewall = true; - - jvmOpts = lib.concatStringsSep " " [ - "-Xms2500M" - "-Xmx2500M" - "-XX:+UseG1GC" - "-XX:+ParallelRefProcEnabled" - "-XX:MaxGCPauseMillis=200" - "-XX:+UnlockExperimentalVMOptions" - "-XX:+DisableExplicitGC" - "-XX:+AlwaysPreTouch" - "-XX:G1NewSizePercent=30" - "-XX:G1MaxNewSizePercent=40" - "-XX:G1HeapRegionSize=8M" - "-XX:G1ReservePercent=20" - "-XX:G1HeapWastePercent=5" - "-XX:G1MixedGCCountTarget=4" - "-XX:InitiatingHeapOccupancyPercent=15" - "-XX:G1MixedGCLiveThresholdPercent=90" - "-XX:G1RSetUpdatingPauseTimePercent=5" - "-XX:SurvivorRatio=32" - "-XX:+PerfDisableSharedMem" - "-XX:MaxTenuringThreshold=1" - "-Dusing.aikars.flags=https://mcflags.emc.gs" - "-Daikars.new.flags=true" - ]; - - serverProperties = { - motd = "hihihi - moni"; - server-port = 43000; - online-mode = false; - max-players = 20; - difficulty = "normal"; - gamemode = "survival"; - enable-rcon = true; - "rcon.password" = "longview"; - view-distance = 8; - simulation-distance = 8; - spawn-protection = 5; - allow-flight = true; - }; - - files = { - "plugins/worldedit.jar" = pkgs.fetchurl { - url = "https://dev.bukkit.org/projects/worldedit/files/4793142/download"; - hash = "sha256-8X0+URLekKrp8Ab1io3ejW7zoAQnv26wsjTHhN0B+Ho="; - }; - - "plugins/worldprotect.jar" = pkgs.fetchurl { - url = "https://dev.bukkit.org/projects/worldguard/files/4675318/download"; - hash = "sha256-DATTDAyYwh6CDexvfjgJk0FqKT1+JkaEn23NTv3CQoc="; - }; - - "plugins/coreprotect.jar" = pkgs.fetchurl { - url = "https://cdn.modrinth.com/data/Lu3KuzdV/versions/w3P6ufP1/CoreProtect-22.2.jar"; - hash = "sha512-Bw0xC+ooj1bNs0Qr+Apz8WsaDR2CrId4VZJLRwxIPVHzGZPDSHEGPIBBqh/mjXCmJ7nB/p3vlDgZtew/zwPxnQ=="; - }; - - "plugins/spark.jar" = pkgs.fetchurl { - url = "https://ci.lucko.me/job/spark/396/artifact/spark-bukkit/build/libs/spark-1.10.55-bukkit.jar"; - hash = "sha256-M49tu1FZPRJErpZAJB3QmtuKi98yqfXYZlEftcinGfY="; - }; - - "plugins/viaversion.jar" = pkgs.fetchurl { - url = "https://cdn.modrinth.com/data/P1OZGk5p/versions/DXFf7cQP/ViaVersion-4.9.0-23w45a-SNAPSHOT.jar"; - hash = "sha512-q/AV0ZfnzAN7em8S9DVIU9Cx0nZUf4fMMrPodLokHeHr9Q817KPNe0GuJs1Kz6+Pa7qboXlzlOxOgmDCG/Hj/w=="; - }; - - "plugins/vault.jar" = pkgs.fetchurl { - url = "https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar"; - sha256 = "sha256-prXtl/Q6XPW7rwCnyM0jxa/JvQA/hJh1r4s25s930B0="; - }; - "plugins/essentialsx.jar" = pkgs.fetchurl { - url = "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars/EssentialsX-2.21.0-dev+21-c68b277.jar"; - sha256 = "sha256-7gvyn6Ys2+kIJiXJ0kZoLoXEHo8+BDXfSMbAOdpite8="; - }; - - "plugins/essentialsx-chat.jar" = pkgs.fetchurl { - url = "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars/EssentialsXChat-2.21.0-dev+21-c68b277.jar"; - sha256 = "sha256-U4A/ll4OCdnSPOstZsVJhXWlxB4sPJn35oUvkq3UY5U="; - }; - - "plugins/essentialx-protect.jar" = pkgs.fetchurl { - url = "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars/EssentialsXProtect-2.21.0-dev+21-c68b277.jar"; - hash = "sha256-DPNpMvO4rkWoGhsn02Z09h37Fwmdq2/PDmSWLMvxBNk="; - }; - - "plugins/deathchest.jar" = pkgs.fetchurl { - url = "https://hangarcdn.papermc.io/plugins/CyntrixAlgorithm/DeathChest/versions/2.1.1/PAPER/deathchest.jar"; - hash = "sha256-djHwoB3AsLBEtegyaWaIBkAwM2WTL8vqtCtJrHduNSw="; - }; - - "plugins/chunky.jar" = pkgs.fetchurl { - url = "https://cdn.modrinth.com/data/fALzjamp/versions/B0xkCkk4/Chunky-1.3.92.jar"; - hash = "sha512-Y8QYSQICdqbwFW/F0Rq+93ylPBq0SiQsl8pSJmaAnClCeAXP84st5ITH1eLz5+s+uKmJq8/rvSBBlxiIHhKwCw=="; - }; + settings = { + cache-path = "/var/cache/gonic"; + listen-addr = "128.199.204.196:4747"; + music-path = [ "/mnt/music" ]; + podcast-path = "/mnt/podcasts"; + }; + }; - "plugins/luckperms.jar" = pkgs.fetchurl { - url = "https://download.luckperms.net/1521/bukkit/loader/LuckPerms-Bukkit-5.4.108.jar"; - hash = "sha256-TN7HH/5JiG98xBACfuoJZILsiDxU8WX5laNDS3h+qR4="; + minecraft-servers = { + enable = true; + eula = true; + + servers.volta = { + enable = true; + autoStart = false; + package = pkgs.paperServers.paper-1_20_1; + openFirewall = true; + + jvmOpts = lib.concatStringsSep " " [ + "-Xms2500M" + "-Xmx2500M" + "-XX:+UseG1GC" + "-XX:+ParallelRefProcEnabled" + "-XX:MaxGCPauseMillis=200" + "-XX:+UnlockExperimentalVMOptions" + "-XX:+DisableExplicitGC" + "-XX:+AlwaysPreTouch" + "-XX:G1NewSizePercent=30" + "-XX:G1MaxNewSizePercent=40" + "-XX:G1HeapRegionSize=8M" + "-XX:G1ReservePercent=20" + "-XX:G1HeapWastePercent=5" + "-XX:G1MixedGCCountTarget=4" + "-XX:InitiatingHeapOccupancyPercent=15" + "-XX:G1MixedGCLiveThresholdPercent=90" + "-XX:G1RSetUpdatingPauseTimePercent=5" + "-XX:SurvivorRatio=32" + "-XX:+PerfDisableSharedMem" + "-XX:MaxTenuringThreshold=1" + "-Dusing.aikars.flags=https://mcflags.emc.gs" + "-Daikars.new.flags=true" + ]; + + serverProperties = { + motd = "hihihi - moni"; + server-port = 43000; + online-mode = false; + max-players = 20; + difficulty = "normal"; + gamemode = "survival"; + enable-rcon = true; + "rcon.password" = "longview"; + view-distance = 8; + simulation-distance = 8; + spawn-protection = 5; + allow-flight = true; }; - "plugins/placeholderapi.jar" = pkgs.fetchurl { - url = "https://hangarcdn.papermc.io/plugins/HelpChat/PlaceholderAPI/versions/2.11.5/PAPER/PlaceholderAPI-2.11.5.jar"; - hash = "sha256-RDVvvForTFvaqdkwLB1G2o2fpD1JiudaGZPtHy5XhO8="; + files = { + "plugins/worldedit.jar" = pkgs.fetchurl { + url = "https://dev.bukkit.org/projects/worldedit/files/4793142/download"; + hash = "sha256-8X0+URLekKrp8Ab1io3ejW7zoAQnv26wsjTHhN0B+Ho="; + }; + + "plugins/worldprotect.jar" = pkgs.fetchurl { + url = "https://dev.bukkit.org/projects/worldguard/files/4675318/download"; + hash = "sha256-DATTDAyYwh6CDexvfjgJk0FqKT1+JkaEn23NTv3CQoc="; + }; + + "plugins/coreprotect.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/Lu3KuzdV/versions/w3P6ufP1/CoreProtect-22.2.jar"; + hash = "sha512-Bw0xC+ooj1bNs0Qr+Apz8WsaDR2CrId4VZJLRwxIPVHzGZPDSHEGPIBBqh/mjXCmJ7nB/p3vlDgZtew/zwPxnQ=="; + }; + + "plugins/spark.jar" = pkgs.fetchurl { + url = "https://ci.lucko.me/job/spark/396/artifact/spark-bukkit/build/libs/spark-1.10.55-bukkit.jar"; + hash = "sha256-M49tu1FZPRJErpZAJB3QmtuKi98yqfXYZlEftcinGfY="; + }; + + "plugins/viaversion.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/P1OZGk5p/versions/DXFf7cQP/ViaVersion-4.9.0-23w45a-SNAPSHOT.jar"; + hash = "sha512-q/AV0ZfnzAN7em8S9DVIU9Cx0nZUf4fMMrPodLokHeHr9Q817KPNe0GuJs1Kz6+Pa7qboXlzlOxOgmDCG/Hj/w=="; + }; + + "plugins/vault.jar" = pkgs.fetchurl { + url = "https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar"; + sha256 = "sha256-prXtl/Q6XPW7rwCnyM0jxa/JvQA/hJh1r4s25s930B0="; + }; + + "plugins/essentialsx.jar" = pkgs.fetchurl { + url = "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars/EssentialsX-2.21.0-dev+21-c68b277.jar"; + sha256 = "sha256-7gvyn6Ys2+kIJiXJ0kZoLoXEHo8+BDXfSMbAOdpite8="; + }; + + "plugins/essentialsx-chat.jar" = pkgs.fetchurl { + url = "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars/EssentialsXChat-2.21.0-dev+21-c68b277.jar"; + sha256 = "sha256-U4A/ll4OCdnSPOstZsVJhXWlxB4sPJn35oUvkq3UY5U="; + }; + + "plugins/essentialx-protect.jar" = pkgs.fetchurl { + url = "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars/EssentialsXProtect-2.21.0-dev+21-c68b277.jar"; + hash = "sha256-DPNpMvO4rkWoGhsn02Z09h37Fwmdq2/PDmSWLMvxBNk="; + }; + + "plugins/deathchest.jar" = pkgs.fetchurl { + url = "https://hangarcdn.papermc.io/plugins/CyntrixAlgorithm/DeathChest/versions/2.1.1/PAPER/deathchest.jar"; + hash = "sha256-djHwoB3AsLBEtegyaWaIBkAwM2WTL8vqtCtJrHduNSw="; + }; + + "plugins/chunky.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/fALzjamp/versions/B0xkCkk4/Chunky-1.3.92.jar"; + hash = "sha512-Y8QYSQICdqbwFW/F0Rq+93ylPBq0SiQsl8pSJmaAnClCeAXP84st5ITH1eLz5+s+uKmJq8/rvSBBlxiIHhKwCw=="; + }; + + "plugins/luckperms.jar" = pkgs.fetchurl { + url = "https://download.luckperms.net/1521/bukkit/loader/LuckPerms-Bukkit-5.4.108.jar"; + hash = "sha256-TN7HH/5JiG98xBACfuoJZILsiDxU8WX5laNDS3h+qR4="; + }; + + "plugins/placeholderapi.jar" = pkgs.fetchurl { + url = "https://hangarcdn.papermc.io/plugins/HelpChat/PlaceholderAPI/versions/2.11.5/PAPER/PlaceholderAPI-2.11.5.jar"; + hash = "sha256-RDVvvForTFvaqdkwLB1G2o2fpD1JiudaGZPtHy5XhO8="; + }; + + "bukkit.yml" = ./config/bukkit.yml; + "spigot.yml" = ./config/spigot.yml; + "config/paper-global.yml" = ./config/paper-global.yml; + "plugins/Essentials/config.yml" = ./config/essentials-config.yml; + "plugins/WorldEdit/config.yml" = ./config/worldedit-config.yml; + "plugins/DeathChest/config.yml" = ./config/deathchest-config.yml; }; - - "bukkit.yml" = ./config/bukkit.yml; - "spigot.yml" = ./config/spigot.yml; - "config/paper-global.yml" = ./config/paper-global.yml; - "plugins/Essentials/config.yml" = ./config/essentials-config.yml; - "plugins/WorldEdit/config.yml" = ./config/worldedit-config.yml; - "plugins/DeathChest/config.yml" = ./config/deathchest-config.yml; }; }; }; diff --git a/hosts/riscake/configuration.nix b/hosts/riscake/configuration.nix index 3e4ff9f..e5d55b7 100644 --- a/hosts/riscake/configuration.nix +++ b/hosts/riscake/configuration.nix @@ -29,7 +29,12 @@ fontDir.enable = true; fonts = __attrValues { - inherit (pkgs) fira-code comic-neue fantasque-sans-mono emacs-all-the-icons-fonts; + inherit (pkgs) + fira-code + comic-neue + fantasque-sans-mono + maple-mono-otf + emacs-all-the-icons-fonts; }; }; } diff --git a/modules/parts/home-manager.nix b/modules/parts/home-manager.nix index b5020a9..08a8247 100644 --- a/modules/parts/home-manager.nix +++ b/modules/parts/home-manager.nix @@ -4,9 +4,6 @@ let inherit lib; inherit (lib) types; - cfg = config.parts.homeConfigurations; - configurations = __mapAttrs (_: value: value._home) cfg; - homeOpts = opts@{ config, lib, name, ... }: { options = { system = lib.mkOption { @@ -84,5 +81,5 @@ in type = types.attrsOf (types.submodule homeOpts); }; - config.flake.homeConfigurations = configurations; + config.flake.homeConfigurations = __mapAttrs (_: value: value._home) config.parts.homeConfigurations; } diff --git a/modules/parts/nix-darwin.nix b/modules/parts/nix-darwin.nix index e13f1a7..f8c6421 100644 --- a/modules/parts/nix-darwin.nix +++ b/modules/parts/nix-darwin.nix @@ -4,9 +4,6 @@ let inherit lib; inherit (lib) types; - cfg = config.parts.darwinConfigurations; - configurations = __mapAttrs (_: value: value._darwin) cfg; - darwinOpts = { config, name, ... }: { options = { system = lib.mkOption { @@ -55,5 +52,5 @@ in type = types.attrsOf (types.submodule darwinOpts); }; - config.flake.darwinConfigurations = configurations; + config.flake.darwinConfigurations = __mapAttrs (_: value: value._darwin) config.parts.darwinConfigurations; } diff --git a/modules/parts/nix-settings.nix b/modules/parts/nix-settings.nix index b250625..65ed6a4 100644 --- a/modules/parts/nix-settings.nix +++ b/modules/parts/nix-settings.nix @@ -2,31 +2,19 @@ # Nix daemon settings that can't be put in `nixConfig`. { - buildMachines = lib.optionals stdenv.isDarwin [ - { - hostName = "192.168.1.9"; + buildMachines = __attrValues { + mistral = { + hostName = "mistral"; system = "x86_64-linux"; sshUser = "moni"; sshKey = "/Users/moni/.ssh/id_ed25519"; - publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUtyUGRxSWlUckdxbk42ZUFoUnVHbDlaVjJzVXovSVI4NVQzL1R6VVQ0T2wgcm9vdEBzdGFyY3J1aXNlcgo="; - maxJobs = 6; - speedFactor = 2; + publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUI4OElSOXl0QnJCWlRycVpja0p0b1N2OVR6d1hNdDVQMm85RlcvVjNQd1Ygcm9vdEBtaXN0cmFsCg=="; + maxJobs = 2; + speedFactor = 1; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; mandatoryFeatures = [ ]; - } - - { - hostName = "localhost"; - system = "aarch64-linux"; - sshUser = "builder"; - sshKey = "/Users/moni/.ssh/builder_ed25519"; - publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo="; - maxJobs = 6; - speedFactor = 3; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; - } - ]; + }; + }; distributedBuilds = true; @@ -39,7 +27,11 @@ ''; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; - # package = inputs'.nix.packages.default.overrideAttrs { doCheck = false; }; + + # package = (inputs'.nix.packages.default.override { + # doCheck = false; + # installUnitTests = false; + # }).overrideAttrs (old: { buildInputs = old.buildInputs ++ old.checkInputs; }); registry = { system.flake = inputs.self; @@ -47,7 +39,7 @@ home-manager.flake = inputs.home; }; - settings = { + settings = rec { accept-flake-config = true; flake-registry = __toFile "begone-evil.json" (__toJSON { flakes = [ ]; version = 2; }); @@ -61,11 +53,20 @@ max-jobs = "auto"; - # home-manager will attempt to rebuild the world otherwise... + substituters = trusted-substituters; + trusted-substituters = [ - "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store/?priority=10" - "https://cache.nixos.org?priority=7" - "https://nix-community.cachix.org?priority=5" + "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store?priority=10" + "https://mirror.sjtu.edu.cn/nix-channels/store?priority=10" + "https://mirrors.ustc.edu.cn/nix-channels/store?priority=15" + "https://mirrors.cernet.edu.cn/nix-channels/store?priority=15" + "https://mirrors.cqupt.edu.cn/nix-channels/store?priority=15" + "https://mirror.iscas.ac.cn/nix-channels/store?priority=15" + "https://mirror.nju.edu.cn/nix-channels/store?priority=15" + "https://mirrors4.sau.edu.cn/nix-channels/store?priority=15" + "https://nix-mirror.freetls.fastly.net?priority=11" + "https://cache.nixos.org?priority=12" + "https://nix-community.cachix.org?priority=13" "https://nixpkgs-wayland.cachix.org" ]; diff --git a/modules/parts/nixos.nix b/modules/parts/nixos.nix index de0b321..47a8882 100644 --- a/modules/parts/nixos.nix +++ b/modules/parts/nixos.nix @@ -4,9 +4,6 @@ let inherit lib; inherit (lib) types; - cfg = config.parts.nixosConfigurations; - configurations = __mapAttrs (_: value: value._nixos) cfg; - nixosOpts = opts@{ config, name, ... }: { options = { server = lib.mkEnableOption "Host is a headless server configuration."; @@ -65,5 +62,5 @@ in type = types.attrsOf (types.submodule nixosOpts); }; - config.flake.nixosConfigurations = configurations; + config.flake.nixosConfigurations = __mapAttrs (_: value: value._nixos) config.parts.nixosConfigurations; } diff --git a/modules/shared/home-manager/default.nix b/modules/shared/home-manager/default.nix index 4db4997..6e88c43 100644 --- a/modules/shared/home-manager/default.nix +++ b/modules/shared/home-manager/default.nix @@ -138,7 +138,7 @@ nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars; - auto-dark-mode-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + auto-dark-mode-nvim = pkgs.vimUtils.buildVimPlugin { name = "auto-dark-mode-nvim"; src = pkgs.fetchFromGitHub { @@ -149,7 +149,7 @@ }; }; - inlay-hints-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { + inlay-hints-nvim = pkgs.vimUtils.buildVimPlugin { name = "inlay-hints-nvim"; src = pkgs.fetchFromGitHub { diff --git a/overlays/default.nix b/overlays/default.nix index 9e049d7..c7e25bf 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,6 +4,8 @@ _: flake.overlays.default = final: prev: { asitop = prev.callPackage ./derivations/asitop.nix { }; + fanbox-dl = prev.callPackage ./derivations/fanbox-dl.nix { }; + python3 = prev.python3.override { packageOverrides = pfinal: pprev: { pydashing = pfinal.callPackage ./derivations/dashing.nix { }; diff --git a/overlays/derivations/fanbox-dl.nix b/overlays/derivations/fanbox-dl.nix new file mode 100644 index 0000000..2c4822e --- /dev/null +++ b/overlays/derivations/fanbox-dl.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "fanbox-dl"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "hareku"; + repo = "fanbox-dl"; + rev = "v${version}"; + hash = "sha256-Fwc8S48zCE5s66gNVhJi9Y45v7rKo9K9dYQoao33mDE="; + }; + + vendorHash = "sha256-PsbPAwjqT2PP6DtrzHaQox1er/LAkiHPMVMLH4gmfpg="; + + meta = with lib; { + description = "Pixiv FANBOX Downloader"; + homepage = "https://github.com/hareku/fanbox-dl"; + license = licenses.mit; + maintainers = [ maintainers.moni ]; + }; +} diff --git a/users/moni/home.nix b/users/moni/home.nix index 9055347..a1b1852 100644 --- a/users/moni/home.nix +++ b/users/moni/home.nix @@ -11,8 +11,10 @@ packages = __attrValues { inherit (pkgs) asitop + fanbox-dl curl coreutils-prefixed + nix-output-monitor parallel fd gnugrep @@ -31,19 +33,18 @@ doctl zstd hyperfine - ffmpeg_6 + ffmpeg blisp picotool - z3_4_12 julia_18-bin; inherit (inputs'.nixpkgs-f2k.packages) wezterm-git; sdrpp = pkgs.sdrpp.override { - #stdenv = pkgs.appleM2Stdenv; + stdenv = pkgs.appleM2Stdenv; fftwFloat = pkgs.fftwFloat.overrideAttrs { - #stdenv = pkgs.appleM2Stdenv; + stdenv = pkgs.appleM2Stdenv; postPatch = null; }; };