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

Compare commits

base: erwin:e99d4de6fba130a414edb6449c3227a1ed95016a
Branches Tags
erwin:main
...
compare: erwin:d258abf38e836485f251b382c7d66b3add40a766
Branches Tags
erwin:main

6 commits
e99d4de6fb ... d258abf38e

Author SHA1 Message Date
Erwin Boskma
d258abf38e
keycloak: Update plugins 2024-06-27 15:22:13 +02:00
Erwin Boskma
76c0d66046
heimdall: Add caddy configuration for boskma.frl root 2024-06-27 14:57:56 +02:00
Erwin Boskma
7f2b8af0f5
loki: Rename wghorus to horus0 2024-06-27 14:57:45 +02:00
Erwin Boskma
93b35b7d0e
river: Set XDG_CURRENT_DESKTOP 2024-06-27 14:57:33 +02:00
Erwin Boskma
67396ed222
Delete krops.nix because it is no longer used 2024-06-27 14:57:18 +02:00
Erwin Boskma
5390d359cc
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/8956142cc5b4f5636ae1943f81bf2c22864b8dba?narHash=sha256-s7dGKRFHjizKv%2BmqaAd/7BmwPphNM6XMGqtC40sqzWM%3D' (2024-06-24)
  → 'github:atuinsh/atuin/9e36f63c6edbd7d675202e873716de9748928b59?narHash=sha256-NBPZdXaXPPbD/w2EM2cC3dK1ZFSAemV5sIQHGLeoAEY%3D' (2024-06-24)
• Updated input 'disko':
    'github:nix-community/disko/50d4d13fbac5db81f8c1e79d95ad87a2970b9201?narHash=sha256-ByDySG4oQN6KzLCuJjTax6%2BcMVtOixuYuu2GnnoPpoI%3D' (2024-06-24)
  → 'github:nix-community/disko/dd4d1663ccf7fbdb32361b9afe9e71206584cd4c?narHash=sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM%3D' (2024-06-24)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/e3e9ef4c9904fddbd8c00f3288e6a3be26a6bf0b?narHash=sha256-4jggHHDsLt%2Bi4/6lMNlZkHd3bzgV50feNpZGe4X3eMQ%3D' (2024-06-24)
  → 'github:nix-community/emacs-overlay/b6082d10feac69203dac419818daa47c5fe36464?narHash=sha256-BiDNkoh9a2dx2OTUFpzWhkGq5WfatG7sUX4Kw0Fdo7g%3D' (2024-06-24)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/03d771e513ce90147b65fe922d87d3a0356fc125?narHash=sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90%2B%2BqRN3lukGaIk%3D' (2024-06-19)
  → 'github:NixOS/nixpkgs/906320ae02f769d13a646eb3605a9821df0d6ea2?narHash=sha256-aEMsNUtqSPwn6l%2BLIZ/rX%2B%2BnCgun3E9M3uSZs6Rwb7w%3D' (2024-06-23)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/8cd35b9496d21a6c55164d8547d9d5280162b07a?narHash=sha256-RTyqP4fBX2MdhNuMP%2BfnR3lIwbdtXhyj7w7fwtvgspc%3D' (2024-06-20)
  → 'github:cachix/git-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
• Updated input 'pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/842253bf992c3a7157b67600c2857193f126563a?narHash=sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM%3D' (2024-06-15)
  → 'github:NixOS/nixpkgs/03d771e513ce90147b65fe922d87d3a0356fc125?narHash=sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90%2B%2BqRN3lukGaIk%3D' (2024-06-19)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/577ee84c69ba89894ac622d71a678a14d746b2f7?narHash=sha256-bFXHMjpYlEERexzXa1gLGJO/1l8dxaAtSNE56YALuTg%3D' (2024-06-24)
  → 'github:oxalica/rust-overlay/b6032d3a404d8a52ecfc8571ff0c26dfbe221d07?narHash=sha256-LIBMfhM9pMOlEvBI757GOK5l0R58SRi6YpwfYMbf4yc%3D' (2024-06-25)
• Updated input 'sops':
    'github:Mic92/sops-nix/5e2e9421e9ed2b918be0a441c4535cfa45e04811?narHash=sha256-kr2QzRrplzlCP87ddayCZQS%2BdhGW98kw2zy7%2BjUXtF4%3D' (2024-06-23)
  → 'github:Mic92/sops-nix/c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3?narHash=sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8%3D' (2024-06-24)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/68eb1dc333ce82d0ab0c0357363ea17c31ea1f81?narHash=sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls%3D' (2024-06-16)
  → 'github:numtide/treefmt-nix/065a23edceff48f948816b795ea8cc6c0dee7cdf?narHash=sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4%3D' (2024-06-24)
 2024-06-25 09:44:03 +02:00
8 changed files with 52 additions and 74 deletions
Show stats Expand all files Collapse all files

54
flake.lock
View file

