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

Compare commits

base: erwin:649f8b570fa19b725f666f2f2bf4b501469040ce
Branches Tags
erwin:main
..
compare: erwin:00765568bb9beb73efecf0f7a1282a2edbe70322
Branches Tags
erwin:main

No commits in common. "649f8b570fa19b725f666f2f2bf4b501469040ce" and "00765568bb9beb73efecf0f7a1282a2edbe70322" have entirely different histories.
649f8b570f ... 00765568bb

8 changed files with 42 additions and 49 deletions
Show stats Expand all files Collapse all files

60
flake.lock
View file

@ -193,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727156717, "lastModified": 1726590912,
"narHash": "sha256-Ef7UgoTdOB4PGQKSkHGu6SOxnTiArPHGcRf8qGFC39o=", "narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "c61e50b63ad50dda5797b1593ad7771be496efbb", "rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1727140563, "lastModified": 1726679581,
"narHash": "sha256-uaugOQen4xK3vxect3xZyq3CsNOHcV5nMHS4yteIHFA=", "narHash": "sha256-c7FAyWe5XB4J78Ee0QFuCPs0MIowJMDG1FkTqVnw6gs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "b3512b3df5396e17d9e89cadcc3f57db0ea1fecc", "rev": "e303aa1dc000c07ee38a865bccb6e216fb5c1018",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,11 +551,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727111745, "lastModified": 1726611255,
"narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "21c021862fa696c8199934e2153214ab57150cb6", "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +658,11 @@
}, },
"nixos-facter-modules": { "nixos-facter-modules": {
"locked": { "locked": {
"lastModified": 1726827416, "lastModified": 1726644499,
"narHash": "sha256-U2rPYu3iDI3GN1H6MN3NoCuVrAJlBJ9nNWRQY8Cs32Y=", "narHash": "sha256-A8w2L9vRCKnj2UAmfSYewiD+yNgEhbEY6ITVgj8DIHs=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"rev": "6eb13404bbe40b9a5ef9984792b27933658571fa", "rev": "cc817a8491bbb6eea30533e0c6f89d101a52b72e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -673,11 +673,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1727040444, "lastModified": 1726724509,
"narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -732,11 +732,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1726969270, "lastModified": 1726447378,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -780,11 +780,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726937504, "lastModified": 1726463316,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,11 +832,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1726745158, "lastModified": 1725513492,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,11 +880,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727144949, "lastModified": 1726712837,
"narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=", "narHash": "sha256-Ob7DNyHKtOQpWetmNj/V+OgMkGXh6Ep1dNa6AN/4sSI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2e19799819104b46019d339e78d21c14372d3666", "rev": "6283b1d6ca31fa320ecee82806123e773b2ff993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -998,11 +998,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727098951, "lastModified": 1726705685,
"narHash": "sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh++IkZs=", "narHash": "sha256-byl6ywTyQTUGiuwvBsDtQwUioQ5Kklxirj6YdiWTLdY=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "35dfece10c642eb52928a48bee7ac06a59f93e9a", "rev": "829338a3df3dfd492c61abbd090ec1405329c943",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
home-manager/modules/fish/default.nix
View file

@ -48,6 +48,7 @@ in
}; };
interactiveShellInit = '' interactiveShellInit = ''
set -Ux CARAPACE_BRIDGES 'zsh,fish,bash,inshellisense' set -Ux CARAPACE_BRIDGES 'zsh,fish,bash,inshellisense'
${pkgs.carapace}/bin/carapace _carapace | source
''; '';
}; };
@ -67,8 +68,6 @@ in
fileWidgetCommand = "${pkgs.fd}/bin/fd -type f"; fileWidgetCommand = "${pkgs.fd}/bin/fd -type f";
}; };
carapace.enable = true;
direnv = { direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;

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

@ -216,7 +216,6 @@ in
}; };
extraConfig = '' extraConfig = ''
export XDG_CURRENT_DESKTOP=river
${pkgs.river-filtile}/bin/filtile -view-padding 5 -outer-padding 5 & ${pkgs.river-filtile}/bin/filtile -view-padding 5 -outer-padding 5 &
''; '';
}; };
@ -224,5 +223,9 @@ in
xdg.configFile."xkb/symbols/us" = { xdg.configFile."xkb/symbols/us" = {
source = ./keyboard-layout.xkb; source = ./keyboard-layout.xkb;
}; };
home.sessionVariables = {
XDG_CURRENT_DESKTOP = "river";
};
}; };
} }

2
machines/frigate/frigate/default.nix
View file

@ -3,7 +3,7 @@
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
frigate = { frigate = {
autoStart = true; autoStart = true;
image = "ghcr.io/blakeblackshear/frigate:0.14.1"; image = "ghcr.io/blakeblackshear/frigate:0.14.0";
ports = [ ports = [
"1984:1984" # go2rtc "1984:1984" # go2rtc
"5000:5000" # Unauthenticated Frigate endpoint "5000:5000" # Unauthenticated Frigate endpoint

9
machines/odin/configuration.nix
View file

@ -140,16 +140,7 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
}; };
sysstat = {
enable = true;
collect-frequency = "*:*:0";
};
}; };
environment.systemPackages = with pkgs; [
sysstat
];
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }

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;
hash = "sha256-OuqECd4Mru6P4WDHf+79C3wSL7H6GvDMZoX70Zim1FI="; hash = "sha256-Tm7ZmbcKnj3KunJNiUzhkYa0M0G0Lh23/yhqDibcw8M=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-uFqCrPTuXZJTZ3cIBqJPKbf0nkWvdtdTeVV8lMYW1xs="; mvnHash = "sha256-U2deqVLSy4r66jM83zP9Rt65oXDu0pixTdpQYLwLZio=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

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

@ -16,7 +16,7 @@ buildMavenPackage {
doCheck = false; doCheck = false;
mvnHash = "sha256-bx+yn1H9SPvAkA9JC3mED/R/QB5bCDB4NJ02BDI14DA="; mvnHash = "sha256-7mxdo60ofvoAPUiG/tNMH198DYD3Tn0jn6pVI4m9jQo=";
# 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";

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let let
version = "25.0.6.1726826200"; version = "25.0.4.1724354480";
jarVersion = "25.0.4"; jarVersion = "25.0.2";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit version; inherit version;
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "p2-inc"; owner = "p2-inc";
repo = "phasetwo-containers"; repo = "phasetwo-containers";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-QbfZsUUsspWIOOpw508pqlXzUO1QR8t8PcDc7mdFqec="; hash = "sha256-BuQdJKl8Hglku7JnvXbWjP68m2wRstRyFx3IDyDPjNs=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };