formatter run
This commit is contained in:
@@ -23,9 +23,7 @@ in
|
||||
readOnly = true;
|
||||
};
|
||||
vacu.versionInfo = mkOption { readOnly = true; };
|
||||
vacu.hostName = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
vacu.hostName = mkOption { type = types.str; };
|
||||
vacu.shortHostName = mkOption {
|
||||
type = types.str;
|
||||
default = config.vacu.hostName;
|
||||
@@ -33,72 +31,76 @@ in
|
||||
vacu.nixvimPkg = mkOption { readOnly = true; };
|
||||
};
|
||||
config = {
|
||||
vacu.packages = (with pkgs; [
|
||||
home-manager
|
||||
nixos-rebuild
|
||||
which
|
||||
nano
|
||||
vim
|
||||
wget
|
||||
screen
|
||||
tmux
|
||||
lsof
|
||||
htop
|
||||
mosh
|
||||
dnsutils
|
||||
iperf3
|
||||
nmap
|
||||
rsync
|
||||
ethtool
|
||||
sshfs
|
||||
ddrescue
|
||||
pciutils
|
||||
ncdu
|
||||
nix-index
|
||||
git
|
||||
pv
|
||||
unzip
|
||||
file
|
||||
ripgrep
|
||||
jq
|
||||
units
|
||||
tree
|
||||
rclone
|
||||
iputils
|
||||
ssh-to-age
|
||||
sops
|
||||
inetutils
|
||||
neovim
|
||||
diffutils
|
||||
findutils
|
||||
utillinux
|
||||
tzdata
|
||||
hostname
|
||||
man
|
||||
gnugrep
|
||||
gnused
|
||||
gnutar
|
||||
bzip2
|
||||
gzip
|
||||
xz
|
||||
zip
|
||||
unzip
|
||||
openssh
|
||||
dig
|
||||
bash
|
||||
termscp
|
||||
usbutils
|
||||
ruby
|
||||
psutils
|
||||
killall
|
||||
git
|
||||
curl
|
||||
]) ++ [
|
||||
inputs.nix-search-cli.packages.${pkgs.system}.default
|
||||
inputs.nix-inspect.packages.${pkgs.system}.default
|
||||
];
|
||||
vacu.packages =
|
||||
(with pkgs; [
|
||||
home-manager
|
||||
nixos-rebuild
|
||||
which
|
||||
nano
|
||||
vim
|
||||
wget
|
||||
screen
|
||||
tmux
|
||||
lsof
|
||||
htop
|
||||
mosh
|
||||
dnsutils
|
||||
iperf3
|
||||
nmap
|
||||
rsync
|
||||
ethtool
|
||||
sshfs
|
||||
ddrescue
|
||||
pciutils
|
||||
ncdu
|
||||
nix-index
|
||||
git
|
||||
pv
|
||||
unzip
|
||||
file
|
||||
ripgrep
|
||||
jq
|
||||
units
|
||||
tree
|
||||
rclone
|
||||
iputils
|
||||
ssh-to-age
|
||||
sops
|
||||
inetutils
|
||||
neovim
|
||||
diffutils
|
||||
findutils
|
||||
utillinux
|
||||
tzdata
|
||||
hostname
|
||||
man
|
||||
gnugrep
|
||||
gnused
|
||||
gnutar
|
||||
bzip2
|
||||
gzip
|
||||
xz
|
||||
zip
|
||||
unzip
|
||||
openssh
|
||||
dig
|
||||
bash
|
||||
termscp
|
||||
usbutils
|
||||
ruby
|
||||
psutils
|
||||
killall
|
||||
git
|
||||
curl
|
||||
])
|
||||
++ [
|
||||
inputs.nix-search-cli.packages.${pkgs.system}.default
|
||||
inputs.nix-inspect.packages.${pkgs.system}.default
|
||||
];
|
||||
vacu.nixvimPkg = inputs.nixvim.legacyPackages.${pkgs.system}.makeNixvimWithModule {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
module = {
|
||||
imports = [ ../nixvim ];
|
||||
};
|
||||
|
@@ -28,7 +28,7 @@ in
|
||||
};
|
||||
vacu.nix.substituterUrls = mkOption { readOnly = true; };
|
||||
vacu.nix.trustedKeys = mkOption { readOnly = true; };
|
||||
vacu.nix.plainOptions = mkOption {};
|
||||
vacu.nix.plainOptions = mkOption { };
|
||||
};
|
||||
config.vacu.nix.substituterUrls = map (c: c.url) enabledCaches;
|
||||
config.vacu.nix.trustedKeys = builtins.concatMap (c: c.keys) enabledCaches;
|
||||
|
@@ -1,5 +1,10 @@
|
||||
# These are the things that might in a simpler time go in ~/.bashrc as aliases. But they're not aliases, cuz aliases are bad
|
||||
{ pkgs, vaculib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
vaculib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (pkgs) writeScriptBin;
|
||||
inherit (vaculib) writeShellFunction;
|
||||
|
100
coopdx.nix
100
coopdx.nix
@@ -1,18 +1,20 @@
|
||||
{ callPackage
|
||||
, fetchFromGitHub
|
||||
, autoPatchelfHook
|
||||
, zlib
|
||||
, curl
|
||||
, libcxx
|
||||
, stdenvNoCC
|
||||
, nixpkgs ? <nixpkgs>
|
||||
, writeTextFile
|
||||
, lib
|
||||
, bash
|
||||
{
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
autoPatchelfHook,
|
||||
zlib,
|
||||
curl,
|
||||
libcxx,
|
||||
stdenvNoCC,
|
||||
nixpkgs ? <nixpkgs>,
|
||||
writeTextFile,
|
||||
lib,
|
||||
bash,
|
||||
|
||||
, enableTextureFix ? true
|
||||
, enableDiscord ? false
|
||||
}: let
|
||||
enableTextureFix ? true,
|
||||
enableDiscord ? false,
|
||||
}:
|
||||
let
|
||||
libc_hack = writeTextFile {
|
||||
name = "libc-hack";
|
||||
# https://stackoverflow.com/questions/21768542/libc-h-no-such-file-or-directory-when-compiling-nanomsg-pipeline-sample
|
||||
@@ -24,11 +26,18 @@
|
||||
destination = "/include/libc.h";
|
||||
};
|
||||
target = stdenvNoCC.targetPlatform;
|
||||
bits = if target.is64bit then "64" else if target.is32bit then "32" else throw "unspported bits";
|
||||
bits =
|
||||
if target.is64bit then
|
||||
"64"
|
||||
else if target.is32bit then
|
||||
"32"
|
||||
else
|
||||
throw "unspported bits";
|
||||
pname = "sm64coopdx";
|
||||
version = "1.0.3";
|
||||
region = "us"; #dx removed support for other regions
|
||||
in (callPackage "${nixpkgs}/pkgs/games/sm64ex/generic.nix" {
|
||||
region = "us"; # dx removed support for other regions
|
||||
in
|
||||
(callPackage "${nixpkgs}/pkgs/games/sm64ex/generic.nix" {
|
||||
inherit pname version region;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -38,9 +47,7 @@ in (callPackage "${nixpkgs}/pkgs/games/sm64ex/generic.nix" {
|
||||
hash = "sha256-cIH3escLFMcHgtFxeSKIo5nZXvaknti+EVt72uB4XXc=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
extraNativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
extraBuildInputs = [
|
||||
zlib
|
||||
@@ -58,40 +65,39 @@ in (callPackage "${nixpkgs}/pkgs/games/sm64ex/generic.nix" {
|
||||
"TEXTURE_FIX=${if enableTextureFix then "1" else "0"}"
|
||||
];
|
||||
|
||||
|
||||
extraMeta = {
|
||||
mainProgram = pname;
|
||||
homepage = "https://sm64coopdx.com/";
|
||||
description = "Super Mario 64 online co-op mod, forked from sm64ex";
|
||||
};
|
||||
}).overrideAttrs {
|
||||
installPhase =
|
||||
let
|
||||
sharedLib = target.extensions.sharedLibrary;
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
}).overrideAttrs
|
||||
{
|
||||
installPhase =
|
||||
let
|
||||
sharedLib = target.extensions.sharedLibrary;
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
local built=$PWD/build/${region}_pc
|
||||
local built=$PWD/build/${region}_pc
|
||||
|
||||
mkdir -p $out/share/${pname}
|
||||
cp $built/${pname} $out/share/${pname}/${pname}-unwrapped
|
||||
cp -r $built/{dynos,lang,mods,palettes} $out/share/${pname}
|
||||
cp ./baserom.*.z64 $out/share/
|
||||
mkdir -p $out/share/${pname}
|
||||
cp $built/${pname} $out/share/${pname}/${pname}-unwrapped
|
||||
cp -r $built/{dynos,lang,mods,palettes} $out/share/${pname}
|
||||
cp ./baserom.*.z64 $out/share/
|
||||
|
||||
${lib.optionalString enableDiscord ''
|
||||
cp $built/libdiscord_game_sdk${sharedLib} $out/share/${pname}
|
||||
''}
|
||||
${lib.optionalString enableDiscord ''
|
||||
cp $built/libdiscord_game_sdk${sharedLib} $out/share/${pname}
|
||||
''}
|
||||
|
||||
mkdir -p $out/bin
|
||||
(
|
||||
echo '#!${bash}/bin/bash'
|
||||
echo "cd $out/share/${pname}"
|
||||
echo 'exec ./${pname}-unwrapped "$@"'
|
||||
) > $out/bin/${pname}
|
||||
chmod a+x $out/bin/${pname}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
mkdir -p $out/bin
|
||||
(
|
||||
echo '#!${bash}/bin/bash'
|
||||
echo "cd $out/share/${pname}"
|
||||
echo 'exec ./${pname}-unwrapped "$@"'
|
||||
) > $out/bin/${pname}
|
||||
chmod a+x $out/bin/${pname}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
@@ -94,7 +94,9 @@
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
blarg = { config.allowUnfree = true; };
|
||||
blarg = {
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
pkgs = import nixpkgs ({ system = "x86_64-linux"; } // blarg);
|
||||
aarchpkgs = import nixpkgs ({ system = "aarch64-linux"; } // blarg);
|
||||
defaultInputs = {
|
||||
@@ -281,7 +283,7 @@
|
||||
nod-bootstrap-x86_64 = inputs.nix-on-droid.packages.x86_64-linux.bootstrapZip-x86_64;
|
||||
nod-bootstrap-aarch64 = inputs.nix-on-droid.packages.x86_64-linux.bootstrapZip-aarch64;
|
||||
|
||||
inherit (self.packages.x86_64-linux) authorizedKeys sm64coopdx;
|
||||
inherit (self.packages.x86_64-linux) authorizedKeys sm64coopdx;
|
||||
authorizedKeysAarch = self.packages.aarch64-linux.authorizedKeys;
|
||||
ak = authorizedKeys;
|
||||
|
||||
|
@@ -1,4 +1,5 @@
|
||||
{ ... }: let
|
||||
{ ... }:
|
||||
let
|
||||
in
|
||||
{
|
||||
plugins.comment.enable = true;
|
||||
@@ -18,8 +19,8 @@ in
|
||||
lua-ls.enable = true;
|
||||
rust-analyzer = {
|
||||
enable = true;
|
||||
installCargo = false;
|
||||
installRustc = false;
|
||||
installCargo = false;
|
||||
installRustc = false;
|
||||
};
|
||||
html.enable = true;
|
||||
yamlls.enable = true;
|
||||
|
@@ -1,8 +1,4 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
../common/nixos.nix
|
||||
@@ -42,23 +38,25 @@
|
||||
|
||||
services.xserver.enable = false;
|
||||
|
||||
vacu.packages = (with pkgs; [
|
||||
zfs
|
||||
smartmontools
|
||||
openvpn
|
||||
nvme-cli
|
||||
tshark
|
||||
]) ++ [
|
||||
config.services.postgresql.package
|
||||
(pkgs.writeScriptBin "into-nix-cache" ''
|
||||
if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi
|
||||
${pkgs.nix}/bin/nix copy \
|
||||
--no-update-lock-file \
|
||||
--no-write-lock-file \
|
||||
--to 'file:///trip/nix-binary-cache?parallel-compression=true&secret-key=/root/cache-priv-key.pem&want-mass-query=true&write-nar-listing=true' \
|
||||
"$@"
|
||||
'')
|
||||
];
|
||||
vacu.packages =
|
||||
(with pkgs; [
|
||||
zfs
|
||||
smartmontools
|
||||
openvpn
|
||||
nvme-cli
|
||||
tshark
|
||||
])
|
||||
++ [
|
||||
config.services.postgresql.package
|
||||
(pkgs.writeScriptBin "into-nix-cache" ''
|
||||
if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi
|
||||
${pkgs.nix}/bin/nix copy \
|
||||
--no-update-lock-file \
|
||||
--no-write-lock-file \
|
||||
--to 'file:///trip/nix-binary-cache?parallel-compression=true&secret-key=/root/cache-priv-key.pem&want-mass-query=true&write-nar-listing=true' \
|
||||
"$@"
|
||||
'')
|
||||
];
|
||||
hardware.opengl.extraPackages = [
|
||||
pkgs.intel-compute-runtime
|
||||
pkgs.ocl-icd
|
||||
|
Reference in New Issue
Block a user