Add basic check compat
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
{ hooks, system, ... }:
|
||||
|
||||
{
|
||||
pre-commit-check = hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -76,14 +76,16 @@
|
||||
modules = import ./modules;
|
||||
};
|
||||
|
||||
perSystem = { config, self', pkgs', system, ... }: {
|
||||
_module.args.pkgs = import inputs.nixpkgs {
|
||||
perSystem = { pkgs, system, ... }: {
|
||||
_module.args.pkgs = import inputs.nixstable {
|
||||
inherit system overlays;
|
||||
};
|
||||
|
||||
checks = import ./checks.nix { inherit system; inherit (inputs) hooks; };
|
||||
|
||||
devShells = {
|
||||
default = pkgs'.mkShell {
|
||||
buildInputs = with pkgs'; [
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
bashInteractive
|
||||
curl
|
||||
git
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
{ pkgs, lib,
|
||||
inputs,
|
||||
host ? "most",
|
||||
nixvim,
|
||||
...}:
|
||||
|
||||
let
|
||||
system = pkgs.system;
|
||||
in
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate = (_: true);
|
||||
imports = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{ lib, pkgs, config, ... }:
|
||||
|
||||
let
|
||||
vim-xonsh = pkgs.vimUtils.buildVimPlugin {
|
||||
@@ -126,7 +126,7 @@ in
|
||||
neo-tree.enable = true;
|
||||
notify.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);
|
||||
extraConfigVim = builtins.readFile ./vim/extra.vimrc;
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
shell = {
|
||||
executor = "shell";
|
||||
limit = 5;
|
||||
registrationConfigFile = config.age.secrets.runner-reg.path;
|
||||
authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
|
||||
environmentVariables = {
|
||||
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
||||
STORAGE_URL = "http://s3.thehellings.lan:9000";
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
nvidiaSettings = true;
|
||||
#open = true;
|
||||
open = true;
|
||||
};
|
||||
pulseaudio.enable = false; # This conflicts with pipewire
|
||||
system76.enableAll = true;
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@
|
||||
services.vbox = {
|
||||
executor = "shell";
|
||||
limit = 5;
|
||||
registrationConfigFile = config.age.secrets.runner-reg.path;
|
||||
authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
|
||||
environmentVariables = {
|
||||
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
||||
};
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
enable = true;
|
||||
services.deployer = {
|
||||
executor = "shell";
|
||||
registrationConfigFile = config.age.secrets.runner-deployer.path;
|
||||
authenticationTokenConfigFile = config.age.secrets.runner-deployer.path;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ lib.attrsets.recursiveUpdate {
|
||||
shell = {
|
||||
executor = "shell";
|
||||
limit = 5;
|
||||
registrationConfigFile = config.age.secrets.runner-reg.path;
|
||||
authenticationTokenConfigFile = config.age.secrets.runner-reg.path;
|
||||
environmentVariables = {
|
||||
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
||||
STORAGE_URL = "http://s3.thehellings.lan:9000";
|
||||
|
||||
@@ -87,7 +87,7 @@ in {
|
||||
services = {
|
||||
default = {
|
||||
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";
|
||||
dockerAllowedImages = [
|
||||
"alpine:*"
|
||||
@@ -118,7 +118,7 @@ in {
|
||||
qemu = {
|
||||
executor = "shell";
|
||||
limit = 5;
|
||||
registrationConfigFile = config.age.secrets.runner-qemu.path;
|
||||
authenticationTokenConfigFile = config.age.secrets.runner-qemu.path;
|
||||
environmentVariables = {
|
||||
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
||||
STORAGE_URL = "http://s3.thehellings.lan:9000";
|
||||
|
||||
@@ -24,7 +24,7 @@ in with lib; {
|
||||
};
|
||||
|
||||
udev.packages = with pkgs; [
|
||||
gnome3.gnome-settings-daemon
|
||||
gnome-settings-daemon
|
||||
];
|
||||
|
||||
pipewire.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user