mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-09 20:33:15 -06:00
Compare commits
2 commits
05196cc93b
...
78742fdccf
Author | SHA1 | Date | |
---|---|---|---|
78742fdccf | |||
eba2e31042 |
5 changed files with 23 additions and 28 deletions
13
.github/workflows/update.yml
vendored
13
.github/workflows/update.yml
vendored
|
@ -14,13 +14,10 @@ jobs:
|
|||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- run: git checkout -B flake-lock
|
||||
|
||||
- name: Setup Git Bot
|
||||
run: |
|
||||
git --version
|
||||
git config user.name 'daylin-bot'
|
||||
git config user.email 'bot@dayl.in'
|
||||
- uses: daylin-bot/actions/setup@main
|
||||
|
||||
- run: git checkout -B flake-lock
|
||||
|
||||
- uses: DeterminateSystems/nix-installer-action@v12
|
||||
with:
|
||||
|
@ -51,7 +48,9 @@ jobs:
|
|||
--print-build-logs
|
||||
|
||||
- name: Commit Updates
|
||||
run: git push --set-upstream --force origin flake-lock
|
||||
uses: daylin-bot/actions/commit-and-push@main
|
||||
with:
|
||||
push-args: --set-upstream --force origin flake-lock
|
||||
|
||||
build-full:
|
||||
needs: build-minimal
|
||||
|
|
|
@ -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
8
hosts/algiz/pkgs.nix
Normal 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 $@"
|
||||
'')
|
||||
];
|
||||
}
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
enabled,
|
||||
...
|
||||
}:
|
||||
{ config, enabled, ... }:
|
||||
{
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader = {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue