Compare commits

...

8 commits

Author SHA1 Message Date
649f8b570f
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/51994df8ba24d5db5459ccf17b6494643301ad28?narHash=sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP%2BaXWgwm70o%3D' (2024-09-20)
  → 'github:nix-community/disko/c61e50b63ad50dda5797b1593ad7771be496efbb?narHash=sha256-Ef7UgoTdOB4PGQKSkHGu6SOxnTiArPHGcRf8qGFC39o%3D' (2024-09-24)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/2c5171a36fcd616753b204c34ef38bf7729825e2?narHash=sha256-UO0TQbj8UFI4tioDTjmui0UqTL8CZkwizolvxqJLGu0%3D' (2024-09-22)
  → 'github:nix-community/emacs-overlay/b3512b3df5396e17d9e89cadcc3f57db0ea1fecc?narHash=sha256-uaugOQen4xK3vxect3xZyq3CsNOHcV5nMHS4yteIHFA%3D' (2024-09-24)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/944b2aea7f0a2d7c79f72468106bc5510cbf5101?narHash=sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM%3D' (2024-09-20)
  → 'github:NixOS/nixpkgs/23cbb250f3bf4f516a2d0bf03c51a30900848075?narHash=sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0%2BesxqizGc%3D' (2024-09-22)
• Updated input 'home-manager':
    'github:nix-community/home-manager/04213d1ce4221f5d9b40bcee30706ce9a91d148d?narHash=sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu%2BYgGvZ84o%3D' (2024-09-22)
  → 'github:nix-community/home-manager/21c021862fa696c8199934e2153214ab57150cb6?narHash=sha256-EYLvFRoTPWtD%2B3uDg2wwQvlz88OrIr3zld%2BjFE5gDcY%3D' (2024-09-23)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/b493dfd4a8cf9552932179e56ff3b5819a9b8381?narHash=sha256-xyNtG5C%2BxvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI%3D' (2024-09-21)
  → 'github:NixOS/nixos-hardware/d0cb432a9d28218df11cbd77d984a2a46caeb5ac?narHash=sha256-19FNN5QT9Z11ZUMfftRplyNN%2B2PgcHKb3oq8KMW/hDA%3D' (2024-09-22)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e?narHash=sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK%2BWk%3D' (2024-09-19)
  → 'github:nixos/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6?narHash=sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c%3D' (2024-09-21)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/36d73192555e569d27579f6c486fea3ab768823c?narHash=sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg%2BdAX4HectPOOf0%3D' (2024-09-22)
  → 'github:oxalica/rust-overlay/2e19799819104b46019d339e78d21c14372d3666?narHash=sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM%2BBDEfRdr%2BuLc%3D' (2024-09-24)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/ee41a466c2255a3abe6bc50fc6be927cdee57a9f?narHash=sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4%2BN3L2w%3D' (2024-09-19)
  → 'github:numtide/treefmt-nix/35dfece10c642eb52928a48bee7ac06a59f93e9a?narHash=sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh%2B%2BIkZs%3D' (2024-09-23)
2024-09-24 18:16:33 +02:00
635429ce9b
odin: Run sysstat every minute 2024-09-24 15:07:40 +02:00
346d369507
fish: Enable carapace with HM module 2024-09-23 13:50:41 +02:00
dd44a13c0f
odin: Enable sysstat 2024-09-23 13:42:50 +02:00
6c529fa47b
keycloak: Update plugins 2024-09-23 13:39:40 +02:00
d6b92157f2
river: Export XDG_CURRENT_DESKTOP from config 2024-09-22 16:25:59 +02:00
af881e25a1
frigate: Update to 0.14.1 2024-09-22 16:24:40 +02:00
5023b2264d
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/d32d1504c77d7f6ba7e033357dcf638baceab9b7?narHash=sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY%3D' (2024-09-17)
  → 'github:nix-community/disko/51994df8ba24d5db5459ccf17b6494643301ad28?narHash=sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP%2BaXWgwm70o%3D' (2024-09-20)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/e303aa1dc000c07ee38a865bccb6e216fb5c1018?narHash=sha256-c7FAyWe5XB4J78Ee0QFuCPs0MIowJMDG1FkTqVnw6gs%3D' (2024-09-18)
  → 'github:nix-community/emacs-overlay/2c5171a36fcd616753b204c34ef38bf7729825e2?narHash=sha256-UO0TQbj8UFI4tioDTjmui0UqTL8CZkwizolvxqJLGu0%3D' (2024-09-22)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/086b448a5d54fd117f4dc2dee55c9f0ff461bdc1?narHash=sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ%3D' (2024-09-16)
  → 'github:NixOS/nixpkgs/944b2aea7f0a2d7c79f72468106bc5510cbf5101?narHash=sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM%3D' (2024-09-20)
• Updated input 'home-manager':
    'github:nix-community/home-manager/d2493de5cd1da06b6a4c3e97f4e7d5dd791df457?narHash=sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w%3D' (2024-09-17)
  → 'github:nix-community/home-manager/04213d1ce4221f5d9b40bcee30706ce9a91d148d?narHash=sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu%2BYgGvZ84o%3D' (2024-09-22)
• Updated input 'nixos-facter-modules':
    'github:numtide/nixos-facter-modules/cc817a8491bbb6eea30533e0c6f89d101a52b72e?narHash=sha256-A8w2L9vRCKnj2UAmfSYewiD%2ByNgEhbEY6ITVgj8DIHs%3D' (2024-09-18)
  → 'github:numtide/nixos-facter-modules/6eb13404bbe40b9a5ef9984792b27933658571fa?narHash=sha256-U2rPYu3iDI3GN1H6MN3NoCuVrAJlBJ9nNWRQY8Cs32Y%3D' (2024-09-20)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/10d5e0ecc32984c1bf1a9a46586be3451c42fd94?narHash=sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8%3D' (2024-09-19)
  → 'github:NixOS/nixos-hardware/b493dfd4a8cf9552932179e56ff3b5819a9b8381?narHash=sha256-xyNtG5C%2BxvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI%3D' (2024-09-21)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172?narHash=sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c%3D' (2024-09-16)
  → 'github:nixos/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e?narHash=sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK%2BWk%3D' (2024-09-19)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/7570de7b9b504cfe92025dd1be797bf546f66528?narHash=sha256-tyMUA6NgJSvvQuzB7A1Sf8%2B0XCHyfSPRx/b00o6K0uo%3D' (2024-09-05)
  → 'github:cachix/git-hooks.nix/4e743a6920eab45e8ba0fbe49dc459f1423a4b74?narHash=sha256-D5AegvGoEjt4rkKedmxlSEmC%2BnNLMBPWFxvmYnVLhjk%3D' (2024-09-19)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/6283b1d6ca31fa320ecee82806123e773b2ff993?narHash=sha256-Ob7DNyHKtOQpWetmNj/V%2BOgMkGXh6Ep1dNa6AN/4sSI%3D' (2024-09-19)
  → 'github:oxalica/rust-overlay/36d73192555e569d27579f6c486fea3ab768823c?narHash=sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg%2BdAX4HectPOOf0%3D' (2024-09-22)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/829338a3df3dfd492c61abbd090ec1405329c943?narHash=sha256-byl6ywTyQTUGiuwvBsDtQwUioQ5Kklxirj6YdiWTLdY%3D' (2024-09-19)
  → 'github:numtide/treefmt-nix/ee41a466c2255a3abe6bc50fc6be927cdee57a9f?narHash=sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4%2BN3L2w%3D' (2024-09-19)
2024-09-22 16:10:57 +02:00
8 changed files with 49 additions and 42 deletions

View file

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

View file

@ -48,7 +48,6 @@ 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
''; '';
}; };
@ -68,6 +67,8 @@ 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;

View file

@ -216,6 +216,7 @@ 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 &
''; '';
}; };
@ -223,9 +224,5 @@ 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";
};
}; };
} }

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.0"; image = "ghcr.io/blakeblackshear/frigate:0.14.1";
ports = [ ports = [
"1984:1984" # go2rtc "1984:1984" # go2rtc
"5000:5000" # Unauthenticated Frigate endpoint "5000:5000" # Unauthenticated Frigate endpoint

View file

@ -140,7 +140,16 @@
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";
} }

View file

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak"; owner = "keycloak";
repo = "keycloak"; repo = "keycloak";
rev = version; rev = version;
hash = "sha256-Tm7ZmbcKnj3KunJNiUzhkYa0M0G0Lh23/yhqDibcw8M="; hash = "sha256-OuqECd4Mru6P4WDHf+79C3wSL7H6GvDMZoX70Zim1FI=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-U2deqVLSy4r66jM83zP9Rt65oXDu0pixTdpQYLwLZio="; mvnHash = "sha256-uFqCrPTuXZJTZ3cIBqJPKbf0nkWvdtdTeVV8lMYW1xs=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

View file

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

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let let
version = "25.0.4.1724354480"; version = "25.0.6.1726826200";
jarVersion = "25.0.2"; jarVersion = "25.0.4";
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-BuQdJKl8Hglku7JnvXbWjP68m2wRstRyFx3IDyDPjNs="; hash = "sha256-QbfZsUUsspWIOOpw508pqlXzUO1QR8t8PcDc7mdFqec=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };