diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop.nix | 9 | ||||
| -rw-r--r-- | modules/vpn.nix | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/desktop.nix b/modules/desktop.nix index d0d3314..c3bf548 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -25,9 +25,12 @@ in { nixpkgs.overlays = [ (final: prev: { - xmonad = prev.xmonad.overrideAttrs (o: o // { - buildInputs = o.buildInputs + [ pkgs.xlibs.libXft ]; - }); + xmonad = (prev.xmonad-with-packages.override { + packages = self: [ self.xmonad-contrib self.xmonad-extras ]; + }); + #.overrideAttrs (oldAttrs: rec { + # buildInputs = oldAttrs.buildInputs + [ pkgs.xlibs.libXft ]; + #}); }) ]; diff --git a/modules/vpn.nix b/modules/vpn.nix index 5f8d932..0b532de 100644 --- a/modules/vpn.nix +++ b/modules/vpn.nix @@ -7,7 +7,7 @@ let mkConfig = host: ip: { ips = [ "${vpn-prefix}::${ip}/128" ]; - publicKey = (builtins.readFile ../secrets/${host}-wireguard-key.pub); + publicKey = (builtins.readFile (../secrets + "/${host}-wireguard-key.pub")); endpoint = null; router = false; }; |