winston/infra
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat: nixos-23.05 -> nixos-23.11

Browse source
This commit is contained in:
winston 2023-11-27 10:06:46 +01:00
parent e2f5525b8d
commit 77183e5a22
Signed by: winston
GPG key ID: 3786770EDBC2B481
4 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/users.nix
View file

@ -10,7 +10,7 @@
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILm0O46zW/XfVOSwz0okRWYeOAg+wCVkCtCAoVTpZsOh" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILm0O46zW/XfVOSwz0okRWYeOAg+wCVkCtCAoVTpZsOh"
]; ];
passwordFile = config.age.secrets."system/password-root".path; hashedPasswordFile = config.age.secrets."system/password-root".path;
shell = pkgs.bashInteractive; shell = pkgs.bashInteractive;
}; };
} }

38
flake.lock
View file

@ -43,11 +43,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1696343447, "lastModified": 1698882062,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,16 +117,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697226376, "lastModified": 1700924682,
"narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=", "narHash": "sha256-7vP/KtJdKSWnghtPVDoE7MD+rCY3gFj68NwOMNdrGbs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5", "rev": "21af6ad5395bce8fab79a6bdc8dd2c33e4673650",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -134,11 +134,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1696019113, "lastModified": 1698611440,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,11 +151,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1697456312, "lastModified": 1700794826,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696846637, "lastModified": 1700922917,
"narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,11 +246,11 @@
"steam-fetcher": "steam-fetcher" "steam-fetcher": "steam-fetcher"
}, },
"locked": { "locked": {
"lastModified": 1697639081, "lastModified": 1701071147,
"narHash": "sha256-zP8zSFmbfEsyjMuGoh0RxQpfUkzshL7nUUyUDhgngG4=", "narHash": "sha256-S55bvjq2AxfSHJHmHjOqF2aGJdwHlRaBU1LwFsQxXn0=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "valheim-server-flake", "repo": "valheim-server-flake",
"rev": "c1e8751c7b15f49a5b5edde70b38c425adfb6ad6", "rev": "bad828758084c64f9eb528c3e2cb99b083c2e9c7",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -19,8 +19,7 @@
{ {
_module.args.nixinate = { _module.args.nixinate = {
host = "main-node"; host = "main-node";
buildOn = "remote"; buildOn = "local";
hermetic = false;
}; };
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
@ -72,7 +71,7 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
agenix = { agenix = {

6
modules/wakapi.nix
View file

@ -18,7 +18,7 @@
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
script = '' script = ''
exec ${lib.getExe pkgs.wakapi} -config ${settingsFile} exec ${pkgs.wakapi}/bin/wakapi -config ${settingsFile}
''; '';
serviceConfig = { serviceConfig = {
@ -65,9 +65,7 @@
ensureDatabases = lib.singleton cfg.settings.db.name; ensureDatabases = lib.singleton cfg.settings.db.name;
ensureUsers = lib.singleton { ensureUsers = lib.singleton {
name = cfg.settings.db.user; name = cfg.settings.db.user;
ensurePermissions = { ensureDBOwnership = true;
"DATABASE ${cfg.settings.db.name}" = "ALL PRIVILEGES";
};
}; };
authentication = '' authentication = ''
host ${cfg.settings.db.name} ${cfg.settings.db.user} 127.0.0.1/32 trust host ${cfg.settings.db.name} ${cfg.settings.db.user} 127.0.0.1/32 trust