changes to mercury

5 files changed, 69 insertions, 37 deletions

diff --git a/flake.lock b/flake.lock
index 581d824..cdb263c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -188,6 +188,26 @@
         "type": "github"
       }
     },
+    "glide-browser": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768858368,
+        "narHash": "sha256-EqqShMa+LXRymE8Vc3or5lHU2ftYTSEgixYtqwRpr0M=",
+        "owner": "glide-browser",
+        "repo": "glide.nix",
+        "rev": "93646ce641920fa1ed4917cc9dbfa56f15e90a06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "glide-browser",
+        "repo": "glide.nix",
+        "type": "github"
+      }
+    },
     "hjem": {
       "inputs": {
         "nix-darwin": "nix-darwin",
@@ -366,6 +386,7 @@
         "deploy-rs": "deploy-rs",
         "disko": "disko",
         "firefox-csshacks": "firefox-csshacks",
+        "glide-browser": "glide-browser",
         "hjem": "hjem",
         "lanzaboote": "lanzaboote",
         "nixos-facter-modules": "nixos-facter-modules",
diff --git a/flake.nix b/flake.nix
index 742cf5c..bffbcd5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    glide-browser = {
+      url = "github:glide-browser/glide.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     tmux-tsunami = {
       url = "github:bluedragon1221/tmux-tsunami";
       inputs.nixpkgs.follows = "nixpkgs";
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"
+  '';
 }
diff --git a/modules/wireguard/nixos/default.nix b/modules/wireguard/nixos/default.nix
index 706048e..9f05e43 100644
--- a/modules/wireguard/nixos/default.nix
+++ b/modules/wireguard/nixos/default.nix
@@ -6,6 +6,8 @@
   cfg = config.collinux.wireguard;
 in
   lib.mkIf cfg.enable {
+    networking.firewall.checkReversePath = "loose";
+
     networking.useNetworkd = true;
     systemd.network = {
       enable = true;
@@ -24,16 +26,14 @@ in
         wireguardPeers =
           cfg.peers
           |> builtins.mapAttrs (_: m:
-            if (m == null)
-            then {
+            {
               PublicKey = m.publicKey;
               AllowedIPs = [m.ip];
+              PersistentKeepalive = 25;
             }
-            else {
-              PublicKey = m.publicKey;
-              AllowedIPs = [m.ip];
+            // (lib.optionalAttrs (m.endpoint != null) {
               Endpoint = m.endpoint;
-            })
+            }))
           |> builtins.attrValues;
       };
 
@@ -44,8 +44,6 @@ in
           Address = cfg.ip;
           DHCP = "no";
           Gateway = cfg.gateway;
-
-          IPv6AcceptRA = false;
         };
       };
     };