changes to mercury

2 files changed, 37 insertions, 29 deletions

diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 48b1627..338ec7f 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,29 +1,8 @@
-{config, ...}: {
+{
   collinux = {
     theme = "catppuccin";
     user.name = "collin";
 
-    secrets = {
-      "wg-key" = {
-        file = ./mercury-wg-key.age;
-        owner = "systemd-network";
-      };
-    };
-
-    wireguard = {
-      enable = true;
-      ip = "100.100.0.5";
-      gateway = "100.100.0.1";
-      privateKeyFile = config.collinux.secrets."wg-key".path;
-      peers = {
-        "ganymede" = {
-          publicKey = "WNLf8M6JGSHeRVvbAF6E/6oxAHeNxv6bXqqlmwMdvlk=";
-          ip = "100.100.0.0/24";
-          endpoint = "williamsfam.us.com:51820";
-        };
-      };
-    };
-
     desktop = {
       wallpaper = ./wallpapers/abstract-swirls.jpg;
       gtk.enable = true;
@@ -53,13 +32,13 @@
       audio.enable = true;
       networking = {
         enable = true;
+
         iwd.enable = true;
-        # tailscale.enable = true;
-      };
-      bluetooth = {
-        enable = true;
-        bluetuith.enable = true;
+        networkd = {
+          enable = true;
+        };
       };
+      bluetooth.enable = true;
     };
 
     terminal = {
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 1db654f..e203477 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   packages = with pkgs; [
     # GUI apps
     tor-browser # don't ask
@@ -6,10 +10,35 @@
     kdePackages.kleopatra
     mpv
     musescore
+    anki
+
+    bluetuith
 
     kew # music player
-    prismlauncher
+
+    (prismlauncher.override {
+      jdks = [pkgs.jdk17_headless];
+    })
 
     vital
+
+    captive-browser # https://words.filippo.io/captive-browser
+
+    inputs.glide-browser.packages."x86_64-linux".default
   ];
+
+  files.".config/captive-browser.toml".text = ''
+    browser = """
+      ${pkgs.ungoogled-chromium}/bin/chromium \
+        --proxy-server="socks5://$PROXY" \
+        --no-default-browser-check \
+        --no-first-run \
+        --no-managed-user-acknowledgment-check \
+        --app=http://neverssl.com
+    """
+
+    dhcp-dns = "echo 10.0.5.82"
+
+    socks5-addr = "localhost:1666"
+  '';
 }