chore: move some things around

This commit is contained in:
uku 2024-06-12 01:04:41 +02:00
parent 7e204a26a7
commit d82af8f0e1
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
5 changed files with 8 additions and 13 deletions

View file

@ -36,10 +36,8 @@ in {
console.keyMap = "fr";
environment = {
systemPackages = with pkgs; let
inherit (pkgs.stdenv.hostPlatform) system;
in [
agenix.packages.${system}.default
systemPackages = with pkgs; [
agenix.packages.${pkgs.system}.default
neovim
git
curl

View file

@ -51,7 +51,7 @@
opengl.enable = true;
pulseaudio.enable = false;
# xone.enable = true;
xone.enable = true;
xpadneo.enable = true;
};
@ -62,15 +62,12 @@
home = {
packages = with pkgs; [
# font-manager
chromium
gimp
gnome.gnome-calculator
gparted
jetbrains.idea-ultimate
libreoffice-fresh
mate.eom
mold
mpv
nwg-look
obs-studio
@ -81,7 +78,6 @@
(prismlauncher.override {
jdks = [temurin-bin-21 temurin-bin-17 temurin-bin-8];
})
sccache
shotcut
(vesktop.override {withSystemVencord = false;})
wine-discord-ipc-bridge

View file

@ -6,6 +6,7 @@
perSystem = {pkgs, ...}: {
packages = {
reposilite = pkgs.callPackage ./reposilite/derivation.nix {};
wine-discord-ipc-bridge = pkgs.callPackage ./wine-discord-ipc-bridge.nix {};
};
};
}

View file

@ -3,7 +3,7 @@
stdenv,
fetchurl,
makeWrapper,
jdk21,
jre_headless,
}:
stdenv.mkDerivation (finalAttrs: {
name = "reposilite";
@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [makeWrapper];
phases = ["installPhase"];
dontUnpack = true;
installPhase = with finalAttrs; ''
runHook preInstall
mkdir -p $out/bin $out/share/${name}
cp ${src} $out/share/${name}/${name}.jar
makeWrapper ${jdk21}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
runHook postInstall
'';

View file

@ -8,7 +8,7 @@
imports = [
./parts
./systems
./exprs/modules.nix
./exprs
];
};