From 3431a4b4dfbfdcdc83610126a5dc495bebc92b7e Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Thu, 14 Nov 2024 20:47:03 +0100 Subject: add update-systemd-resolved --- config/shared.nix | 25 +++++++++++++------------ flake.lock | Bin 16678 -> 19876 bytes flake.nix | 9 +++++++-- hosts/work.nix | 4 ++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/config/shared.nix b/config/shared.nix index 4cf0cfb..ec314cb 100644 --- a/config/shared.nix +++ b/config/shared.nix @@ -20,19 +20,20 @@ trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; }; - programs.steam.enable = true; - programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - programs.hyprland = { - enable = true; - xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + programs = { + steam.enable = true; + mtr.enable = true; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + hyprland = { + enable = true; + xwayland.enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + }; }; - services.pipewire = { enable = true; alsa.enable = true; diff --git a/flake.lock b/flake.lock index 4a66b9d..eb3e5fe 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index 8c4742b..fe9eee0 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,11 @@ hyprland.url = "github:hyprwm/Hyprland"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; agenix.url = "github:ryantm/agenix"; + update-systemd-resolved.url = "github:jonathanio/update-systemd-resolved"; + update-systemd-resolved.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, utils, home-manager, helix, hyprland, agenix, ... }@inputs: + outputs = { self, nixpkgs, utils, home-manager, helix, hyprland, agenix, update-systemd-resolved, ... }@inputs: utils.lib.mkFlake { inherit self inputs; @@ -25,7 +27,10 @@ ./config/agenix.nix ]; - hosts.work.modules = [./hosts/work.nix]; + hosts.work.modules = [ + update-systemd-resolved.nixosModules.update-systemd-resolved + ./hosts/work.nix + ]; hosts.tarrel.modules = [./hosts/tarrel.nix]; }; } diff --git a/hosts/work.nix b/hosts/work.nix index f26c99b..3893f35 100644 --- a/hosts/work.nix +++ b/hosts/work.nix @@ -37,6 +37,10 @@ LC_TIME = "nl_NL.UTF-8"; }; + programs = { + update-systemd-resolved.servers.ghostnet.includeAutomatically = true; + }; + services = { openssh.enable = true; openvpn.servers = { -- cgit v1.2.3