Compare commits

..

1 commit

Author SHA1 Message Date
6eff060be0 flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9&submodules=1' (2024-07-17)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9&submodules=1' (2024-07-17)
• Updated input 'lix':
    '53f3e39815.tar.gz?narHash=sha256-M7Zb3UfjQ0o3qXHolhykIk%2BQzfhEBcEYK9QAPSiBtW4%3D' (2024-07-23)
  → '8d12e0fbb7.tar.gz?narHash=sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es%3D' (2024-07-24)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/79e1f9e956c60af6520c5f9d9e451e555a82da6f?narHash=sha256-z3h4XqAdE1sqCdZxI9%2BgxLDEEbgGOVHIWZRMIjQheDo%3D' (2024-07-22)
  → 'github:nix-community/nixpkgs-wayland/0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26?narHash=sha256-y5whWNY6QegCurAwLAGkpRYL%2B9vjrQquVXC4Jfel1bU%3D' (2024-07-25)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe?narHash=sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8%3D' (2024-07-21)
  → 'github:nixos/nixpkgs/dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f?narHash=sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA%3D' (2024-07-23)
2024-07-25 15:17:41 +00:00
6 changed files with 32 additions and 27 deletions

View file

@ -14,11 +14,14 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: daylin-bot/actions/setup@main
- 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: DeterminateSystems/nix-installer-action@v12
with:
extra-conf: |
@ -48,9 +51,7 @@ jobs:
--print-build-logs
- name: Commit Updates
uses: daylin-bot/actions/commit-and-push@main
with:
push-args: --set-upstream --force origin flake-lock
run: git push --set-upstream --force origin flake-lock
build-full:
needs: build-minimal

View file

@ -499,11 +499,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1721930741,
"narHash": "sha256-bzqEYvkT78V86XPp4/WRYiLBeYZ0bqZu+2Who9UuIgE=",
"rev": "c4c7cb7613a859faee3933a7f24f3e496e5548e9",
"lastModified": 1721841700,
"narHash": "sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es=",
"rev": "8d12e0fbb7306cbc58b12ef051d7067d703738de",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c4c7cb7613a859faee3933a7f24f3e496e5548e9.tar.gz"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8d12e0fbb7306cbc58b12ef051d7067d703738de.tar.gz"
},
"original": {
"type": "tarball",

View file

@ -1,5 +1,12 @@
{ enabled, ... }:
{
self,
pkgs,
enabled,
...
}:
{
imports = with self.nixosModules; [ restic ];
oizys = {
languages = [
"nim"
@ -13,6 +20,12 @@
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";

View file

@ -1,8 +0,0 @@
{ 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,4 +1,8 @@
{ config, enabled, ... }:
{
config,
enabled,
...
}:
{
# Use the systemd-boot EFI boot loader.
boot.loader = {

View file

@ -8,6 +8,7 @@ let
inherit (builtins) filter;
inherit (lib)
nixosSystem
isNixFile
mkDefaultOizysModule
mkOizysModule
enabled
@ -15,17 +16,12 @@ 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 = [
@ -58,8 +54,7 @@ let
../overlays
inputs.lix-module.nixosModules.default
inputs.hyprland.nixosModules.default
] ++ (hostFiles hostName);
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
specialArgs = {
inherit
inputs