diff --git a/home/vscodium.nix b/home/vscodium.nix index a828006..5dea5b8 100644 --- a/home/vscodium.nix +++ b/home/vscodium.nix @@ -2,6 +2,7 @@ { home.packages = with pkgs; [ + buildifier gopls ]; diff --git a/hosts/genesis/adblockUpdate.sh b/hosts/genesis/adblockUpdate.sh new file mode 100644 index 0000000..1f60fa8 --- /dev/null +++ b/hosts/genesis/adblockUpdate.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -ex + + +curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts + +# Custom domains that I need to preserve for some reason +sed -i -e '/segment.com/d' /etc/adblock_hosts # Blocks Trelly content for house investors +sed -i -e '/segment.io/d' /etc/adblock_hosts # Blocks Trelly content for house investors + +systemctl restart dnsmasq diff --git a/hosts/genesis/dnsmasq.nix b/hosts/genesis/dnsmasq.nix index 296a020..e398ce7 100644 --- a/hosts/genesis/dnsmasq.nix +++ b/hosts/genesis/dnsmasq.nix @@ -24,6 +24,8 @@ let ]; lanDevice = "enp1s0"; + + adblockUpdate = pkgs.writeShellScriptBin "adblockUpdate" (builtins.readFile ./adblockUpdate.sh); in { # Enable the service with its own configuration @@ -90,13 +92,16 @@ in }; extraConfig = "${extraConfig}"; }; - environment.systemPackages = [ pkgs.curl ]; + environment.systemPackages = with pkgs; [ + busybox + curl + ]; # Regularly update DNS block list services.cron = { enable = true; systemCronJobs = [ - "* * * * * root ( ${pkgs.curl}/bin/curl -s https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts | sed '1,33d' > /etc/adblock_hosts && systemctl restart dnsmasq ) 2>&1 > /var/log/adblock.log" + "* * * * * root ${adblockUpdate} 2>&1 > /var/log/adblock.log" ]; }; diff --git a/modules-all/default.nix b/modules-all/default.nix index 46b9f93..3871f4c 100644 --- a/modules-all/default.nix +++ b/modules-all/default.nix @@ -60,7 +60,6 @@ hms # My own home manager switcher htop killall - lshw nano pciutils pwgen diff --git a/modules-linux/default.nix b/modules-linux/default.nix index e3b05b8..c314b23 100644 --- a/modules-linux/default.nix +++ b/modules-linux/default.nix @@ -15,6 +15,10 @@ ./tailscale.nix ]; + environment.systemPackages = with pkgs; [ + lshw + ]; + system.stateVersion = "22.05"; nix.gc.dates = "weekly";