Fix all the flake check problems
Fixes all of the problems with nix flake check, including reformatting all the things cleanup on shell and configuration
This commit is contained in:
+6
-4
@@ -5,11 +5,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./modules/
|
||||
./modules
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
@@ -73,7 +72,10 @@
|
||||
users.users.greg = {
|
||||
isNormalUser = true;
|
||||
description = "Greg Hellings";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
];
|
||||
packages = with pkgs; [
|
||||
firefox
|
||||
# thunderbird
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
let
|
||||
wikiHost = "wiki.icdm.lan";
|
||||
kiwixport = 8080;
|
||||
dependents = with pkgs; [
|
||||
enwiki-dump
|
||||
transmission
|
||||
];
|
||||
in
|
||||
{
|
||||
services.kiwix-serve = {
|
||||
@@ -14,18 +10,6 @@ in
|
||||
path = "/srv/zims/*.zim";
|
||||
};
|
||||
|
||||
services.transmission = {
|
||||
enable = true;
|
||||
settings = {
|
||||
download-dir = "/srv";
|
||||
incomplete-dir = "/srv/incomplete";
|
||||
rpc-bind-address = "0.0.0.0";
|
||||
rpc-whitelist = "10.42.*,127.*,localhost";
|
||||
};
|
||||
};
|
||||
|
||||
greg.proxies."${wikiHost}".target = "http://localhost:${toString kiwixport}";
|
||||
networking.firewall.allowedTCPPorts = [ 80 ];
|
||||
|
||||
environment.systemPackages = dependents;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
[
|
||||
# for Immersed
|
||||
cudatoolkit
|
||||
immersed-vr
|
||||
immersed
|
||||
libva
|
||||
]
|
||||
[
|
||||
|
||||
@@ -216,6 +216,7 @@ in
|
||||
systemd.services = {
|
||||
nginx = rec {
|
||||
after = [ "network-online.target" ];
|
||||
requires = [ "network-online.target" ];
|
||||
wants = after;
|
||||
serviceConfig = {
|
||||
RestartMaxDelaySec = "30s";
|
||||
|
||||
@@ -45,7 +45,10 @@ in
|
||||
age.secrets.runner-reg.file = ../../secrets/gitlab/myself-podman-runner-reg.age;
|
||||
age.secrets.docker-auth.file = ../../secrets/gitlab/docker-auth.age;
|
||||
age.secrets.runner-qemu.file = ../../secrets/gitlab/myself-qemu-runner-reg.age;
|
||||
systemd.services.gitlab-runner.after = [ "network-online.target" ];
|
||||
systemd.services.gitlab-runner = {
|
||||
after = [ "network-online.target" ];
|
||||
requires = [ "network-online.target" ];
|
||||
};
|
||||
services.gitlab-runner = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -54,7 +57,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:*"
|
||||
@@ -81,7 +84,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";
|
||||
|
||||
@@ -23,6 +23,7 @@ func getTypes() []string {
|
||||
"wikibooks",
|
||||
"gutenberg",
|
||||
"phet",
|
||||
"ted",
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+11
-4
@@ -1,12 +1,19 @@
|
||||
{ self', pkgs, nixvimunstable, ... }:
|
||||
{
|
||||
self',
|
||||
pkgs,
|
||||
nixvimunstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
system = pkgs.system;
|
||||
vim = (nixvimunstable.legacyPackages.${system}.makeNixvim
|
||||
(import ./home/modules/baseline/vim/config.nix {
|
||||
vim = (
|
||||
nixvimunstable.legacyPackages.${system}.makeNixvim (
|
||||
import ./home/modules/baseline/vim/config.nix {
|
||||
inherit pkgs;
|
||||
inherit (pkgs) lib;
|
||||
config.nixpkgs.config.allowUnfree = false; # I have tried to allow it, but I don't seem able to do so
|
||||
})
|
||||
}
|
||||
)
|
||||
);
|
||||
in
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user