diff --git a/agenix/hosts/mediaserver/config.nix b/agenix/hosts/mediaserver/config.nix index ea608f8..3799c39 100644 --- a/agenix/hosts/mediaserver/config.nix +++ b/agenix/hosts/mediaserver/config.nix @@ -4,6 +4,10 @@ file = ./user/danielPassword.age; }; + smb-haven-credentials = { + file = ./smb/havenCredentials.age; + }; + acme-credentials = { file = ./acme/credentials.age; owner = "acme"; diff --git a/agenix/hosts/mediaserver/smb/havenCredentials.age b/agenix/hosts/mediaserver/smb/havenCredentials.age new file mode 100644 index 0000000..85bbeb6 --- /dev/null +++ b/agenix/hosts/mediaserver/smb/havenCredentials.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> ssh-ed25519 MtGp6g JyVPhKnCixU8R0aldhBP8eVHzyxcG6Vjv9MOv2xdAGs +PRc+76W57uYZSUguYrOjvjZrsFy56nbgEyoQ1ahihK0 +-> ssh-ed25519 Y94Yig v/9Ai3U8dxd2XP92gTMDHCeMoVTFhd9mrg95hpBjcR4 +8qu58IJSjpDeCoueo5REflCv3jYscmTFg0gJ9w2awJo +-> _@pH\C-grease 2 VY p{rJ^5 +liHUI8M6Us9bJ5yF/hs57TZLArJIsKHZG+4azj4qiC47tCAH5RrbXzANrDk +--- WgjYpyvLq2DF1fG+1MwTV+tGijYBiIiO8XeB1wsumh0 +n/PU +,2S(u!$DXH[!'H{|+]5:4z:,1]E!-uNV=?@`W3u1\A \ No newline at end of file diff --git a/flake.lock b/flake.lock index 23c6dd4..d95689d 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1694461360, - "narHash": "sha256-8pD4sER07KvFjaa+8Uh5zuUrWVmAtT2UocFMktq80SA=", + "lastModified": 1694508116, + "narHash": "sha256-T91VacKLq2m8+UD7FDGBkQapmV3aBftkP4LhZ0HAww8=", "owner": "nix-community", "repo": "disko", - "rev": "fc6f863fe175a0e7e4ca39f44740627815f0da39", + "rev": "7304727801b07c59d343bc0915dc5f0226db146d", "type": "github" }, "original": { diff --git a/hardware/hosts/mediaserver.nix b/hardware/hosts/mediaserver.nix index ae7e725..bde0760 100644 --- a/hardware/hosts/mediaserver.nix +++ b/hardware/hosts/mediaserver.nix @@ -14,7 +14,7 @@ kernelModules = [ "tls" ]; }; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages; kernelModules = [ "kvm-intel" "tcp_bbr" ]; kernel.sysctl = { diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index d1e0f5b..7689ac0 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -19,12 +19,12 @@ in }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2023-09-10"; + version = "2023-09-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "0232372b906f275f76ac42029eba25eaf95e76b9"; - sha256 = "0z7sag0jqskf7qcdnsczxa3y3rjlnx4k0an23p8zmv5dikbgqkx5"; + rev = "4cd4c29e39dd02efd906f98c03d2879237f50956"; + sha256 = "0g3higbx5v20bkn3h6gjxjgjj9yjwnvggmbbzs7k77i39993hgs5"; fetchSubmodules = false; }; }; @@ -246,8 +246,8 @@ in src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5efcd06dc9c45c1654d3f84655fd4ee2f5328f3b"; - sha256 = "1l00vf1pyb1942ycb0wv4jy9qkpjbrn48hwsr89g1p3zzw063zgq"; + rev = "360a895125ac4f39df6aa8f763635eff07e69fff"; + sha256 = "0sy9w8bl46i9krikxkbnsryrnnccji2hrw29k3ccihnn8nrxwvsl"; fetchSubmodules = false; }; }; diff --git a/secret/container/additional-media/default.nix b/secret/container/additional-media/default.nix index e750e9a..4e509db 100644 Binary files a/secret/container/additional-media/default.nix and b/secret/container/additional-media/default.nix differ diff --git a/secrets.nix b/secrets.nix index 0735791..ec8eb73 100644 --- a/secrets.nix +++ b/secrets.nix @@ -64,6 +64,8 @@ in # mediaserver "agenix/hosts/mediaserver/user/danielPassword.age".publicKeys = mediaserver; + "agenix/hosts/mediaserver/smb/havenCredentials.age".publicKeys = mediaserver; + "agenix/hosts/mediaserver/acme/credentials.age".publicKeys = mediaserver; "agenix/hosts/mediaserver/tailscale/authkey.age".publicKeys = mediaserver; diff --git a/system/nixos/mediaserver-setup.nix b/system/nixos/mediaserver-setup.nix index df5f787..1bb9517 100644 --- a/system/nixos/mediaserver-setup.nix +++ b/system/nixos/mediaserver-setup.nix @@ -16,7 +16,7 @@ }; boot.supportedFilesystems = [ "nfs" ]; - environment.systemPackages = [ pkgs.nfs-utils ]; + environment.systemPackages = with pkgs; [ cifs-utils nfs-utils ]; services.rpcbind.enable = true; systemd = {