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