@ -56,11 +56,11 @@
]
},
"locked": {
"lastModified": 1719213809,
"narHash": "sha256-s7dGKRFHjizKv+mqaAd/7BmwPphNM6XMGqtC40sqzWM=",
"lastModified": 1719243979,
"narHash": "sha256-NBPZdXaXPPbD/w2EM2cC3dK1ZFSAemV5sIQHGLeoAEY=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "8956142cc5b4f5636ae1943f81bf2c22864b8dba",
"rev": "9e36f63c6edbd7d675202e873716de9748928b59",
"type": "github"
},
"original": {
@ -197,11 +197,11 @@
]
},
"locked": {
"lastModified": 1719193457,
"narHash": "sha256-ByDySG4oQN6KzLCuJjTax6+cMVtOixuYuu2GnnoPpoI=",
"lastModified": 1719236180,
"narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=",
"owner": "nix-community",
"repo": "disko",
"rev": "50d4d13fbac5db81f8c1e79d95ad87a2970b9201",
"rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c",
"type": "github"
},
"original": {
@ -221,11 +221,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1719193216,
"narHash": "sha256-4jggHHDsLt+i4/6lMNlZkHd3bzgV50feNpZGe4X3eMQ=",
"lastModified": 1719245815,
"narHash": "sha256-BiDNkoh9a2dx2OTUFpzWhkGq5WfatG7sUX4Kw0Fdo7g=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "e3e9ef4c9904fddbd8c00f3288e6a3be26a6bf0b",
"rev": "b6082d10feac69203dac419818daa47c5fe36464",
"type": "github"
},
"original": {
@ -753,11 +753,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1718811006,
"narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
"lastModified": 1719122173,
"narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
"rev": "906320ae02f769d13a646eb3605a9821df0d6ea2",
"type": "github"
},
"original": {
@ -769,11 +769,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1718447546,
"narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
"lastModified": 1718811006,
"narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "842253bf992c3a7157b67600c2857193f126563a",
"rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
"type": "github"
},
"original": {
@ -853,11 +853,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1718879355,
"narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=",
"lastModified": 1719259945,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github"
},
"original": {
@ -943,11 +943,11 @@
]
},
"locked": {
"lastModified": 1719195554,
"narHash": "sha256-bFXHMjpYlEERexzXa1gLGJO/1l8dxaAtSNE56YALuTg=",
"lastModified": 1719281921,
"narHash": "sha256-LIBMfhM9pMOlEvBI757GOK5l0R58SRi6YpwfYMbf4yc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "577ee84c69ba89894ac622d71a678a14d746b2f7",
"rev": "b6032d3a404d8a52ecfc8571ff0c26dfbe221d07",
"type": "github"
},
"original": {
@ -964,11 +964,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1719111739,
"narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=",
"lastModified": 1719268571,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
"type": "github"
},
"original": {
@ -1061,11 +1061,11 @@
]
},
"locked": {
"lastModified": 1718522839,
"narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
"lastModified": 1719243788,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
"type": "github"
},
"original": {

4
home-manager/modules/river/default.nix
View file

@ -223,5 +223,9 @@ in
xdg.configFile."xkb/symbols/us" = {
source = ./keyboard-layout.xkb;
};
home.sessionVariables = {
XDG_CURRENT_DESKTOP = "river";
};
};
}

33
krops.nix
View file

@ -1,33 +0,0 @@
let
krops = builtins.fetchGit { url = "https://cgit.krebsco.de/krops/"; };
lib = import "${krops}/lib";
pkgs = import "${krops}/pkgs" { };
source = _name: lib.evalSource [ { machine-config.file = toString ./.; } ];
command = targetPath: ''
nix-shell -p git --run '
nix build '${targetPath}/machine-config#nixosConfigurations.$(hostname).config.system.build.toplevel' && \
nixos-rebuild switch --show-trace --build-host builder@loki --flake ${targetPath}/machine-config
'
'';
createHost =
name: target:
pkgs.krops.writeCommand "deploy-${name}" {
inherit command;
source = source name;
target = lib.mkTarget target;
};
in
{
# Deployments
# Run with:
# nix-build ./krops.nix -A loki && ./result
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.201";
}

7
machines/heimdall/configuration.nix
View file

@ -137,6 +137,13 @@
file_server
'';
};
"boskma.frl" = {
extraConfig = ''
root * /var/www/boskma.frl
file_server
'';
};
};
};
};

8
machines/loki/configuration.nix
View file

@ -242,11 +242,11 @@
};
netdevs = {
"10-wghorus" = {
"10-horus0" = {
netdevConfig = {
Kind = "wireguard";
MTUBytes = "1420";
Name = "wghorus";
Name = "horus0";
};
wireguardConfig = {
@ -281,9 +281,9 @@
IPv6AcceptRA = true;
};
};
"40-wghorus" = {
"40-horus0" = {
matchConfig = {
Name = "wghorus";
Name = "horus0";
};
linkConfig = {

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

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak";
repo = "keycloak";
rev = version;
sha256 = "ZbI0ekuYOl7SSzoGHGOTs/u3hRHfh9qFH0FB953YxP0=";
sha256 = "sha256-DgXUBnyrx4b7YH/w7EJFAPT35MEKTBQBNHFteW+A7hE=";
};
sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-Cru48OGrrBSjfHzPrEbRRZXxB75tIn5URw0fFILcTf0=";
mvnHash = "sha256-lf2CSOM3uWcG3lw7CHz7KBUMS6Av1M9ak7jFEQX/f1I=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = ''

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

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

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let
version = "24.0.4.1715362488";
jarVersion = "24.0.0";
version = "25.0.1.1718907377";
jarVersion = "25.0.0";
in
stdenv.mkDerivation {
inherit version;
@ -11,8 +11,8 @@ stdenv.mkDerivation {
owner = "p2-inc";
repo = "phasetwo-containers";
rev = "v${version}";
sha256 = "J8ffCVYmDGi/eLlTTcR+k73f9nXlCQoCY7GNMi5f584=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
hash = "sha256-Xk/4Nq2u5reZeMoNHWGS8sZXiGtd/BFRB6dA9AW0fKw=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};
doBuild = false;