diff --git a/machines/common/linux/boot.nix b/machines/common/linux/boot.nix index 40d01d4..c316aa1 100644 --- a/machines/common/linux/boot.nix +++ b/machines/common/linux/boot.nix @@ -4,6 +4,8 @@ loader.systemd-boot.enable = true; initrd.systemd.enable = true; + supportedFilesystems = ["ntfs"]; + plymouth = { enable = true; theme = "catppuccin-mocha"; diff --git a/machines/common/linux/network.nix b/machines/common/linux/network.nix index 0404a7b..1544db6 100644 --- a/machines/common/linux/network.nix +++ b/machines/common/linux/network.nix @@ -26,29 +26,12 @@ listen_addresses = ["127.0.0.1@53000" "0::1@53000"]; upstream_recursive_servers = [ { - address_data = "194.242.2.3"; + address_data = "146.255.56.98"; tls_port = 853; - tls_auth_name = "adblock.doh.mullvad.net"; - } - { - address_data = "2a07:e340::3"; - tls_port = 853; - tls_auth_name = "adblock.doh.mullvad.net"; + tls_auth_name = "dot1.applied-privacy.net"; } ]; }; }; }; - networking.stevenblack = { - enable = true; - block = ["fakenews" "gambling"]; - }; - networking.hostFiles = [ - "${pkgs.runCommand "stevenblack-hosts-custom" {} '' - mkdir -p $out - grep -zoiP "#\s?(facebook|instagram|reddit|twitter|tiktok|whatsapp)\n[\d.\w\s-]*" \ - ${pkgs.stevenblack-blocklist}/alternates/social/hosts \ - > $out/hosts - ''}/hosts" - ]; } diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix index 92a12ce..45dd0d0 100644 --- a/machines/futomaki/default.nix +++ b/machines/futomaki/default.nix @@ -15,6 +15,7 @@ i18n.defaultLocale = "en_US.UTF-8"; services = { + flatpak.enable = true; openssh.enable = true; pcscd.enable = true; transmission.enable = true; @@ -32,7 +33,7 @@ mangohud nur.repos.nekowinston.discover-overlay virt-manager - wineWowPackages.waylandFull + wineWowPackages.staging winetricks ];