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

Compare commits

base: erwin:513d5ad981eab75916c8a8789ec5e19ad66fd74d
Branches Tags
erwin:main
..
compare: erwin:4968d2cd3f690b3937bd17bbb2e8d1b9941469a7
Branches Tags
erwin:main

No commits in common. "513d5ad981eab75916c8a8789ec5e19ad66fd74d" and "4968d2cd3f690b3937bd17bbb2e8d1b9941469a7" have entirely different histories.
513d5ad981 ... 4968d2cd3f

5 changed files with 8 additions and 11 deletions
Show stats Expand all files Collapse all files

1
machines/loki/configuration.nix
View file

@ -433,7 +433,6 @@
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
appimage-run appimage-run
incus
tailscale tailscale
]; ];
}; };

1
machines/odin/configuration.nix
View file

@ -71,7 +71,6 @@
openssh.enable = true; openssh.enable = true;
cockpit = { cockpit = {
enable = true; enable = true;
openFirewall = true;
settings = { settings = {
WebService = { WebService = {
Origins = "https://cockpit.datarift.nl"; Origins = "https://cockpit.datarift.nl";

2
modules/podman/default.nix → modules/docker/default.nix
View file

@ -28,7 +28,7 @@ in
dates = "weekly"; dates = "weekly";
}; };
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enable = true;
}; };

6
modules/keycloak/default.nix
View file

@ -5,13 +5,13 @@ let
keywindTheme = pkgs.stdenv.mkDerivation { keywindTheme = pkgs.stdenv.mkDerivation {
pname = "keycloak-theme-keywind"; pname = "keycloak-theme-keywind";
version = "unstable-2023-12-13"; version = "unstable-2023-10-22";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lukin"; owner = "lukin";
repo = "keywind"; repo = "keywind";
rev = "bdf966fdae0071ccd46dab4efdc38458a643b409"; rev = "b1c47673ae091bc1a85a04434f2929ba5b8fa8bf";
hash = "sha256-8N+OQ6Yg9RKxqGd8kgsbvrYuVgol49bo/iJeIJXr3Sg="; hash = "sha256-Y88L7oW127Fex2D33A0tMnaJtSvM7hFZkzuVXZYoBhQ=";
}; };
doConfigure = false; doConfigure = false;

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

@ -2,8 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
}: }:
let let
version = "23.0.3.1703879005"; version = "22.0.1";
jarVersion = "23.0.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit version; inherit version;
@ -12,14 +11,14 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "p2-inc"; owner = "p2-inc";
repo = "phasetwo-containers"; repo = "phasetwo-containers";
rev = "v${version}"; rev = "fac90ab2af4b82b59b8fdf6009606ddebe68a2f6";
hash = "sha256-s+RuihsX2zekFqhVHKQu+0xECoJHJH4K3JQd4CDbPo0="; hash = "sha256-IZQXIZOjm9DDf56Q8ayRvycs65P/eRP82FwGC8n7ZcY=";
}; };
doBuild = false; doBuild = false;
doCheck = false; doCheck = false;
installPhase = '' installPhase = ''
install -D libs/ext/phasetwo-admin-ui-${jarVersion}.jar $out/phasetwo-admin-ui-${jarVersion}.jar install -D libs/ext/phasetwo-admin-ui-${version}.jar $out/phasetwo-admin-ui-${version}.jar
''; '';
} }