chore: switch to nixfmt
This commit is contained in:
parent
c80127177a
commit
4233a1addc
9 changed files with 112 additions and 57 deletions
55
flake.nix
55
flake.nix
|
@ -5,33 +5,42 @@
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs =
|
||||||
self,
|
{
|
||||||
nixpkgs,
|
self,
|
||||||
}: let
|
nixpkgs,
|
||||||
inherit (nixpkgs) lib;
|
}:
|
||||||
|
let
|
||||||
|
inherit (nixpkgs) lib;
|
||||||
|
|
||||||
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
|
systems = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
"x86_64-darwin"
|
||||||
|
"aarch64-darwin"
|
||||||
|
];
|
||||||
|
|
||||||
pkgsFor = system: import nixpkgs {inherit system;};
|
pkgsFor = system: import nixpkgs { inherit system; };
|
||||||
forEachSystem = lib.genAttrs systems;
|
forEachSystem = lib.genAttrs systems;
|
||||||
in {
|
in
|
||||||
packages = forEachSystem (
|
{
|
||||||
system: let
|
packages = forEachSystem (
|
||||||
pkgs = pkgsFor system;
|
system:
|
||||||
isAvailable = name: drv: lib.meta.availableOn {inherit system;} drv;
|
let
|
||||||
flakePkgs = self.overlays.default {} pkgs;
|
pkgs = pkgsFor system;
|
||||||
in
|
isAvailable = name: drv: lib.meta.availableOn { inherit system; } drv;
|
||||||
|
flakePkgs = self.overlays.default { } pkgs;
|
||||||
|
in
|
||||||
lib.filterAttrs isAvailable flakePkgs
|
lib.filterAttrs isAvailable flakePkgs
|
||||||
);
|
);
|
||||||
|
|
||||||
overlays.default = import ./pkgs/all-packages.nix;
|
overlays.default = import ./pkgs/all-packages.nix;
|
||||||
|
|
||||||
nixosModules = {
|
nixosModules = {
|
||||||
reposilite = import ./modules/reposilite.nix;
|
reposilite = import ./modules/reposilite.nix;
|
||||||
asus-numpad = import ./modules/asus-numpad.nix self;
|
asus-numpad = import ./modules/asus-numpad.nix self;
|
||||||
|
};
|
||||||
|
|
||||||
|
formatter = forEachSystem (system: (pkgsFor system).nixfmt-rfc-style);
|
||||||
};
|
};
|
||||||
|
|
||||||
formatter = forEachSystem (system: (pkgsFor system).alejandra);
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,27 +1,39 @@
|
||||||
self: {
|
self:
|
||||||
|
{
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
cfg = config.services.asus-numpad;
|
cfg = config.services.asus-numpad;
|
||||||
inherit (pkgs.stdenv.hostPlatform) system;
|
inherit (pkgs.stdenv.hostPlatform) system;
|
||||||
|
|
||||||
toml = pkgs.formats.toml {};
|
toml = pkgs.formats.toml { };
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.asus-numpad = {
|
options.services.asus-numpad = {
|
||||||
enable = lib.mkEnableOption "asus-numpad";
|
enable = lib.mkEnableOption "asus-numpad";
|
||||||
package = lib.mkPackageOption self.packages.${system} "asus-numpad" {};
|
package = lib.mkPackageOption self.packages.${system} "asus-numpad" { };
|
||||||
|
|
||||||
settings = lib.mkOption {
|
settings = lib.mkOption {
|
||||||
description = "Options for the configuration file located at /etc/xdg/asus_numpad.toml. See https://github.com/iamkroot/asus-numpad#configuration";
|
description = "Options for the configuration file located at /etc/xdg/asus_numpad.toml. See https://github.com/iamkroot/asus-numpad#configuration";
|
||||||
example = {layout = "M433IA";};
|
example = {
|
||||||
|
layout = "M433IA";
|
||||||
|
};
|
||||||
type = lib.types.submodule {
|
type = lib.types.submodule {
|
||||||
freeformType = toml.type;
|
freeformType = toml.type;
|
||||||
|
|
||||||
options.layout = lib.mkOption {
|
options.layout = lib.mkOption {
|
||||||
description = "Numpad key layout.";
|
description = "Numpad key layout.";
|
||||||
type = lib.types.enum ["UX433FA" "M433IA" "UX581" "GX701" "GX531" "G533"];
|
type = lib.types.enum [
|
||||||
|
"UX433FA"
|
||||||
|
"M433IA"
|
||||||
|
"UX581"
|
||||||
|
"GX701"
|
||||||
|
"GX531"
|
||||||
|
"G533"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -37,7 +49,7 @@ in {
|
||||||
|
|
||||||
systemd.services.asus-numpad = {
|
systemd.services.asus-numpad = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = [ "multi-user.target" ];
|
||||||
script = ''
|
script = ''
|
||||||
${lib.getExe cfg.package}
|
${lib.getExe cfg.package}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -3,12 +3,14 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
cfg = config.services.reposilite;
|
cfg = config.services.reposilite;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.reposilite = {
|
options.services.reposilite = {
|
||||||
enable = lib.mkEnableOption "reposilite";
|
enable = lib.mkEnableOption "reposilite";
|
||||||
package = lib.mkPackageOption pkgs "reposilite" {};
|
package = lib.mkPackageOption pkgs "reposilite" { };
|
||||||
environmentFile = lib.mkOption {
|
environmentFile = lib.mkOption {
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Environment file as defined in {manpage}`systemd.exec(5)`
|
Environment file as defined in {manpage}`systemd.exec(5)`
|
||||||
|
@ -28,13 +30,13 @@ in {
|
||||||
group = "reposilite";
|
group = "reposilite";
|
||||||
};
|
};
|
||||||
|
|
||||||
groups.reposilite = {};
|
groups.reposilite = { };
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services."reposilite" = {
|
systemd.services."reposilite" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wantedBy = lib.mkDefault ["multi-user.target"];
|
wantedBy = lib.mkDefault [ "multi-user.target" ];
|
||||||
after = lib.mkDefault ["network.target"];
|
after = lib.mkDefault [ "network.target" ];
|
||||||
script = ''
|
script = ''
|
||||||
${lib.getExe cfg.package}
|
${lib.getExe cfg.package}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
final: prev: {
|
final: prev: {
|
||||||
enigma = prev.callPackage ./enigma.nix {};
|
enigma = prev.callPackage ./enigma.nix { };
|
||||||
vineflower = prev.callPackage ./vineflower.nix {};
|
vineflower = prev.callPackage ./vineflower.nix { };
|
||||||
koi = prev.kdePackages.callPackage ./koi.nix {};
|
koi = prev.kdePackages.callPackage ./koi.nix { };
|
||||||
asus-numpad = prev.callPackage ./asus-numpad.nix {};
|
asus-numpad = prev.callPackage ./asus-numpad.nix { };
|
||||||
openwebstart = prev.callPackage ./openwebstart.nix {};
|
openwebstart = prev.callPackage ./openwebstart.nix { };
|
||||||
json2cdn = prev.callPackage ./json2cdn/package.nix {};
|
json2cdn = prev.callPackage ./json2cdn/package.nix { };
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,13 +11,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
version = "2.5.0";
|
version = "2.5.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = with finalAttrs; "https://maven.fabricmc.net/cuchaz/enigma-swing/${version}/enigma-swing-${version}-all.jar";
|
url =
|
||||||
|
with finalAttrs;
|
||||||
|
"https://maven.fabricmc.net/cuchaz/enigma-swing/${version}/enigma-swing-${version}-all.jar";
|
||||||
hash = "sha256-yOPPTKt96aRSbziYDBLBKqfLS2R9GeXgz5m2t1fgFHo=";
|
hash = "sha256-yOPPTKt96aRSbziYDBLBKqfLS2R9GeXgz5m2t1fgFHo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
||||||
nativeBuildInputs = [makeWrapper copyDesktopItems];
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
|
copyDesktopItems
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = with finalAttrs; ''
|
installPhase = with finalAttrs; ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
gradle_8,
|
gradle_8,
|
||||||
jre_headless,
|
jre_headless,
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
self = stdenv.mkDerivation (finalAttrs: {
|
self = stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "json2cdn";
|
pname = "json2cdn";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
@ -17,7 +18,10 @@
|
||||||
hash = "sha256-pHmzeZHZyr3FyfkXwrdPk+lcHQKH6t4pnDD9ImMgSV8=";
|
hash = "sha256-pHmzeZHZyr3FyfkXwrdPk+lcHQKH6t4pnDD9ImMgSV8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [gradle_8 makeWrapper];
|
nativeBuildInputs = [
|
||||||
|
gradle_8
|
||||||
|
makeWrapper
|
||||||
|
];
|
||||||
|
|
||||||
mitmCache = gradle_8.fetchDeps {
|
mitmCache = gradle_8.fetchDeps {
|
||||||
pkg = self;
|
pkg = self;
|
||||||
|
@ -42,12 +46,15 @@
|
||||||
meta = {
|
meta = {
|
||||||
description = "converts a json file to dzikoysk's cdn format";
|
description = "converts a json file to dzikoysk's cdn format";
|
||||||
homepage = "https://github.com/uku3lig/json2cdn";
|
homepage = "https://github.com/uku3lig/json2cdn";
|
||||||
sourceProvenance = with lib.sourceTypes; [fromSource binaryBytecode];
|
sourceProvenance = with lib.sourceTypes; [
|
||||||
|
fromSource
|
||||||
|
binaryBytecode
|
||||||
|
];
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [uku3lig];
|
maintainers = with lib.maintainers; [ uku3lig ];
|
||||||
inherit (jre_headless.meta) platforms;
|
inherit (jre_headless.meta) platforms;
|
||||||
mainProgram = "json2cdn";
|
mainProgram = "json2cdn";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
self
|
self
|
||||||
|
|
14
pkgs/koi.nix
14
pkgs/koi.nix
|
@ -24,8 +24,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
sourceRoot = "source/src";
|
sourceRoot = "source/src";
|
||||||
|
|
||||||
nativeBuildInputs = [cmake ninja wrapQtAppsHook];
|
nativeBuildInputs = [
|
||||||
buildInputs = [qtbase qtwayland kcoreaddons kwidgetsaddons kconfig];
|
cmake
|
||||||
|
ninja
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
qtbase
|
||||||
|
qtwayland
|
||||||
|
kcoreaddons
|
||||||
|
kwidgetsaddons
|
||||||
|
kconfig
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
mainProgram = "koi";
|
mainProgram = "koi";
|
||||||
|
|
|
@ -12,11 +12,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
version = "1.5.2";
|
version = "1.5.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = with finalAttrs; "https://github.com/karakun/OpenWebStart/releases/download/v${version}/OpenWebStart_linux_${builtins.replaceStrings ["."] ["_"] version}.deb";
|
url =
|
||||||
|
with finalAttrs;
|
||||||
|
"https://github.com/karakun/OpenWebStart/releases/download/v${version}/OpenWebStart_linux_${
|
||||||
|
builtins.replaceStrings [ "." ] [ "_" ] version
|
||||||
|
}.deb";
|
||||||
hash = "sha256-thB/JWbF/Xk/PLurwXvWwzQTyCeV1hU7Zm8BjrG6lS0=";
|
hash = "sha256-thB/JWbF/Xk/PLurwXvWwzQTyCeV1hU7Zm8BjrG6lS0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [dpkg makeWrapper copyDesktopItems];
|
nativeBuildInputs = [
|
||||||
|
dpkg
|
||||||
|
makeWrapper
|
||||||
|
copyDesktopItems
|
||||||
|
];
|
||||||
|
|
||||||
unpackCmd = "dpkg-deb -x $src .";
|
unpackCmd = "dpkg-deb -x $src .";
|
||||||
sourceRoot = "opt/OpenWebStart";
|
sourceRoot = "opt/OpenWebStart";
|
||||||
|
@ -57,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
noDisplay = true;
|
noDisplay = true;
|
||||||
exec = "openwebstart %f";
|
exec = "openwebstart %f";
|
||||||
icon = "openwebstart-settings";
|
icon = "openwebstart-settings";
|
||||||
mimeTypes = ["application/x-java-jnlp-file"];
|
mimeTypes = [ "application/x-java-jnlp-file" ];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -9,11 +9,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
version = "1.10.1";
|
version = "1.10.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = with finalAttrs; "https://github.com/Vineflower/vineflower/releases/download/${version}/vineflower-${version}.jar";
|
url =
|
||||||
|
with finalAttrs;
|
||||||
|
"https://github.com/Vineflower/vineflower/releases/download/${version}/vineflower-${version}.jar";
|
||||||
hash = "sha256-ubII5QeTtkZXprYpIGdSZhP1Sd50BfkkNiSwL0J25Ak=";
|
hash = "sha256-ubII5QeTtkZXprYpIGdSZhP1Sd50BfkkNiSwL0J25Ak=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [makeWrapper];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue