mpd minimal & overlay changes
This commit is contained in:
parent
101cfcb144
commit
7e929205d4
30
flake.lock
30
flake.lock
|
@ -67,11 +67,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697410455,
|
"lastModified": 1698670511,
|
||||||
"narHash": "sha256-jCs/ffIP3tUPN7HWWuae4BB8+haAw2NI02z5BQvWMGM=",
|
"narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "78125bc681d12364cb65524eaa887354134053d0",
|
"rev": "8e5416b478e465985eec274bc3a018024435c106",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -117,11 +117,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697459493,
|
"lastModified": 1698222534,
|
||||||
"narHash": "sha256-HH8ePJIVAsiDHIdS4qnKQ9o4X0KTVGA9cfHBplKqpfs=",
|
"narHash": "sha256-iF9C7C7eT8LVVWx5IOZ/8KKJT8AIw9A5aBA6vqS18l8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "b63b328577f1cb5839f8ecc4fd05040335d4a55a",
|
"rev": "a058cff4b09b3a398d8caa379b4dc96cfedd98c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -148,11 +148,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697059129,
|
"lastModified": 1698318101,
|
||||||
"narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
|
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
|
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -164,11 +164,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697456312,
|
"lastModified": 1695644571,
|
||||||
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
|
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
|
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -180,11 +180,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697470606,
|
"lastModified": 1698673581,
|
||||||
"narHash": "sha256-TP3UN5RktQpqDVj5mA6rb1Nu4vGTnctWkbe5sef4LEw=",
|
"narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "cc83a858d3dbf50a934a4f74fe5508ac2fa72bc5",
|
"rev": "9a1a107fc246a416e44e2e965a31d79983614541",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -24,6 +24,35 @@
|
||||||
containerSecrets = config.containers.${containerName}.config.services.secrets.secrets;
|
containerSecrets = config.containers.${containerName}.config.services.secrets.secrets;
|
||||||
pathInContainer = path: "/var/lib/nixos-containers/${containerName}" + path;
|
pathInContainer = path: "/var/lib/nixos-containers/${containerName}" + path;
|
||||||
in {
|
in {
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
mpd =
|
||||||
|
(prev.mpdWithFeatures.override {
|
||||||
|
ffmpeg = final.ffmpeg_6-headless;
|
||||||
|
}) {
|
||||||
|
features = [
|
||||||
|
"audiofile"
|
||||||
|
"flac"
|
||||||
|
"opus"
|
||||||
|
"vorbis"
|
||||||
|
"vorbisenc"
|
||||||
|
"lame"
|
||||||
|
"libsamplerate"
|
||||||
|
"libmpdclient"
|
||||||
|
"id3tag"
|
||||||
|
"expat"
|
||||||
|
"pcre"
|
||||||
|
"yajl"
|
||||||
|
"icu"
|
||||||
|
"sqlite"
|
||||||
|
"systemd"
|
||||||
|
"syslog"
|
||||||
|
"io_uring"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
containers.music = {
|
containers.music = {
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
privateNetwork = true;
|
privateNetwork = true;
|
||||||
|
|
|
@ -1,10 +1,4 @@
|
||||||
{
|
{tree, ...}: {
|
||||||
tree,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib.modules) mkDefault;
|
|
||||||
in {
|
|
||||||
imports = with tree; [
|
imports = with tree; [
|
||||||
users.root
|
users.root
|
||||||
|
|
||||||
|
@ -25,11 +19,6 @@ in {
|
||||||
checkReversePath = "loose";
|
checkReversePath = "loose";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.noXlibs = mkDefault true;
|
|
||||||
documentation.man.enable = mkDefault false;
|
|
||||||
documentation.doc.enable = mkDefault false;
|
|
||||||
fonts.fontconfig.enable = mkDefault false;
|
|
||||||
|
|
||||||
# TODO: Better DNS setup
|
# TODO: Better DNS setup
|
||||||
services.resolved.enable = false;
|
services.resolved.enable = false;
|
||||||
environment.etc."resolv.conf".text = ''
|
environment.etc."resolv.conf".text = ''
|
||||||
|
|
|
@ -30,7 +30,9 @@ in {
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
usePredictableInterfaceNames = true;
|
usePredictableInterfaceNames = true;
|
||||||
|
useDHCP = false;
|
||||||
dhcpcd.enable = false;
|
dhcpcd.enable = false;
|
||||||
|
useNetworkd = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.kernelModules = [
|
boot.initrd.kernelModules = [
|
||||||
|
|
Loading…
Reference in a new issue