This commit is contained in:
mjallen18
2026-03-18 20:51:39 -05:00
parent 46b249560f
commit f4fd826c90
7 changed files with 17 additions and 63 deletions

View File

@@ -52,13 +52,15 @@ in
mission-center mission-center
parted parted
vesktop vesktop
] ++ ( ]
if !isArm then ++ (
if !isArm then
[ [
# goverlay # goverlay
# winboat # winboat
] ]
else [ ] else
[ ]
) )
else else
[ ] [ ]
@@ -71,7 +73,7 @@ in
nix-index-database.comma = enabled; nix-index-database.comma = enabled;
btop = { btop = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
package = pkgs.unstable.btop; package = pkgs.btop;
}; };
fastfetch = lib.mkDefault enabled; fastfetch = lib.mkDefault enabled;
home-manager = lib.mkDefault enabled; home-manager = lib.mkDefault enabled;

View File

@@ -38,17 +38,15 @@ in
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
# Open ports in the firewall for Source Dedicated Server # Open ports in the firewall for Source Dedicated Server
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
extraCompatPackages = extraCompatPackages = [
with pkgs.unstable; pkgs.proton-ge-bin
[ ]
proton-ge-bin ++ (with pkgs.${namespace}; [
] proton-cachyos
++ (with pkgs.${namespace}; [ proton-cachyos-v3
proton-cachyos proton-cachyos-v2
proton-cachyos-v3 proton-cachyos-v1
proton-cachyos-v2 ]);
proton-cachyos-v1
]);
gamescopeSession = lib.mkDefault { gamescopeSession = lib.mkDefault {
enable = true; enable = true;
args = [ args = [

View File

@@ -72,7 +72,7 @@ let
open-webui = { open-webui = {
enable = true; enable = true;
package = pkgs.unstable.open-webui; package = pkgs.open-webui;
host = "0.0.0.0"; host = "0.0.0.0";
port = 8888; port = 8888;
openFirewall = cfg.openFirewall; openFirewall = cfg.openFirewall;

View File

@@ -70,7 +70,7 @@ let
user = "nix-apps"; user = "nix-apps";
group = "jallen-nas"; group = "jallen-nas";
dataDir = "${cfg.configDir}/sonarr"; dataDir = "${cfg.configDir}/sonarr";
package = pkgs.unstable.sonarr; package = pkgs.sonarr;
}; };
# Enable Sabnzbd service # Enable Sabnzbd service

View File

@@ -2,34 +2,14 @@
namespace, namespace,
... ...
}: }:
final: prev: final: prev:
let let
ubootPackages = final.callPackage ../../packages/uboot { };
# fetchFromGitHub = inputs.nixpkgs.fetchFromGitHub;
# linux618Src = fetchFromGitHub {
# owner = "raspberrypi";
# repo = "linux";
# rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7";
# hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co=";
# };
# linux619Src = fetchFromGitHub {
# owner = "raspberrypi";
# repo = "linux";
# rev = "87e52a7868888c66b2782c949c8406c27f909c11";
# hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0=";
# };
linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi); linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi);
linux-rpi5-latest = final.linuxPackagesFor ( linux-rpi5-latest = final.linuxPackagesFor (
final.${namespace}.linux-rpi.override { final.${namespace}.linux-rpi.override {
kernelVersion = "unstable"; kernelVersion = "unstable";
} }
); );
linux-rpi4 = final.linuxPackagesFor ( linux-rpi4 = final.linuxPackagesFor (
final.${namespace}.linux-rpi.override { final.${namespace}.linux-rpi.override {
rpiVersion = 4; rpiVersion = 4;
@@ -38,23 +18,8 @@ let
in in
{ {
${namespace} = prev.${namespace} // { ${namespace} = prev.${namespace} // {
uboot-pi5 = ubootPackages.ubootRaspberryPi5;
uboot-pi4 = ubootPackages.ubootRaspberryPi4;
linuxPackages_rpi5-lts = linux-rpi5; linuxPackages_rpi5-lts = linux-rpi5;
linuxPackages_rpi4-lts = linux-rpi4; linuxPackages_rpi4-lts = linux-rpi4;
linuxPackages_rpi5-latest = linux-rpi5-latest; linuxPackages_rpi5-latest = linux-rpi5-latest;
# linuxPackages_rpi5-rc = linux-rpi5.overrideAttrs (_old: {
# modDirVersion = "6.19.0-rc5";
# src = linux619Src;
# });
# linuxPackages_rpi4-latest = linux-rpi4.overrideAttrs (_old: {
# modDirVersion = "6.18.4";
# src = linux618Src;
# });
# linuxPackages_rpi4-rc = linux-rpi4.overrideAttrs (_old: {
# modDirVersion = "6.19.0-rc5";
# src = linux619Src;
# });
}; };
} }

View File

@@ -1,4 +0,0 @@
{ inputs, ... }:
_final: _prev: {
mjallen-lib = (import ../../lib { inherit inputs; }).mjallen-lib;
}

View File

@@ -1,7 +0,0 @@
{ inputs, ... }:
final: _prev: {
unstable = import inputs.nixpkgs-unstable {
system = final.stdenv.hostPlatform.system;
config.allowUnfree = true;
};
}