diff --git a/configs/common.nix b/configs/common.nix index 778a7df..80077dd 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -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 diff --git a/configs/desktop.nix b/configs/desktop.nix index c2e5b09..45d16b8 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -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 diff --git a/exprs/modules.nix b/exprs/default.nix similarity index 73% rename from exprs/modules.nix rename to exprs/default.nix index fc57ca0..777b170 100644 --- a/exprs/modules.nix +++ b/exprs/default.nix @@ -6,6 +6,7 @@ perSystem = {pkgs, ...}: { packages = { reposilite = pkgs.callPackage ./reposilite/derivation.nix {}; + wine-discord-ipc-bridge = pkgs.callPackage ./wine-discord-ipc-bridge.nix {}; }; }; } diff --git a/exprs/reposilite/derivation.nix b/exprs/reposilite/derivation.nix index ca0bce2..0a8610c 100644 --- a/exprs/reposilite/derivation.nix +++ b/exprs/reposilite/derivation.nix @@ -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 ''; diff --git a/flake.nix b/flake.nix index d403b3e..acfa2f1 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ imports = [ ./parts ./systems - ./exprs/modules.nix + ./exprs ]; };