move pkgs out

This commit is contained in:
Daylin Morgan 2024-07-25 11:56:35 -05:00
parent 05196cc93b
commit eba2e31042
Signed by: daylin
GPG key ID: 950D13E9719334AD
4 changed files with 17 additions and 21 deletions

View file

@ -1,12 +1,5 @@
{ enabled, ... }:
{
self,
pkgs,
enabled,
...
}:
{
imports = with self.nixosModules; [ restic ];
oizys = {
languages = [
"nim"
@ -20,12 +13,6 @@
nix-ld = enabled;
};
environment.systemPackages = with pkgs; [
(writeShellScriptBin "gitea" ''
ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
'')
];
services.restic.backups.gdrive = {
# directories created by gitea and soft-serve aren't world readable
user = "root";

8
hosts/algiz/pkgs.nix Normal file
View file

@ -0,0 +1,8 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
(writeShellScriptBin "gitea" ''
ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
'')
];
}

View file

@ -1,8 +1,4 @@
{
config,
enabled,
...
}:
{ config, enabled, ... }:
{
# Use the systemd-boot EFI boot loader.
boot.loader = {

View file

@ -8,7 +8,6 @@ let
inherit (builtins) filter;
inherit (lib)
nixosSystem
isNixFile
mkDefaultOizysModule
mkOizysModule
enabled
@ -16,12 +15,17 @@ let
pkgsFromSystem
pkgFromSystem
overlayFrom
isNixFile
;
inherit (lib.filesystem) listFilesRecursive;
pkgFrom = pkgFromSystem "x86_64-linux";
pkgsFrom = pkgsFromSystem "x86_64-linux";
hostPath = host: ../. + "/hosts/${host}";
# all nix files not including pkgs.nix
hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
mkIso = nixosSystem {
system = "x86_64-linux";
modules = [
@ -54,7 +58,8 @@ let
../overlays
inputs.lix-module.nixosModules.default
inputs.hyprland.nixosModules.default
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
] ++ (hostFiles hostName);
specialArgs = {
inherit
inputs