chore: switch to nixfmt
This commit is contained in:
parent
c80127177a
commit
4233a1addc
9 changed files with 112 additions and 57 deletions
27
flake.nix
27
flake.nix
|
@ -5,22 +5,31 @@
|
|||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
}: let
|
||||
}:
|
||||
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;
|
||||
in {
|
||||
in
|
||||
{
|
||||
packages = forEachSystem (
|
||||
system: let
|
||||
system:
|
||||
let
|
||||
pkgs = pkgsFor system;
|
||||
isAvailable = name: drv: lib.meta.availableOn {inherit system;} drv;
|
||||
flakePkgs = self.overlays.default {} pkgs;
|
||||
isAvailable = name: drv: lib.meta.availableOn { inherit system; } drv;
|
||||
flakePkgs = self.overlays.default { } pkgs;
|
||||
in
|
||||
lib.filterAttrs isAvailable flakePkgs
|
||||
);
|
||||
|
@ -32,6 +41,6 @@
|
|||
asus-numpad = import ./modules/asus-numpad.nix self;
|
||||
};
|
||||
|
||||
formatter = forEachSystem (system: (pkgsFor system).alejandra);
|
||||
formatter = forEachSystem (system: (pkgsFor system).nixfmt-rfc-style);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,27 +1,39 @@
|
|||
self: {
|
||||
self:
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
cfg = config.services.asus-numpad;
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
|
||||
toml = pkgs.formats.toml {};
|
||||
in {
|
||||
toml = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
options.services.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 {
|
||||
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 {
|
||||
freeformType = toml.type;
|
||||
|
||||
options.layout = lib.mkOption {
|
||||
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 = {
|
||||
enable = true;
|
||||
wantedBy = ["multi-user.target"];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = ''
|
||||
${lib.getExe cfg.package}
|
||||
'';
|
||||
|
|
|
@ -3,12 +3,14 @@
|
|||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
cfg = config.services.reposilite;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.services.reposilite = {
|
||||
enable = lib.mkEnableOption "reposilite";
|
||||
package = lib.mkPackageOption pkgs "reposilite" {};
|
||||
package = lib.mkPackageOption pkgs "reposilite" { };
|
||||
environmentFile = lib.mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Environment file as defined in {manpage}`systemd.exec(5)`
|
||||
|
@ -28,13 +30,13 @@ in {
|
|||
group = "reposilite";
|
||||
};
|
||||
|
||||
groups.reposilite = {};
|
||||
groups.reposilite = { };
|
||||
};
|
||||
|
||||
systemd.services."reposilite" = {
|
||||
enable = true;
|
||||
wantedBy = lib.mkDefault ["multi-user.target"];
|
||||
after = lib.mkDefault ["network.target"];
|
||||
wantedBy = lib.mkDefault [ "multi-user.target" ];
|
||||
after = lib.mkDefault [ "network.target" ];
|
||||
script = ''
|
||||
${lib.getExe cfg.package}
|
||||
'';
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
final: prev: {
|
||||
enigma = prev.callPackage ./enigma.nix {};
|
||||
vineflower = prev.callPackage ./vineflower.nix {};
|
||||
koi = prev.kdePackages.callPackage ./koi.nix {};
|
||||
asus-numpad = prev.callPackage ./asus-numpad.nix {};
|
||||
openwebstart = prev.callPackage ./openwebstart.nix {};
|
||||
json2cdn = prev.callPackage ./json2cdn/package.nix {};
|
||||
enigma = prev.callPackage ./enigma.nix { };
|
||||
vineflower = prev.callPackage ./vineflower.nix { };
|
||||
koi = prev.kdePackages.callPackage ./koi.nix { };
|
||||
asus-numpad = prev.callPackage ./asus-numpad.nix { };
|
||||
openwebstart = prev.callPackage ./openwebstart.nix { };
|
||||
json2cdn = prev.callPackage ./json2cdn/package.nix { };
|
||||
}
|
||||
|
|
|
@ -11,13 +11,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
version = "2.5.0";
|
||||
|
||||
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=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [makeWrapper copyDesktopItems];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
installPhase = with finalAttrs; ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
makeWrapper,
|
||||
gradle_8,
|
||||
jre_headless,
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
self = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "json2cdn";
|
||||
version = "0.1.0";
|
||||
|
@ -17,7 +18,10 @@
|
|||
hash = "sha256-pHmzeZHZyr3FyfkXwrdPk+lcHQKH6t4pnDD9ImMgSV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [gradle_8 makeWrapper];
|
||||
nativeBuildInputs = [
|
||||
gradle_8
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
mitmCache = gradle_8.fetchDeps {
|
||||
pkg = self;
|
||||
|
@ -42,12 +46,15 @@
|
|||
meta = {
|
||||
description = "converts a json file to dzikoysk's cdn format";
|
||||
homepage = "https://github.com/uku3lig/json2cdn";
|
||||
sourceProvenance = with lib.sourceTypes; [fromSource binaryBytecode];
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode
|
||||
];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [uku3lig];
|
||||
maintainers = with lib.maintainers; [ uku3lig ];
|
||||
inherit (jre_headless.meta) platforms;
|
||||
mainProgram = "json2cdn";
|
||||
};
|
||||
});
|
||||
in
|
||||
self
|
||||
self
|
||||
|
|
14
pkgs/koi.nix
14
pkgs/koi.nix
|
@ -24,8 +24,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
nativeBuildInputs = [cmake ninja wrapQtAppsHook];
|
||||
buildInputs = [qtbase qtwayland kcoreaddons kwidgetsaddons kconfig];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwayland
|
||||
kcoreaddons
|
||||
kwidgetsaddons
|
||||
kconfig
|
||||
];
|
||||
|
||||
meta = {
|
||||
mainProgram = "koi";
|
||||
|
|
|
@ -12,11 +12,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
version = "1.5.2";
|
||||
|
||||
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=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [dpkg makeWrapper copyDesktopItems];
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $src .";
|
||||
sourceRoot = "opt/OpenWebStart";
|
||||
|
@ -57,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
noDisplay = true;
|
||||
exec = "openwebstart %f";
|
||||
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";
|
||||
|
||||
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=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue