summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--makefu/1systems/gum/config.nix2
-rw-r--r--makefu/1systems/gum/hetzner/default.nix (renamed from makefu/1systems/gum/hardware-config.nix)3
-rw-r--r--makefu/1systems/x/config.nix3
-rw-r--r--makefu/2configs/tools/consoles.nix1
-rw-r--r--makefu/5pkgs/ns-usbloader/default.nix35
5 files changed, 41 insertions, 3 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 540106004..0cdfcda4b 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -32,8 +32,6 @@ in {
# <stockholm/makefu/2configs/stats/netdata-server.nix>
<stockholm/makefu/2configs/headless.nix>
- <stockholm/makefu/2configs/smart-monitor.nix>
- { services.smartd.devices = builtins.map (x: { device = x; }) allDisks; }
# Security
<stockholm/makefu/2configs/sshd-totp.nix>
diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hetzner/default.nix
index 1881329ce..7d445879a 100644
--- a/makefu/1systems/gum/hardware-config.nix
+++ b/makefu/1systems/gum/hetzner/default.nix
@@ -18,6 +18,9 @@ let
ext-if = "et0"; # gets renamed on the fly
in {
imports = [
+ <stockholm/makefu/2configs/smart-monitor.nix>
+ { services.smartd.devices = builtins.map (x: { device = x; }) allDisks; }
+
];
makefu.server.primary-itf = ext-if;
services.udev.extraRules = ''
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 3edfcecc1..4f5fe44b5 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -13,7 +13,7 @@
# ./x230
# Common Hardware Components
-
+ <nix-ld/modules/nix-ld.nix>
# <stockholm/makefu/2configs/hw/mceusb.nix>
# <stockholm/makefu/2configs/hw/rtl8812au.nix>
<stockholm/makefu/2configs/hw/network-manager.nix>
@@ -26,6 +26,7 @@
<stockholm/makefu/2configs/hw/droidcam.nix>
<stockholm/makefu/2configs/hw/smartcard.nix>
<stockholm/makefu/2configs/hw/upower.nix>
+ <stockholm/makefu/2configs/hw/nswitch.nix>
#<stockholm/makefu/2configs/hw/ps4-compat.nix>
# base
diff --git a/makefu/2configs/tools/consoles.nix b/makefu/2configs/tools/consoles.nix
index 7d58daa3f..f213a9b0e 100644
--- a/makefu/2configs/tools/consoles.nix
+++ b/makefu/2configs/tools/consoles.nix
@@ -15,6 +15,7 @@
nx_game_info
hactool
nsrenamer
+ ns-usbloader
sfo
exfatprogs exfat-utils exfat
];
diff --git a/makefu/5pkgs/ns-usbloader/default.nix b/makefu/5pkgs/ns-usbloader/default.nix
new file mode 100644
index 000000000..b3890d11b
--- /dev/null
+++ b/makefu/5pkgs/ns-usbloader/default.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook, glib , jre }:
+
+stdenv.mkDerivation rec {
+ name = "ns-usbloader-${version}";
+ version = "5.2";
+
+ src = fetchurl {
+ url = "https://github.com/developersu/ns-usbloader/releases/download/v${version}/ns-usbloader-${version}.jar";
+ sha256 = "06kzshlvqfwcjjddzqqgq13pqa5qjlajpyn6ksqxy5p5hgarj6i6";
+ };
+
+
+ buildInputs = [ jre ];
+
+ dontUnpack = true;
+
+ installPhase = ''
+ runHook preInstall
+ install -D $src $out/ns-usbloader/ns-usbloader.jar
+ makeWrapper ${jre}/bin/java $out/bin/ns-usbloader \
+ --add-flags "-jar $out/ns-usbloader/ns-usbloader.jar"
+ runHook postInstall
+ '';
+ nativeBuildInputs = [ glib wrapGAppsHook makeWrapper ];
+
+
+ meta = with lib; {
+ description = "Awoo Installer and GoldLeaf uploader of the NSPs (and other files), RCM payload injector, application for split/merge files";
+ homepage = https://github.com/developersu/ns-usbloader;
+ maintainers = [ maintainers.makefu ];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl3 ];
+ };
+
+}