erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:5ece1130002a5596e82bf0773b8cd41f895f0b59
Branches Tags
erwin:main
..
compare: erwin:2a08a90103d22b53b91fc1c9e0de671814496620
Branches Tags
erwin:main

No commits in common. "5ece1130002a5596e82bf0773b8cd41f895f0b59" and "2a08a90103d22b53b91fc1c9e0de671814496620" have entirely different histories.
5ece113000 ... 2a08a90103

10 changed files with 86 additions and 121 deletions
Show stats Expand all files Collapse all files

72
flake.lock
View file

@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716000408, "lastModified": 1715914213,
"narHash": "sha256-jIGTdIcHtRpY3fcfNUbcTv2IOVGW9srUzLrcYgK07Ik=", "narHash": "sha256-QiukFbOYCdlpmbG7MTTSq4CCU9blp4rSA21veX9vyKY=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "95c91689441c66228cd8eb2e94e9b43a848d75f4", "rev": "64b7581644e2dbc4d1f31f220158c0cc321f2139",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716168343, "lastModified": 1715872464,
"narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", "narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", "rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1716196045, "lastModified": 1715910562,
"narHash": "sha256-WLxzdjUlIuf56IYdILyrDUtyUhRlWsiCF7xuhunErMA=", "narHash": "sha256-5H1xZ7LgJGEGjVgLMSJYftyrIt0zmmJGX9XMxdT1q3k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "96e0ae1f75b858ce26b84fb2b4bb2a0249dab918", "rev": "238eefc3f18c7079b2ec3fa4c1b9b11e1c7dcc7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +563,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1715486357,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -655,11 +655,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716116133, "lastModified": 1714987925,
"narHash": "sha256-CwOldvBBXr1K2Zr6z5chHtieBBIQqk+k5RKt3hkF1OU=", "narHash": "sha256-8gG1yIsha3bOUNs2cyOrC1I2E30G3R7bGoHsGO5bhkY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "bca096389e440f0f20a6a795546f65e2f2f7410d", "rev": "57342044b03b7faa4c949d492c80527ad693194c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +670,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1716173274, "lastModified": 1715881912,
"narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,11 +729,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1715668745,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -761,11 +761,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1715458492,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "8e47858badee5594292921c2668c11004c3b0142",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,11 +777,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1715787315,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -905,11 +905,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716171463, "lastModified": 1715912155,
"narHash": "sha256-lc7wOh5BjYUoxdhcPkeUY8BmuL2qtRaHlW1403RW48E=", "narHash": "sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "04d61d14803854fd8453ec43c5c53a471e5407a8", "rev": "d3a96b08a7280a5753246129b462eed3662815d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,11 +926,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1716087663, "lastModified": 1715482972,
"narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1008,11 +1008,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715940852, "lastModified": 1714058656,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -20,6 +20,7 @@
pre-commit-hooks = { pre-commit-hooks = {
url = "github:cachix/git-hooks.nix"; url = "github:cachix/git-hooks.nix";
inputs = { inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -275,7 +276,6 @@
headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { }; headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { };
incus-ui = pkgs.callPackage ./pkgs/incus-ui { }; incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
openfga = pkgs.callPackage ./pkgs/openfga { }; openfga = pkgs.callPackage ./pkgs/openfga { };
tinyows = pkgs.callPackage ./pkgs/tinyows { };
zed = pkgs.callPackage ./pkgs/zed { }; zed = pkgs.callPackage ./pkgs/zed { };
}; };

36
machines/loki/configuration.nix
View file

@ -1,9 +1,4 @@
{ { nixos-hardware, nix-ld-rs, ... }:
nixos-hardware,
nix-ld-rs,
attic,
...
}:
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
@ -493,24 +488,19 @@
]; ];
}; };
nix.settings.post-build-hook = # nix.settings.post-build-hook =
let # let
inherit (attic.packages.${pkgs.system}) attic-client; # inherit (attic.packages.${pkgs.system}) attic-client;
cachedPackagePatterns = builtins.concatStringsSep "|" [ "mongodb" ]; # in
in # pkgs.writeScript "upload-to-cache" ''
pkgs.writeScript "upload-to-cache" '' # set -eu
set -eu # set -f
set -f # export IFS=' '
export IFS=' '
OUT_PATHS=$(echo -n ''${OUT_PATHS} | ${pkgs.gawk}/bin/awk 'BEGIN { RS = " "; ORS = " "; } $0 ~ /(${cachedPackagePatterns})/ { print $0 }') # OUT_PATHS=$(echo -n ''${OUT_PATHS} | ${pkgs.gawk}/bin/awk 'BEGIN { RS = " "; ORS = " "; } $0 !~ /horus_vcpkg/ { print $0 }')
if [[ -z "''${OUT_PATHS}" ]]; then # echo "Uploading paths to cache " ''${OUT_PATHS}
echo "No matching packages to upload" # exec ${attic-client}/bin/attic push main ''${OUT_PATHS}
exit 0 # '';
fi
echo "Uploading paths to cache " ''${OUT_PATHS}
exec ${attic-client}/bin/attic push main ''${OUT_PATHS}
'';
sops.defaultSopsFile = ./secrets.yaml; sops.defaultSopsFile = ./secrets.yaml;
sops.secrets = { sops.secrets = {

7
machines/odin/virtualisation.nix
View file

@ -4,7 +4,6 @@
virtualisation = { virtualisation = {
incus = { incus = {
enable = true; enable = true;
ui.enable = true;
preseed = { preseed = {
networks = [ networks = [
{ {
@ -122,9 +121,9 @@
pkgs.e2fsprogs pkgs.e2fsprogs
pkgs.kmod pkgs.kmod
]; ];
# environment = { environment = {
# INCUS_UI = pkgs.incus-ui; INCUS_UI = pkgs.incus-ui;
# }; };
}; };
incus-preseed = { incus-preseed = {
path = [ pkgs.lvm2 ]; path = [ pkgs.lvm2 ];

2
machines/valkyrie/coredns/default.nix
View file

@ -10,7 +10,7 @@
version = "750df081a3cc63f325ecfde6c30a974dc0e4bf56"; version = "750df081a3cc63f325ecfde6c30a974dc0e4bf56";
} }
]; ];
vendorHash = "sha256-tuHr5oYmx3HNmsO6ZOO14vORArk8YHZBsodCiydf6k8="; vendorHash = "sha256-X4PSkXURIJxt7ouf5jQ7j3kJegsPsk8cqXEt6kyVnVY=";
}; };
config = '' config = ''

25
modules/keycloak/default.nix
View file

@ -7,6 +7,27 @@
with lib; with lib;
let let
cfg = config.eboskma.keycloak; cfg = config.eboskma.keycloak;
keywindTheme = pkgs.stdenv.mkDerivation {
pname = "keycloak-theme-keywind";
version = "unstable-2023-12-13";
src = pkgs.fetchFromGitHub {
owner = "lukin";
repo = "keywind";
rev = "bdf966fdae0071ccd46dab4efdc38458a643b409";
hash = "sha256-8N+OQ6Yg9RKxqGd8kgsbvrYuVgol49bo/iJeIJXr3Sg=";
};
doConfigure = false;
doBuild = false;
doCheck = false;
installPhase = ''
mkdir $out
cp -r $src/theme/keywind/* $out/
'';
};
in in
{ {
options.eboskma.keycloak = { options.eboskma.keycloak = {
@ -26,6 +47,10 @@ in
features = "docker"; features = "docker";
}; };
themes = {
keywind = keywindTheme;
};
plugins = [ plugins = [
(pkgs.callPackage ./keycloak-orgs.nix { (pkgs.callPackage ./keycloak-orgs.nix {
inherit (pkgs) fetchFromGitHub; inherit (pkgs) fetchFromGitHub;

4
modules/keycloak/keycloak-admin-ui.nix
View file

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak"; owner = "keycloak";
repo = "keycloak"; repo = "keycloak";
rev = version; rev = version;
sha256 = "+T8Y3/CkWFslhzGH+5uceb7hYJioxivMkLHTBYvq7KM="; sha256 = "u9A/enVJwXqPRXyCsuSCloKcoYSKtEfuaJWJeNYsgVk=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-6vlH568z0oeBZQu953DNMkpneqzwFh9o7wmG1iOaoxA="; mvnHash = "sha256-XTXdDxNO9rwRFbfLG1+gHExddJnNbhjRuIQJDrgmhxI=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

6
modules/keycloak/keycloak-orgs.nix
View file

@ -1,6 +1,6 @@
{ buildMavenPackage, fetchFromGitHub }: { buildMavenPackage, fetchFromGitHub }:
let let
version = "0.72"; version = "0.70";
in in
buildMavenPackage { buildMavenPackage {
inherit version; inherit version;
@ -10,13 +10,13 @@ buildMavenPackage {
owner = "p2-inc"; owner = "p2-inc";
repo = "keycloak-orgs"; repo = "keycloak-orgs";
rev = "v${version}"; rev = "v${version}";
sha256 = "HaetCeTjXW+4OM7UZkmryynASF/QUb6bPEWCMzKB0h8="; sha256 = "VsPANkqKOTKlh2TJt7kzYoLr4T7v86g7HocmWxG/z7A=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };
doCheck = false; doCheck = false;
mvnHash = "sha256-HfLuUy22JgRK0M8h0BQ31OMboY2XDo+eTt/TmYhHPZo="; mvnHash = "sha256-SXq4WxPgjJyO/DLvhptz5vOq3oOfmABygYFkl2C3HtI=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true";

4
modules/keycloak/phasetwo-admin-ui.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let let
version = "24.0.4.1715362488"; version = "24.0.2.1712258262";
jarVersion = "24.0.0"; jarVersion = "24.0.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "p2-inc"; owner = "p2-inc";
repo = "phasetwo-containers"; repo = "phasetwo-containers";
rev = "v${version}"; rev = "v${version}";
sha256 = "J8ffCVYmDGi/eLlTTcR+k73f9nXlCQoCY7GNMi5f584="; sha256 = "OwqbcZfhlSkm7ilK1+D+fGnnIfCsu4v76hFFPbWWsas=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };

49
pkgs/tinyows/default.nix
View file

@ -1,49 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
flex,
fcgi,
libxml2,
postgresql,
}:
stdenv.mkDerivation rec {
pname = "tinyows";
version = "1.2.0";
src = fetchFromGitHub {
owner = "MapServer";
repo = "tinyows";
rev = "v${version}";
hash = "sha256-6s+zKR2rLb1f9NaS9i6Gky2sOD1NdBzNe1GTP20+RTE=";
};
buildInputs = [
fcgi
libxml2
(postgresql.withPackages (ps: with ps; [ postgis ]))
];
nativeBuildInputs = [
autoreconfHook
flex
];
installPhase = ''
runHook preInstall
make install
install -D -m 0755 tinyows $out/bin/tinyows
runHook postInstall
'';
meta = with lib; {
description = "Source code of the TinyOWS project. Please submit pull requests to the 'main' branch";
homepage = "https://github.com/MapServer/tinyows";
changelog = "https://github.com/MapServer/tinyows/blob/${src.rev}/NEWS";
license = licenses.mit;
mainProgram = "tinyows";
platforms = platforms.all;
};
}