Gitea fixes, formatting with nixpkgs-fmt

This commit is contained in:
Erwin Boskma 2022-04-27 00:21:19 +02:00
parent 7551396a58
commit 3c172be12d
Signed by: erwin
GPG key ID: 270B20D17394F7E5
68 changed files with 733 additions and 689 deletions

View file

@ -2,6 +2,7 @@ keys:
- &erwin b785a9688947edabb9ec8933ee7adefe1d943c7b
- &loki a6e31f5ab2bf34ca3f614d81ed9d6ae54dbcb9f7
- &drone 8eefb1f8c85704ca47aa226a692372b1fc4bb9bf
- &gitea ca0dba2f767679957879077fb8922c8ba16710be
creation_rules:
- path_regex: machines/loki/[^/]+\.yaml$
key_groups:
@ -17,3 +18,4 @@ creation_rules:
key_groups:
- pgp:
- *erwin
- *gitea

View file

@ -85,11 +85,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1650746813,
"narHash": "sha256-RY2UXfjOmIE9xr/vSAxQOQQBjBgsr5pmA+NK5RCLpmg=",
"lastModified": 1650946623,
"narHash": "sha256-YGoR+ypDCii9Kl4bZ2NgOh0DLV6xSjcyM2rZsAWVdCM=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "b3418d25f48c177c14e1fa677701067dc78936a6",
"rev": "4356a0643b98868883425711daa02dde1290b2ed",
"type": "github"
},
"original": {
@ -166,11 +166,11 @@
]
},
"locked": {
"lastModified": 1650478719,
"narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
"lastModified": 1650920743,
"narHash": "sha256-7xxdtLp295HswhyEjr991QJsBFeadUo43NiAsHnQ5+8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
"rev": "223a73c2ba7d358b23666937cb13a59b31df511c",
"type": "github"
},
"original": {
@ -254,11 +254,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1650701402,
"narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
"lastModified": 1650831523,
"narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
"rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0",
"type": "github"
},
"original": {
@ -385,11 +385,11 @@
]
},
"locked": {
"lastModified": 1650681299,
"narHash": "sha256-JNvHHeeXDl3UnjWolMSbH2sWvhAYPfAutL815kZ6vFs=",
"lastModified": 1650941217,
"narHash": "sha256-rWpp8pKM9jYcvG7JiNAw+ITOlY20h8K83S3RQc9pY74=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d10f36b093459eb71ddcfedbab538c1ae3dfebb2",
"rev": "b4cc9abdd42655b61325f3feb062cacc51a54de2",
"type": "github"
},
"original": {

View file

@ -69,12 +69,12 @@
};
};
outputs = {
self,
sops,
ha-now-playing,
pamedia,
...
outputs =
{ self
, sops
, ha-now-playing
, pamedia
, ...
} @ inputs:
with inputs; let
defSystem = system: baseConfig:
@ -185,6 +185,12 @@
(import ./machines/proxy/configuration.nix { inherit self; })
];
};
gitea = defSystem "x86_64-linux" {
imports = [
(import ./machines/gitea/configuration.nix { inherit self; })
];
};
};
nixosContainers = {
@ -209,7 +215,8 @@
}
// (flake-utils.lib.eachSystem [ "aarch64-linux" "x86_64-linux" ])
(
system: let
system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [
@ -222,7 +229,8 @@
allowUnfree = true;
};
};
in rec {
in
rec {
packages = flake-utils.lib.flattenTree {
rofi-wayland = pkgs.rofi-wayland;
nix-plugins = pkgs.nix-plugins;
@ -240,6 +248,8 @@
nativeBuildInputs = [ sops ssh-to-pgp ];
packages = [ sops ];
};
formatter = pkgs.nixpkgs-fmt;
}
);
}

View file

@ -1,22 +1,21 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.alacritty;
importYAML = name: yamlFile: (lib.importJSON ((pkgs.runCommandNoCC name { } ''
mkdir -p $out
${pkgs.yaml2json}/bin/yaml2json < ${yamlFile} | ${pkgs.jq}/bin/jq -a '.' > $out/tmp.json
'')
.outPath
'').outPath
+ "/tmp.json"));
theme = importYAML "theme" (builtins.fetchurl {
url = "https://raw.githubusercontent.com/dracula/alacritty/05faff15c0158712be87d200081633d9f4850a7d/dracula.yml";
sha256 = "1366rvvni2shbqlcrbypjv4f7p7ccdr6bvr685jnj8ipwqjjb6rn";
});
in {
in
{
options.eboskma.programs.alacritty.enable = mkEnableOption "Enable alacritty";
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.bat;
in {
in
{
options.eboskma.programs.bat = {
enable = mkEnableOption "enable bat";
};

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.dropbox;
in {
in
{
options.eboskma.programs.dropbox = { enable = mkEnableOption "activate dropbox"; };
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.dunst;
in {
in
{
options.eboskma.programs.dunst = {
enable = mkEnableOption "activate dunst";
};

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.electron;
in {
in
{
options.eboskma.programs.electron = {
enable = mkEnableOption "activate electron settings";
wayland = mkEnableOption "set Wayland compatibility settings";

View file

@ -1,8 +1,7 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.emacs;
@ -20,7 +19,8 @@ with lib; let
mimeTypes = [ "x-scheme-handler/org-protocol" ];
startupWMClass = "Emacs";
};
in {
in
{
options.eboskma.programs.emacs = {
enable = mkEnableOption "activate emacs";
daemon = mkOption {

View file

@ -1,8 +1,7 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.firefox;
@ -69,7 +68,8 @@ with lib; let
"X-MultipleArgs" = "false";
};
};
in {
in
{
options.eboskma.programs.firefox = {
enable = mkEnableOption "enable firefox";
work = mkOption {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.fish;
in {
in
{
options.eboskma.programs.fish = {
enable = mkEnableOption "Enable fish shell";
};

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.foot;
in {
in
{
options.eboskma.programs.foot = {
enable = mkEnableOption "activate foot";
server = mkEnableOption "enable foot server";

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.git;
in {
in
{
options.eboskma.programs.git = {
enable = mkEnableOption "enable git";

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.gpg;
in {
in
{
options.eboskma.programs.gpg = {
enable = mkEnableOption "enable gpg";
};

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.neovim;
in {
in
{
options.eboskma.programs.neovim = { enable = mkEnableOption "activate neovim"; };
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.obs-studio;
in {
in
{
options.eboskma.programs.obs-studio = { enable = mkEnableOption "activate obs-studio"; };
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.rofi;
in {
in
{
options.eboskma.programs.rofi.enable = mkEnableOption "Enable rofi";
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.solvespace;
in {
in
{
options.eboskma.programs.solvespace = { enable = mkEnableOption "activate solvespace"; };
config = mkIf (cfg.enable) {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.ssh;
in {
in
{
options.eboskma.programs.ssh = { enable = mkEnableOption "activate ssh"; };
config = mkIf (cfg.enable) {

View file

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.sway;
@ -10,7 +9,8 @@ with lib; let
swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ~/.wallpapers/river-2560.png --fade-in 0.5 --scaling fill";
# swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ~/.wallpapers/river-2560.png --scaling fill";
rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh);
in {
in
{
options.eboskma.programs.sway.enable = mkEnableOption "Enable sway";
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.tmux;
in {
in
{
options.eboskma.programs.tmux = {
enable = mkEnableOption "enable tmux";
};

View file

@ -1,13 +1,13 @@
{
lib,
pkgs,
config,
flake-inputs,
...
{ lib
, pkgs
, config
, flake-inputs
, ...
}:
with lib; let
cfg = config.eboskma.programs.vscode;
in {
in
{
options.eboskma.programs.vscode.enable = mkEnableOption "enable vscode";
config = mkIf cfg.enable {

View file

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.programs.waybar;
@ -14,7 +13,8 @@ with lib; let
if [[ ''${COUNT} != 0 ]]; then DISABLED=" ''${COUNT}"; fi
if ${pkgs.dunst}/bin/dunstctl is-paused | grep -q "false" ; then echo "''${ENABLED}"; else echo "''${DISABLED}"; fi
'';
in {
in
{
options.eboskma.programs.waybar.enable = mkEnableOption "Enable waybar";
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.programs.zathura;
in {
in
{
options.eboskma.programs.zathura = { enable = mkEnableOption "activate zathura"; };
config = mkIf (cfg.enable) {

View file

@ -25,7 +25,8 @@ let
source = source name;
target = lib.mkTarget target;
};
in rec {
in
rec {
# Deployments
# Run with:
@ -34,4 +35,5 @@ in rec {
loki = createHost "loki" "root@loki";
drone = createHost "drone" "root@10.0.0.202";
proxy = createHost "proxy" "root@10.0.0.251";
gitea = createHost "gitea" "root@10.0.0.203";
}

View file

@ -1,9 +1,8 @@
{
config,
lib,
pkgs,
modulesPath,
...
{ config
, lib
, pkgs
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/virtualisation/lxc-container.nix")

View file

@ -1,5 +1,6 @@
{ self, ... } @ inputs: {
imports = [
./hardware-configuration.nix
../../users/root
../../users/erwin
];
@ -9,7 +10,7 @@
nix-common.enable = true;
};
# boot.isContainer = true;
boot.isContainer = true;
time.timeZone = "Europe/Amsterdam";
@ -22,7 +23,8 @@
interfaces = {
eth0 = {
ipv4.addresses = [
{ address = "10.0.0.203";
{
address = "10.0.0.201";
prefixLength = 24;
}
];

View file

@ -0,0 +1,10 @@
{ config
, lib
, pkgs
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/virtualisation/lxc-container.nix")
];
}

View file

@ -5,28 +5,48 @@ sops:
azure_kv: []
hc_vault: []
age: []
lastmodified: "2022-04-25T15:50:15Z"
mac: ENC[AES256_GCM,data:r+PbyDB1s0zBoczJVTaTnUvLw8Oqywul1zB7S8clXYtgWDSCIJ2igwupwmH2mYqEzTUutaKNjjAxbaerD8rrBgsJ1K1PSQwk6MawEskVwmdGbIdfCB8r0qHCNOE7pVRgTXyFxjEH6D9xxl/QJhVVTXXnZebR+r9q2SmJyazlFEg=,iv:lV6i7EKu6v0HORk1RhateMB9T0xMhROYKtd67M4fEJk=,tag:iTpNCUruB8Yd/5PlypdmQA==,type:str]
lastmodified: "2022-04-26T19:26:23Z"
mac: ENC[AES256_GCM,data:8KcUH12RqxkuX7MQpm4Xtl0YNUnhj/ef55ix8mb59ncLfjWauM7KlYVJg+La0FrqvWOFNNsMTYiBNlt/1KU9tqJs7kjzQQvhkcUDA6jAnFKtLCV6X8fd+3mon2UUL6eh5FDWjy3lTp45VrWNwTjC+LP1RAGGG7ie4tuI69PM1h0=,iv:SoU3hXDCZwJk4BLgjFU00rQUdqxlD5j8LcdQ8RZvbGs=,tag:9uveuZWgDesins8lk5w9Dw==,type:str]
pgp:
- created_at: "2022-04-25T15:49:31Z"
- created_at: "2022-04-26T19:30:48Z"
enc: |
-----BEGIN PGP MESSAGE-----
hQIMA6BoiFpcAxNSAQ//cqGJB1/5LEEG9tmgwYoTAW3hhMaF3yDuMRQbYG8CKw8t
ftrqUSltqoZi/9f7AHeQl82LnrdlHyHD3+uzcC1FYgYCU5OslD/IuvYBkVGXlvGh
kk7yBNSEsxVo2sPkrUPJzxapFcf1j2gm83WZ4vTUQ8Mn5UYmGBNmVw4cLtO/R732
ZhvvLePeF2Za79UxEKIkbh2CWNNA80PLZt8pLUsl+HXnWxNep6fDdwrC6GdU3C8o
qcHN7+JGZdDYFqD0bsxpHFYcbg8OWajFJ4vbx9JHSNfjxXRqzaWr+3I93N/aMra/
vXyqeRaqowXx9hL2lIAU2Pvpe79+YMeYm3WgEI0ytBz7o86majq3DQ3+XjESIpoy
5hNC+cgFiuBUE6e1lBq3812ycsH+HPtha2ppsyr5CX1Fjc63hkszU0bH6UL1jUVk
hUAEuLiKADnwPJK1NGrXHqyfEYhIAFkCvEgBK5zoCkcuQ/r2CsO8GfQdOPDwVKcC
WLHQU9hq66iCLTd9IxVfOn5YcMjHk6Ie5Dam7cbF3pVAcXrKneYgNK4kdh7aBOqe
dasqr/HNJ4Fi15lrVyx2g8c8mb68AbmTCydPX5tZ3RCIc0r8i4iEbYS0Ny8jVPZp
6qzI3qo0LnrnMaqqKiJAGH2x3y4bJUlrlab3tV0Kou7e2oM4WhY3jVFXtdAV7+HS
XgGGtcTnOE6cSrFRZCSCCzsRrvgDY3NNrrcVBayeCHG+OLqgiHngReG9CdbMzi9E
8yIxWF3/8kbKqru6TSheHgOu1v0q/RnCAEqukRynw/Ze8t2/tzGkzETgRMcCoDU=
=q/Xc
hQIMA6BoiFpcAxNSARAAmVgrY+u/uozCxB3xTegvh2C+VOW4yxDBKGFfM5/NS3PR
XneeBNRxJZ2BFsOnGtJZSsCkiD1FwVw9nYCnA1TCjw62gkHyJsvQziUM8WKrpIW0
RXHllXawOW7Lb0faUcTRF90Z//kVfk4o33Xs895IK+mk+iRpLdE0RrINBfZ7jb0y
OJ93wJ0CL7A5KtltUBthX+POqI12bbj7hnUtz05mfpQG6PcnRwMHJBUk0JPo4s4H
8ksJlPRrbwi7JU5XQTo7SDTp/IwbXbewCylkS7nt05znIOFIejC22XEv8w0XPX8p
ZwQxPvOrXb4f1PDFgv65ej2aXREc7sidwqg8hUiBsKBuxRjFQFzLcwhNzAKwv30s
Nrj4yTMn2qNIjhsfHfMgRpm/iwvpsAFWFUqGkwb3gs3V7PjOidRMB4xDY1QV9Pae
b8z18S4cFIh69Aev3fiDzopL5xF7ZBcayIjwC6RkhYzcedkz5oPl2tqqkJCiPQe9
ohxGF8m/9k/OhQRKl8HURybMyX7SwAXA9Tx1dNbb2xbPNaFXSBKxpF7B2k3kD/pQ
skuuHDl2z/deoD0Gu75+Svvb6jv82P3+KL9waaxrnfQQ3avX6hIQ9zF34jTxHbtr
UHAxEtuuIdER8756fWtgWshpdY2rWQ54flT6nlhtsNN1Io/flXdeof6S3hDiKAnS
XgEAVMKweW8Q2OhGhJZSEnP8IpRsPuGu3G1v8/L+lzJEK4edvUr9IgqGUq7Iqeql
7+sw+jFzJPsPhiFpvZx1pB1RGS50q6O/Ch8/AMK7SvYD6oSASYfa/ifzAZSapiE=
=r/Wn
-----END PGP MESSAGE-----
fp: b785a9688947edabb9ec8933ee7adefe1d943c7b
- created_at: "2022-04-26T19:30:48Z"
enc: |
-----BEGIN PGP MESSAGE-----
hQIMA7iSLIuhZxC+AQ/+Pr6/373P/TKxh3S1rg2SwIlwJ6pZo4E4JZBmCQ+YTZNz
WOg9WLUrMVAgax6dDTf+GPPCLphI7SfQjPqpHEOw/eUtZhSqmcq61no0gVyDgv5s
KHPrary79dVG7xw9i/ipc8LPc8hujeXHD4hzv2iYlod4LhjPwR4WsxaQJ7fbaU5V
V7Gu4wzdoiOTl1fthXaUAqjgJ/iRlQhML5B46dMVg5E7g7GKmJjPuBhDWIAz+/2Y
fNY5dWL7B5R67zFmrxUUa9Wbr1SvEViR4bKaUURMhixzgWAxgQ79zR4B3J1D+tW/
2TnpPgP2b5ikMKbUFBEX7x/oGmvVn4DJcDwQEM1X5+nMOpT7j4cx0NOnhUkJNfdW
VJK2bN/XBlfy9SnAz/nzleKzO+p27LvBfnyvC4fC9ZySNfVWdcDaqCRbF0mfHWB1
2C0HfEAQe7X7Vzpc3w+FyyZuQRNixTQjl2pouJIVWQOUFGy5Xn5yZgWrb93day9K
Q2zem+jMHQQpDc/KPSh1qIgboAh7UnxhfKJCUUortL6eMOL7UQi42qautDngl93D
opBSf2my+gqFajV6Y0vYO9MSGFd92XLwqQXnJMPEHm/aDsQRxW8mf71ZMu1iMUns
IU8nPgki2VC3Z+OnSYdUv8aSY5K341xODfntmrcdO/Q1dvsXEyPtZ81BQn4nY2jS
WAH3bwUphfdA/PNBRTGrYp/TiTdhj1cGtgyjY1QgIA2i8PTRAD4nk3kY6qwchUJE
Mjx0i74gMqFOZ81iFS1ohiya2zhP5mwbLzIP4hdt5J9UvDozhS52VE0=
=vu1S
-----END PGP MESSAGE-----
fp: ca0dba2f767679957879077fb8922c8ba16710be
unencrypted_suffix: _unencrypted
version: 3.7.2

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
{ config
, lib
, pkgs
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
@ -37,4 +36,3 @@
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
}

View file

@ -1,9 +1,8 @@
{
config,
lib,
pkgs,
modulesPath,
...
{ config
, lib
, pkgs
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/virtualisation/lxc-container.nix")

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
{ config
, lib
, pkgs
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
{ config
, lib
, pkgs
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.backscrub;
in {
in
{
options.eboskma.backscrub = {
enable = mkEnableOption "enable v4l2loopback kernel module";
};

View file

@ -1,8 +1,7 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.base;
@ -11,7 +10,8 @@ with lib; let
inherit (pkgs.stdenv) mkDerivation;
inherit lib;
};
in {
in
{
options.eboskma.base = {
kernel = mkOption {
description = "which kernel to run";

View file

@ -1,6 +1,6 @@
{
mkDerivation,
lib,
{ mkDerivation
, lib
,
}:
mkDerivation {
pname = "probe-rs-udev-rules";

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.bluetooth;
in {
in
{
options.eboskma.bluetooth = {
enable = mkEnableOption "activate bluetooth";
};

View file

@ -1,15 +1,15 @@
{
lib,
pkgs,
config,
inputs,
self-overlay,
...
{ lib
, pkgs
, config
, inputs
, self-overlay
, ...
}:
with lib; let
cfg = config.eboskma.desktop;
bt = config.eboskma.bluetooth;
in {
in
{
# imports = [ ../../users/erwin.nix ../../users/root.nix ];
options.eboskma.desktop = {

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.docker;
in {
in
{
options.eboskma.docker = { enable = mkEnableOption "activate docker"; };
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.drone;
in {
in
{
options.eboskma.drone = {
enable = mkEnableOption "activate drone CI";
};

View file

@ -1,13 +1,13 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.element-web;
matrixClientConfig = pkgs.writeText "element-web.json" (builtins.readFile ./element-web.json);
in {
in
{
options.eboskma.element-web = { enable = mkEnableOption "activate element-web"; };
config = mkIf cfg.enable {

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.fonts;
in {
in
{
options.eboskma.fonts = { enable = mkEnableOption "activate fonts"; };
config = mkIf cfg.enable {

View file

@ -1,6 +1,9 @@
{ pkgs, config, lib, ...}:
with lib;
let
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.gitea;
giteaCfg = config.services.gitea;
in
@ -26,6 +29,7 @@ in
socket = "/run/postgresql";
passwordFile = "/run/secrets/gitea_db_password";
createDatabase = false;
user = "git";
};
settings = {
@ -62,6 +66,8 @@ in
};
};
networking.firewall.allowedTCPPorts = [ 3000 ];
users.users.git = {
description = "Gitea service user";
home = giteaCfg.stateDir;
@ -79,7 +85,7 @@ in
ensureDatabases = [ "gitea" ];
ensureUsers = [
{
name = "gitea";
name = "git";
ensurePermissions = {
"DATABASE gitea" = "ALL PRIVILEGES";
};

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.gnome;
in {
in
{
options.eboskma.gnome.enable = mkEnableOption "activate gnome support settings";
config = mkIf (cfg.enable) {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.greetd;
in {
in
{
options.eboskma.greetd = {
enable = mkEnableOption "enable greetd";
};

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.livebook;
in {
in
{
options.eboskma.livebook = {
enable = mkEnableOption "Start a livebook container";
dataDir = mkOption {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.networking;
in {
in
{
options.eboskma.networking = {
enable = mkEnableOption "activate networing settings";

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.nginx-proxy-manager;
in {
in
{
options.eboskma.nginx-proxy-manager = { enable = mkEnableOption "Nginx Proxy Manager"; };
config = mkIf (cfg.enable) {

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.nix-common;
in {
in
{
options.eboskma.nix-common = {
enable = mkEnableOption "activate nix-common";
disable-cache = mkEnableOption "no not use binary cache";

View file

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.eboskma.var;
in {
in
{
options.eboskma.var.mainUser = lib.mkOption {
type = lib.types.str;
default = "erwin";

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.sound;
in {
in
{
options.eboskma.sound.enable = mkEnableOption "activate sound settings";
config = mkIf (cfg.enable) {

View file

@ -1,12 +1,12 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.systemd;
in {
in
{
options.eboskma.systemd = {
enable = mkEnableOption "activate systemd settings";
};

View file

@ -1,13 +1,13 @@
{
stdenv,
fetchFromGitHub,
cmake,
opencv,
gcc,
curl,
git,
tensorflow-lite,
flatbuffers,
{ stdenv
, fetchFromGitHub
, cmake
, opencv
, gcc
, curl
, git
, tensorflow-lite
, flatbuffers
,
}:
stdenv.mkDerivation {
name = "backscrub";

View file

@ -1,12 +1,12 @@
{
lib,
stdenv,
fetchFromGitHub,
nixUnstable,
cmake,
pkg-config,
boost,
nlohmann_json,
{ lib
, stdenv
, fetchFromGitHub
, nixUnstable
, cmake
, pkg-config
, boost
, nlohmann_json
,
}:
stdenv.mkDerivation rec {
pname = "nix-plugins";

View file

@ -1,11 +1,11 @@
{
fetchFromGitHub,
stdenv,
cmake,
obs-studio,
opencv,
onnx-runtime,
git,
{ fetchFromGitHub
, stdenv
, cmake
, obs-studio
, opencv
, onnx-runtime
, git
,
}:
stdenv.mkDerivation rec {
pname = "obs-backgroundremoval";

View file

@ -1,15 +1,14 @@
{
pkgs,
config,
lib,
...
{ pkgs
, config
, lib
, ...
}:
with lib; let
cfg = config.eboskma.desktop;
in {
in
{
options.eboskma.desktop = { enable = mkEnableOption "desktop configuration"; };
config =
mkIf (cfg.enable) {
};
mkIf (cfg.enable) { };
}