Add basic check compat

This commit is contained in:
Greg Hellings
2024-10-03 11:16:06 -05:00
parent 805bf79ef6
commit e2f0856102
11 changed files with 25 additions and 18 deletions
+9
View File
@@ -0,0 +1,9 @@
{ hooks, system, ... }:
{
pre-commit-check = hooks.lib.${system}.run {
src = ./.;
hooks = {
};
};
}
+6 -4
View File
@@ -76,14 +76,16 @@
modules = import ./modules; modules = import ./modules;
}; };
perSystem = { config, self', pkgs', system, ... }: { perSystem = { pkgs, system, ... }: {
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import inputs.nixstable {
inherit system overlays; inherit system overlays;
}; };
checks = import ./checks.nix { inherit system; inherit (inputs) hooks; };
devShells = { devShells = {
default = pkgs'.mkShell { default = pkgs.mkShell {
buildInputs = with pkgs'; [ buildInputs = with pkgs; [
bashInteractive bashInteractive
curl curl
git git
-4
View File
@@ -1,12 +1,8 @@
{ pkgs, lib, { pkgs, lib,
inputs,
host ? "most", host ? "most",
nixvim, nixvim,
...}: ...}:
let
system = pkgs.system;
in
{ {
nixpkgs.config.allowUnfreePredicate = (_: true); nixpkgs.config.allowUnfreePredicate = (_: true);
imports = [ imports = [
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }: { lib, pkgs, config, ... }:
let let
vim-xonsh = pkgs.vimUtils.buildVimPlugin { vim-xonsh = pkgs.vimUtils.buildVimPlugin {
@@ -126,7 +126,7 @@ in
neo-tree.enable = true; neo-tree.enable = true;
notify.enable = true; notify.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
}; } // (lib.mkIf (lib.versionAtLeast config.system.nixos.release "24.11") {});
extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./vim/extra.lua); extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./vim/extra.lua);
extraConfigVim = builtins.readFile ./vim/extra.vimrc; extraConfigVim = builtins.readFile ./vim/extra.vimrc;
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
+1 -1
View File
@@ -86,7 +86,7 @@
shell = { shell = {
executor = "shell"; executor = "shell";
limit = 5; limit = 5;
registrationConfigFile = config.age.secrets.runner-reg.path; authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
environmentVariables = { environmentVariables = {
EFI_DIR = "${pkgs.OVMF.fd}/FV/"; EFI_DIR = "${pkgs.OVMF.fd}/FV/";
STORAGE_URL = "http://s3.thehellings.lan:9000"; STORAGE_URL = "http://s3.thehellings.lan:9000";
+1 -1
View File
@@ -111,7 +111,7 @@
nvidia = { nvidia = {
modesetting.enable = true; modesetting.enable = true;
nvidiaSettings = true; nvidiaSettings = true;
#open = true; open = true;
}; };
pulseaudio.enable = false; # This conflicts with pipewire pulseaudio.enable = false; # This conflicts with pipewire
system76.enableAll = true; system76.enableAll = true;
+1 -1
View File
@@ -29,7 +29,7 @@
services.vbox = { services.vbox = {
executor = "shell"; executor = "shell";
limit = 5; limit = 5;
registrationConfigFile = config.age.secrets.runner-reg.path; authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
environmentVariables = { environmentVariables = {
EFI_DIR = "${pkgs.OVMF.fd}/FV/"; EFI_DIR = "${pkgs.OVMF.fd}/FV/";
}; };
+1 -1
View File
@@ -43,7 +43,7 @@
enable = true; enable = true;
services.deployer = { services.deployer = {
executor = "shell"; executor = "shell";
registrationConfigFile = config.age.secrets.runner-deployer.path; authenticationTokenConfigFile = config.age.secrets.runner-deployer.path;
}; };
}; };
+1 -1
View File
@@ -51,7 +51,7 @@ lib.attrsets.recursiveUpdate {
shell = { shell = {
executor = "shell"; executor = "shell";
limit = 5; limit = 5;
registrationConfigFile = config.age.secrets.runner-reg.path; authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
environmentVariables = { environmentVariables = {
EFI_DIR = "${pkgs.OVMF.fd}/FV/"; EFI_DIR = "${pkgs.OVMF.fd}/FV/";
STORAGE_URL = "http://s3.thehellings.lan:9000"; STORAGE_URL = "http://s3.thehellings.lan:9000";
+2 -2
View File
@@ -87,7 +87,7 @@ in {
services = { services = {
default = { default = {
executor = "docker"; executor = "docker";
registrationConfigFile = config.age.secrets.runner-reg.path; authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
dockerImage = "gitlab.shire-zebra.ts.net:5000/greg/ci-images/fedora:latest"; dockerImage = "gitlab.shire-zebra.ts.net:5000/greg/ci-images/fedora:latest";
dockerAllowedImages = [ dockerAllowedImages = [
"alpine:*" "alpine:*"
@@ -118,7 +118,7 @@ in {
qemu = { qemu = {
executor = "shell"; executor = "shell";
limit = 5; limit = 5;
registrationConfigFile = config.age.secrets.runner-qemu.path; authenticationTokenConfigFile = config.age.secrets.runner-qemu.path;
environmentVariables = { environmentVariables = {
EFI_DIR = "${pkgs.OVMF.fd}/FV/"; EFI_DIR = "${pkgs.OVMF.fd}/FV/";
STORAGE_URL = "http://s3.thehellings.lan:9000"; STORAGE_URL = "http://s3.thehellings.lan:9000";
+1 -1
View File
@@ -24,7 +24,7 @@ in with lib; {
}; };
udev.packages = with pkgs; [ udev.packages = with pkgs; [
gnome3.gnome-settings-daemon gnome-settings-daemon
]; ];
pipewire.enable = true; pipewire.enable = true;