diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix index 28e33959..026ace80 100644 --- a/hosts/midas/services/default.nix +++ b/hosts/midas/services/default.nix @@ -1,6 +1,7 @@ { ... }: { services = { + blocky.enable = true; cloudflare-dyndns.enable = true; forgejo.enable = true; icecast.enable = true; diff --git a/hosts/qemu/boot/default.nix b/hosts/qemu/boot/default.nix index 1282ad5c..9ff2e3b3 100644 --- a/hosts/qemu/boot/default.nix +++ b/hosts/qemu/boot/default.nix @@ -2,9 +2,6 @@ { boot = { kernelPackages = pkgs.linuxPackages_latest; - loader.grub = { - enable = true; - device = lib.mkForce "/dev/vda"; - }; + loader.grub.enable = true; }; } diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix index 3e3e468c..649f97d1 100644 --- a/modules/home/programs/gui/librewolf/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -52,68 +52,59 @@ "NixPKGs" "MyNixOS" "YouTube" + "Spotify" ]; engines = { "Ecosia" = { - urls = [ - { - template = "https://www.ecosia.org/search"; - params = [ - { - name = "q"; - value = "{searchTerms}"; - } - ]; - } - ]; + urls = [{ + template = "https://www.ecosia.org/search"; + params = [{ + name = "q"; + value = "{searchTerms}"; + }]; + }]; definedAliases = [ "@e" ]; }; "NixPKGs" = { - urls = [ - { - template = "https://search.nixos.org/packages"; - params = [ - { - name = "type"; - value = "packages"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - definedAliases = [ "@p" ]; + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { + name = "type"; + value = "packages"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + }]; + definedAliases = [ "@pkgs" ]; }; "MyNixOS" = { - urls = [ - { - template = "https://mynixos.com/search"; - params = [ - { - name = "q"; - value = "{searchTerms}"; - } - ]; - } - ]; + urls = [{ + template = "https://mynixos.com/search"; + params = [{ + name = "q"; + value = "{searchTerms}"; + }]; + }]; definedAliases = [ "@my" ]; }; "YouTube" = { - urls = [ - { - template = "https://www.youtube.com/results"; - params = [ - { - name = "search_query"; - value = "{searchTerms}"; - } - ]; - } - ]; + urls = [{ + template = "https://www.youtube.com/results"; + params = [{ + name = "search_query"; + value = "{searchTerms}"; + }]; + }]; definedAliases = [ "@y" ]; }; + "Spotify" = { + urls = [{ template = "https://open.spotify.com/search/{searchTerms}"; }]; + definedAliases = [ "@s" ]; + }; }; }; commonBookmarks = [ @@ -192,7 +183,6 @@ "privacy.resistFingerprinting" = true; "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true; "privacy.fingerprintingProtection" = true; - "privacy.donottrackheader.enabled" = true; "privacy.globalprivacycontrol.enabled" = true; "privacy.globalprivacycontrol.functionality.enabled" = true; "privacy.clearOnShutdown.cookies" = false; @@ -256,6 +246,7 @@ }; }; }; + # Symlinks to Librewolf home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox"; }; diff --git a/modules/system/devices/boot/grub/default.nix b/modules/system/devices/boot/grub/default.nix index d0a24689..bdbb9e69 100644 --- a/modules/system/devices/boot/grub/default.nix +++ b/modules/system/devices/boot/grub/default.nix @@ -3,6 +3,5 @@ boot.loader.grub = { efiSupport = true; efiInstallAsRemovable = true; - device = "nodev"; }; } diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix index b2157f42..97adc5ea 100644 --- a/modules/system/devices/networking/default.nix +++ b/modules/system/devices/networking/default.nix @@ -8,10 +8,10 @@ nftables.enable = true; firewall.allowPing = false; nameservers = [ - "9.9.9.11#dns11.quad9.net" - "149.112.112.11#dns11.quad9.net" "2620:fe::11#dns11.quad9.net" "2620:fe::fe:11#dns11.quad9.net" + "9.9.9.11#dns11.quad9.net" + "149.112.112.11#dns11.quad9.net" ]; }; diff --git a/modules/system/services/server/blocky/default.nix b/modules/system/services/server/blocky/default.nix new file mode 100644 index 00000000..cdbe0992 --- /dev/null +++ b/modules/system/services/server/blocky/default.nix @@ -0,0 +1,29 @@ +{ config, ... }: +{ + services.blocky = { + settings = { + upstreams.groups.default = [ + "2606:4700:4700::1111" + "2606:4700:4700::1001" + "1.1.1.1" + "1.0.0.1" + ]; + + blocking = { + clientGroupsBlock.default = [ + "pro" + "tif" + ]; + denylists = { + "pro" = [ "https://codeberg.org/hagezi/mirror2/raw/branch/main/dns-blocklists/wildcard/pro.txt" ]; + "tif" = [ "https://codeberg.org/hagezi/mirror2/raw/branch/main/dns-blocklists/wildcard/tif.txt" ]; + }; + }; + + caching = { + prefetching = true; + minTime = "1m"; + }; + }; + }; +} diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix index 052102d8..f55ecc5a 100644 --- a/modules/system/services/server/default.nix +++ b/modules/system/services/server/default.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ + ./blocky ./cfdyndns ./forgejo ./icecast