This commit is contained in:
Shelvacu
2025-02-24 13:21:00 -08:00
committed by Shelvacu on fw
parent 01c4855184
commit 3766a3dc97
16 changed files with 39 additions and 76 deletions

View File

@@ -1,8 +1,4 @@
{
lib,
vacuModuleType,
...
}:
{ lib, vacuModuleType, ... }:
lib.optionalAttrs (vacuModuleType == "nixos") {
options.vacu.desktopApps = lib.mkEnableOption "asdf";
#todo

View File

@@ -1,6 +1,4 @@
{
...
}:
{ ... }:
{
}

View File

@@ -142,12 +142,12 @@
argAttr = lib.removeAttrs argAttrAll [ "useUnstable" ];
config = {
allowUnfree = true;
permittedInsecurePackages = [
"olm-3.2.16"
];
permittedInsecurePackages = [ "olm-3.2.16" ];
} // (argAttr.config or { });
in
import whichpkgs (argAttr // { inherit config; } // { overlays = (argAttr.overlays or []) ++ overlays; });
import whichpkgs (
argAttr // { inherit config; } // { overlays = (argAttr.overlays or [ ]) ++ overlays; }
);
pkgs = mkPkgs x86;
defaultInputs = [
"nix-search-cli"
@@ -420,8 +420,12 @@
config.allowUnfree = true;
overlays = [ inputs.sm64baserom.overlays.default ];
};
pkgs-unstable = mkPkgs nixpkgs-args // { useUnstable = true; };
pkgs-stable = mkPkgs nixpkgs-args // { useUnstable = false; };
pkgs-unstable = mkPkgs nixpkgs-args // {
useUnstable = true;
};
pkgs-stable = mkPkgs nixpkgs-args // {
useUnstable = false;
};
_plain = mkPlain pkgs-unstable;
plain = _plain.config.vacu.withAsserts _plain;
treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs-unstable ./treefmt.nix;

View File

@@ -1,8 +1,4 @@
{
config,
lib,
...
}:
{ config, lib, ... }:
{
networking.firewall.allowedTCPPorts = [ 993 ];
systemd.tmpfiles.settings.whatever."/var/lib/mail".d = {

View File

@@ -1,11 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
lib,
modulesPath,
...
}:
{ lib, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

View File

@@ -1,5 +1,4 @@
self: _super:
{
self: _super: {
bandcamp-collection-downloader = self.callPackage ../packages/bcd { };
haproxy-auth-request = self.callPackage ../packages/haproxy-auth-request.nix { };
haproxy-lua-http = self.callPackage ../packages/haproxy-lua-http.nix { };

View File

@@ -1,11 +1,10 @@
self: super:
{
self: super: {
nheko = super.nheko.overrideAttrs (old: {
patches = (old.patches or []) ++ [(
self.fetchpatch {
patches = (old.patches or [ ]) ++ [
(self.fetchpatch {
url = "https://github.com/Nheko-Reborn/nheko/pull/1838.patch";
hash = "sha256-hYG/nFPTJSRVadt7H4CgefBCwEAKCR7xU5hA5pTzpXU=";
}
)];
})
];
});
}

View File

@@ -1,7 +1,4 @@
{
sm64coopdx,
fetchFromGitHub,
}:
{ sm64coopdx, fetchFromGitHub }:
sm64coopdx.overrideAttrs {
version = "1.2.1";
src = fetchFromGitHub {

View File

@@ -106,11 +106,7 @@ in
};
nodes.relay =
{
pkgs,
config,
...
}:
{ pkgs, config, ... }:
let
mailpit = pkgs.mailpit;
dir = "/var/lib/mailpit";

View File

@@ -1,6 +1,4 @@
{
...
}:
{ ... }:
{
imports = [

View File

@@ -51,17 +51,17 @@
"ffmpeg-allvrything"
config.services.postgresql.package
(pkgs.writeScriptBin "into-nix-cache" ''
if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi
cmd=(
${pkgs.nix}/bin/nix
copy
--no-update-lock-file
--no-write-lock-file
--keep-going
--to 'file:///trip/nix-binary-cache?parallel-compression=true&secret-key=/root/cache-priv-key.pem&want-mass-query=true&write-nar-listing=true'
"$@"
)
"''${cmd[@]}"
if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi
cmd=(
${pkgs.nix}/bin/nix
copy
--no-update-lock-file
--no-write-lock-file
--keep-going
--to 'file:///trip/nix-binary-cache?parallel-compression=true&secret-key=/root/cache-priv-key.pem&want-mass-query=true&write-nar-listing=true'
"$@"
)
"''${cmd[@]}"
'')
];
hardware.graphics.extraPackages = [

View File

@@ -39,10 +39,7 @@ in
};
config =
{
lib,
...
}:
{ lib, ... }:
{
system.stateVersion = "24.05";

View File

@@ -34,11 +34,7 @@ in
# };
config =
{
config,
lib,
...
}:
{ config, lib, ... }:
{
system.stateVersion = "latest";

View File

@@ -29,10 +29,7 @@ assert false; # this is a template
};
config =
{
lib,
...
}:
{ lib, ... }:
{
system.stateVersion = "latest";

View File

@@ -1,6 +1,4 @@
{
...
}:
{ ... }:
{
# imports = [ inputs.sops-nix.nixosModules.sops ];
#

View File

@@ -24,11 +24,7 @@
};
config =
{
pkgs,
lib,
...
}:
{ pkgs, lib, ... }:
{
system.stateVersion = "23.05";