treewide: fmt
This commit is contained in:
parent
dcd043a16c
commit
0e3c49b542
8 changed files with 1546 additions and 1322 deletions
|
@ -3,7 +3,8 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:arachnist/nixpkgs/ar-patchset-unstable";
|
||||
nixpkgsOlder.url = "github:arachnist/nixpkgs/02e10f7e99522cef9909f78312ffbbd2d96e59c3";
|
||||
nixpkgsOlder.url =
|
||||
"github:arachnist/nixpkgs/02e10f7e99522cef9909f78312ffbbd2d96e59c3";
|
||||
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
|
|
|
@ -3,7 +3,10 @@
|
|||
let
|
||||
flakes = lib.filterAttrs (name: value: value ? outputs) inputs;
|
||||
nixRegistry = builtins.mapAttrs (name: v: { flake = v; }) flakes;
|
||||
pkgsOlder = import inputs.nixpkgsOlder { system = pkgs.system; config.allowUnfree = true; };
|
||||
pkgsOlder = import inputs.nixpkgsOlder {
|
||||
inherit (pkgs) system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
# rfkill block 0; rmmod btusb btintel; systemctl restart bluetooth.service; modprobe btintel; modprobe btusb; systemctl restart bluetooth.service; rfkill unblock 0
|
||||
bt-unfuck = with pkgs;
|
||||
writeScriptBin "bt-unfuck" ''
|
||||
|
@ -173,10 +176,7 @@ in {
|
|||
kolourpaint
|
||||
okular
|
||||
discover
|
||||
]) ++ (with pkgsOlder; [
|
||||
freecad
|
||||
neofetch
|
||||
]) ++ (with pkgs; [
|
||||
]) ++ (with pkgsOlder; [ freecad neofetch ]) ++ (with pkgs; [
|
||||
chromium
|
||||
ffmpeg-full
|
||||
firefox
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{ config, inputs, pkgs, ... }:
|
||||
|
||||
let
|
||||
pkgsOlder = import inputs.nixpkgsOlder { system = pkgs.system; config.allowUnfree = true; };
|
||||
in
|
||||
{
|
||||
networking.hostName = "kyorinrin";
|
||||
|
||||
|
|
|
@ -330,11 +330,9 @@
|
|||
enable = true;
|
||||
package = pkgs.postgresql_16;
|
||||
ensureDatabases = [ "mastodon" ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "mastodon";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
ensureUsers = [{
|
||||
name = "mastodon";
|
||||
ensureDBOwnership = true;
|
||||
}];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -140,7 +140,7 @@
|
|||
|
||||
systemd.services.fedifetcher = let
|
||||
# access token(s) from environment
|
||||
fedifetcher = pkgs.fedifetcher.overrideAttrs(old: {
|
||||
fedifetcher = pkgs.fedifetcher.overrideAttrs (old: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "arachnist";
|
||||
repo = "FediFetcher";
|
||||
|
@ -148,12 +148,11 @@
|
|||
hash = "sha256-gbYbolV+DeX4KUwX0ceruyzhMX0ZiN+0b1BISIdPzTg=";
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
in {
|
||||
path = [ fedifetcher ];
|
||||
description = "fetch fedi posts";
|
||||
script = let
|
||||
fedifetcherConfig = (pkgs.formats.json {}).generate "fedifetcher.json" {
|
||||
fedifetcherConfig = (pkgs.formats.json { }).generate "fedifetcher.json" {
|
||||
server = "is-a.cat";
|
||||
state-dir = "/var/lib/fedifetcher";
|
||||
lock-file = "/run/fedifetcher/fedifetcher.lock";
|
||||
|
@ -739,7 +738,9 @@
|
|||
package = pkgs.openjdk21;
|
||||
};
|
||||
|
||||
environment.systemPackages = (config.services.github-runners.test262.extraPackages) ++ (with pkgs; [ john restic weechat ]);
|
||||
environment.systemPackages =
|
||||
config.services.github-runners.test262.extraPackages
|
||||
++ (with pkgs; [ john restic weechat ]);
|
||||
users.groups.domi = { gid = 1004; };
|
||||
users.users.domi = {
|
||||
isNormalUser = true;
|
||||
|
@ -769,11 +770,10 @@
|
|||
};
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = [
|
||||
(lib.getLib pkgs.stdenv.cc.cc)
|
||||
(lib.getLib pkgs.openssl)
|
||||
];
|
||||
age.secrets.github-runner-test262.file = ../../secrets/github-runner-token-test262.age;
|
||||
programs.nix-ld.libraries =
|
||||
[ (lib.getLib pkgs.stdenv.cc.cc) (lib.getLib pkgs.openssl) ];
|
||||
age.secrets.github-runner-test262.file =
|
||||
../../secrets/github-runner-token-test262.age;
|
||||
services.github-runners."test262" = {
|
||||
enable = true;
|
||||
url = "https://github.com/arachnist/test262.fyi";
|
||||
|
@ -781,26 +781,23 @@
|
|||
|
||||
# list of debian packages from Linus
|
||||
# git nodejs make build-essential unzip zip jq rsync python3 python3-pip python3-virtualenv python3-wheel cargo rustc liblttng-ust1 librust-openssl-dev npm openjdk-8-jre
|
||||
extraPackages = (with pkgs.python311Packages; [
|
||||
pip
|
||||
virtualenv
|
||||
wheel
|
||||
]) ++ (with pkgs; [
|
||||
python311
|
||||
git
|
||||
nodejs # also includes npm
|
||||
gnumake
|
||||
stdenv
|
||||
unzip
|
||||
zip
|
||||
jq
|
||||
rsync
|
||||
rustup
|
||||
lttng-ust
|
||||
openjdk8
|
||||
curl
|
||||
stdenv
|
||||
]);
|
||||
extraPackages = (with pkgs.python311Packages; [ pip virtualenv wheel ])
|
||||
++ (with pkgs; [
|
||||
python311
|
||||
git
|
||||
nodejs # also includes npm
|
||||
gnumake
|
||||
stdenv
|
||||
unzip
|
||||
zip
|
||||
jq
|
||||
rsync
|
||||
rustup
|
||||
lttng-ust
|
||||
openjdk8
|
||||
curl
|
||||
stdenv
|
||||
]);
|
||||
extraEnvironment = {
|
||||
NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so";
|
||||
NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# autogenerated file
|
||||
{fetchpatch, fetchurl}: {
|
||||
{ fetchpatch, fetchurl }: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url =
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,36 +1,34 @@
|
|||
{ callPackage, fetchFromGitHub, pkgs, buildPythonPackage, python311, pythonOlder, ... }:
|
||||
{ callPackage, fetchFromGitHub, pkgs, buildPythonPackage, python311, pythonOlder
|
||||
, ... }:
|
||||
|
||||
let
|
||||
python3 = python311;
|
||||
python3Packages = pkgs.python311Packages;
|
||||
pillow_with_headers = callPackage ./pillow-with-headers.nix {
|
||||
inherit python3Packages;
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
pillow_with_headers =
|
||||
callPackage ./pillow-with-headers.nix { inherit python3Packages; };
|
||||
in buildPythonPackage {
|
||||
pname = "Minecraft-Overviewer";
|
||||
version = "2024-03-15";
|
||||
format = "other";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
(pkgs.pipreqs.override { inherit python3; })
|
||||
pillow_with_headers
|
||||
] ++ (with python3Packages; [
|
||||
altgraph
|
||||
certifi
|
||||
charset-normalizer
|
||||
docopt
|
||||
idna
|
||||
importlib-metadata
|
||||
nbtlib
|
||||
numpy
|
||||
packaging
|
||||
pefile
|
||||
requests
|
||||
urllib3
|
||||
yarg
|
||||
zipp
|
||||
]);
|
||||
propagatedBuildInputs =
|
||||
[ (pkgs.pipreqs.override { inherit python3; }) pillow_with_headers ]
|
||||
++ (with python3Packages; [
|
||||
altgraph
|
||||
certifi
|
||||
charset-normalizer
|
||||
docopt
|
||||
idna
|
||||
importlib-metadata
|
||||
nbtlib
|
||||
numpy
|
||||
packaging
|
||||
pefile
|
||||
requests
|
||||
urllib3
|
||||
yarg
|
||||
zipp
|
||||
]);
|
||||
|
||||
buildInputs = with python3Packages; [ setuptools ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue