mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2025-04-11 09:16:20 +02:00
Compare commits
4 commits
b429b2c811
...
d300cae8ea
Author | SHA1 | Date | |
---|---|---|---|
d300cae8ea | |||
eba8f9c882 | |||
24df9d0008 | |||
638cfd3991 |
7 changed files with 14 additions and 27 deletions
20
flake.lock
generated
20
flake.lock
generated
|
@ -180,11 +180,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711133180,
|
"lastModified": 1711625603,
|
||||||
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
|
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
|
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -296,11 +296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711163522,
|
"lastModified": 1711523803,
|
||||||
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
|
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
|
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -414,11 +414,11 @@
|
||||||
"river": {
|
"river": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711393006,
|
"lastModified": 1711462609,
|
||||||
"narHash": "sha256-vwOJIc2gUUa8MuiEzV/phB2sAl5pWdC6mnivNimmXqk=",
|
"narHash": "sha256-9+bBWOFQYJSvKkEIItRjiWkauId0NqD8wf3Gs1OFjtw=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "4d0315b56596868d5ae39d18fe74d8be5c4ac50d",
|
"rev": "1946f284d590df1ba1261ca9303555e0197abfd8",
|
||||||
"revCount": 1220,
|
"revCount": 1224,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/riverwm/river"
|
"url": "https://github.com/riverwm/river"
|
||||||
|
|
|
@ -64,7 +64,6 @@
|
||||||
, purge
|
, purge
|
||||||
, trucksimulatorbot
|
, trucksimulatorbot
|
||||||
, pfersel
|
, pfersel
|
||||||
, river
|
|
||||||
, ...
|
, ...
|
||||||
}@attrs: {
|
}@attrs: {
|
||||||
packages.x86_64-linux = {
|
packages.x86_64-linux = {
|
||||||
|
|
|
@ -6,7 +6,7 @@ let
|
||||||
$ORIGIN rfive.de.
|
$ORIGIN rfive.de.
|
||||||
|
|
||||||
rfive.de. 86400 IN SOA ns.rfive.de. hostmaster.rfive.de. (
|
rfive.de. 86400 IN SOA ns.rfive.de. hostmaster.rfive.de. (
|
||||||
2024031014 ; serial
|
2024032601 ; serial
|
||||||
10800 ; refresh
|
10800 ; refresh
|
||||||
3600 ; retry
|
3600 ; retry
|
||||||
604800 ; expire
|
604800 ; expire
|
||||||
|
@ -42,8 +42,6 @@ let
|
||||||
rspamd._domainkey TXT "v=DKIM1; k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB"
|
rspamd._domainkey TXT "v=DKIM1; k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB"
|
||||||
_dmarc TXT "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de"
|
_dmarc TXT "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de"
|
||||||
|
|
||||||
_discord TXT "dh=0bcca75b0a56c304f0c23fbdb3f12009411e8c0c"
|
|
||||||
|
|
||||||
cache CNAME nuc.rfive.de.
|
cache CNAME nuc.rfive.de.
|
||||||
chat CNAME nuc.rfive.de.
|
chat CNAME nuc.rfive.de.
|
||||||
matrix CNAME nuc.rfive.de.
|
matrix CNAME nuc.rfive.de.
|
||||||
|
|
|
@ -18,9 +18,6 @@
|
||||||
delaycompress
|
delaycompress
|
||||||
weekly
|
weekly
|
||||||
rotate 156
|
rotate 156
|
||||||
dateext
|
|
||||||
dateformat .%Y-%m-%d
|
|
||||||
extension log
|
|
||||||
}
|
}
|
||||||
"/var/log/nginx/*.log" {
|
"/var/log/nginx/*.log" {
|
||||||
compress
|
compress
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
|
|
|
@ -10,13 +10,6 @@ in
|
||||||
pww = callPackage ../pkgs/pww { };
|
pww = callPackage ../pkgs/pww { };
|
||||||
ianny = callPackage ../pkgs/ianny { };
|
ianny = callPackage ../pkgs/ianny { };
|
||||||
|
|
||||||
fprintd = prev.fprintd.overrideAttrs (_: {
|
|
||||||
mesonCheckFlags = [
|
|
||||||
"--no-suite"
|
|
||||||
"fprintd:TestPamFprintd"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
||||||
imv = prev.imv.override {
|
imv = prev.imv.override {
|
||||||
# freeimage is broken
|
# freeimage is broken
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
F_BOLD="\033[1m"
|
F_BOLD="\033[1m"
|
||||||
C_RED="\033[38;5;9m"
|
C_RED="\033[38;5;9m"
|
||||||
${pkgs.diffutils}/bin/cmp --silent \
|
${pkgs.diffutils}/bin/cmp --silent \
|
||||||
<(readlink /run/current-system/{initrd,kernel,kernel-modules}) \
|
<(readlink /run/current-system/{kernel,kernel-modules}) \
|
||||||
<(readlink $systemConfig/{initrd,kernel,kernel-modules}) \
|
<(readlink $systemConfig/{kernel,kernel-modules}) \
|
||||||
|| echo -e "''${F_BOLD}''${C_RED}Kernel version changed, reboot is advised.''${NO_FORMAT}"
|
|| echo -e "''${F_BOLD}''${C_RED}Kernel version changed, reboot is advised.''${NO_FORMAT}"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue