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"; console.keyMap = "fr";
environment = { environment = {
systemPackages = with pkgs; let systemPackages = with pkgs; [
inherit (pkgs.stdenv.hostPlatform) system; agenix.packages.${pkgs.system}.default
in [
agenix.packages.${system}.default
neovim neovim
git git
curl curl

View file

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

View file

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

View file

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

View file

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