uku/camasca
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: uku:30b6f8cd1c466bce0bc3c925c880eed108252881
Branches Tags
uku:main
uku:umt
..
compare: uku:c80127177a9c21876579694cdafdb6ad5472a620
Branches Tags
uku:main
uku:umt

No commits in common. "30b6f8cd1c466bce0bc3c925c880eed108252881" and "c80127177a9c21876579694cdafdb6ad5472a620" have entirely different histories.
30b6f8cd1c ... c80127177a

9 changed files with 59 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.nix
View file

@ -5,28 +5,19 @@
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;};
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;
@ -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);
};
}

22
modules/asus-numpad.nix
View file

@ -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 = {
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"];
};
};
};

6
modules/reposilite.nix
View file

@ -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" {};

9
pkgs/enigma.nix
View file

@ -11,18 +11,13 @@ 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

13
pkgs/json2cdn/package.nix
View file

@ -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 = [
gradle_8
makeWrapper
];
nativeBuildInputs = [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; [
fromSource
binaryBytecode
];
sourceProvenance = with lib.sourceTypes; [fromSource binaryBytecode];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [uku3lig];
inherit (jre_headless.meta) platforms;

14
pkgs/koi.nix
View file

@ -24,18 +24,8 @@ 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";

16
pkgs/openwebstart.nix
View file

@ -9,22 +9,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "openwebstart";
version = "1.11.0";
version = "1.5.2";
src = fetchurl {
url =
with finalAttrs;
"https://github.com/karakun/OpenWebStart/releases/download/v${version}/OpenWebStart_linux_${
builtins.replaceStrings [ "." ] [ "_" ] version
}.deb";
hash = "sha256-X9KAMBsUHYnRoaWn5Ylg8qZH3wwgLJNKRaQyyexy4Vo=";
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";

4
pkgs/vineflower.nix
View file

@ -9,9 +9,7 @@ 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=";
};