flake.nix

@@ -5,28 +5,19 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
-    }:
+  }: let
-    let
     inherit (nixpkgs) lib;
 
-      systems = [
+    systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
 
     pkgsFor = system: import nixpkgs {inherit system;};
     forEachSystem = lib.genAttrs systems;
-    in
+  in {
-    {
     packages = forEachSystem (
-        system:
+      system: let
-        let
         pkgs = pkgsFor system;
         isAvailable = name: drv: lib.meta.availableOn {inherit system;} drv;
         flakePkgs = self.overlays.default {} pkgs;
@@ -41,6 +32,6 @@
       asus-numpad = import ./modules/asus-numpad.nix self;
     };
 
-      formatter = forEachSystem (system: (pkgsFor system).nixfmt-rfc-style);
+    formatter = forEachSystem (system: (pkgsFor system).alejandra);
   };
 }

modules/asus-numpad.nix

@@ -1,39 +1,27 @@
-self:
+self: {
-{
   lib,
   config,
   pkgs,
   ...
-}:
+}: let
-let
   cfg = config.services.asus-numpad;
   inherit (pkgs.stdenv.hostPlatform) system;
 
   toml = pkgs.formats.toml {};
-in
+in {
-{
   options.services.asus-numpad = {
     enable = lib.mkEnableOption "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 = {
+      example = {layout = "M433IA";};
-        layout = "M433IA";
-      };
       type = lib.types.submodule {
         freeformType = toml.type;
 
         options.layout = lib.mkOption {
           description = "Numpad key layout.";
-          type = lib.types.enum [
+          type = lib.types.enum ["UX433FA" "M433IA" "UX581" "GX701" "GX531" "G533"];
-            "UX433FA"
-            "M433IA"
-            "UX581"
-            "GX701"
-            "GX531"
-            "G533"
-          ];
         };
       };
     };

modules/reposilite.nix

@@ -3,11 +3,9 @@
   config,
   pkgs,
   ...
-}:
+}: let
-let
   cfg = config.services.reposilite;
-in
+in {
-{
   options.services.reposilite = {
     enable = lib.mkEnableOption "reposilite";
     package = lib.mkPackageOption pkgs "reposilite" {};

pkgs/enigma.nix

@@ -11,18 +11,13 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.5.0";
 
   src = fetchurl {
-    url =
+    url = with finalAttrs; "https://maven.fabricmc.net/cuchaz/enigma-swing/${version}/enigma-swing-${version}-all.jar";
-      with finalAttrs;
-      "https://maven.fabricmc.net/cuchaz/enigma-swing/${version}/enigma-swing-${version}-all.jar";
     hash = "sha256-yOPPTKt96aRSbziYDBLBKqfLS2R9GeXgz5m2t1fgFHo=";
   };
 
   dontUnpack = true;
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [makeWrapper copyDesktopItems];
-    makeWrapper
-    copyDesktopItems
-  ];
 
   installPhase = with finalAttrs; ''
     runHook preInstall

pkgs/json2cdn/package.nix

@@ -5,8 +5,7 @@
   makeWrapper,
   gradle_8,
   jre_headless,
-}:
+}: let
-let
   self = stdenv.mkDerivation (finalAttrs: {
     pname = "json2cdn";
     version = "0.1.0";
@@ -18,10 +17,7 @@ let
       hash = "sha256-pHmzeZHZyr3FyfkXwrdPk+lcHQKH6t4pnDD9ImMgSV8=";
     };
 
-    nativeBuildInputs = [
+    nativeBuildInputs = [gradle_8 makeWrapper];
-      gradle_8
-      makeWrapper
-    ];
 
     mitmCache = gradle_8.fetchDeps {
       pkg = self;
@@ -46,10 +42,7 @@ let
     meta = {
       description = "converts a json file to dzikoysk's cdn format";
       homepage = "https://github.com/uku3lig/json2cdn";
-      sourceProvenance = with lib.sourceTypes; [
+      sourceProvenance = with lib.sourceTypes; [fromSource binaryBytecode];
-        fromSource
-        binaryBytecode
-      ];
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [uku3lig];
       inherit (jre_headless.meta) platforms;

pkgs/koi.nix

@@ -24,18 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "source/src";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [cmake ninja wrapQtAppsHook];
-    cmake
+  buildInputs = [qtbase qtwayland kcoreaddons kwidgetsaddons kconfig];
-    ninja
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtbase
-    qtwayland
-    kcoreaddons
-    kwidgetsaddons
-    kconfig
-  ];
 
   meta = {
     mainProgram = "koi";

pkgs/openwebstart.nix

@@ -9,22 +9,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "openwebstart";
-  version = "1.11.0";
+  version = "1.5.2";
 
   src = fetchurl {
-    url =
+    url = with finalAttrs; "https://github.com/karakun/OpenWebStart/releases/download/v${version}/OpenWebStart_linux_${builtins.replaceStrings ["."] ["_"] version}.deb";
-      with finalAttrs;
+    hash = "sha256-thB/JWbF/Xk/PLurwXvWwzQTyCeV1hU7Zm8BjrG6lS0=";
-      "https://github.com/karakun/OpenWebStart/releases/download/v${version}/OpenWebStart_linux_${
-        builtins.replaceStrings [ "." ] [ "_" ] version
-      }.deb";
-    hash = "sha256-X9KAMBsUHYnRoaWn5Ylg8qZH3wwgLJNKRaQyyexy4Vo=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [dpkg makeWrapper copyDesktopItems];
-    dpkg
-    makeWrapper
-    copyDesktopItems
-  ];
 
   unpackCmd = "dpkg-deb -x $src .";
   sourceRoot = "opt/OpenWebStart";

pkgs/vineflower.nix

@@ -9,9 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.10.1";
 
   src = fetchurl {
-    url =
+    url = with finalAttrs; "https://github.com/Vineflower/vineflower/releases/download/${version}/vineflower-${version}.jar";
-      with finalAttrs;
-      "https://github.com/Vineflower/vineflower/releases/download/${version}/vineflower-${version}.jar";
     hash = "sha256-ubII5QeTtkZXprYpIGdSZhP1Sd50BfkkNiSwL0J25Ak=";
   };