random stuff

5 files changed, 36 insertions, 26 deletions

diff --git a/hosts.toml b/hosts.toml
index eca9ce4..3b764a9 100644
--- a/hosts.toml
+++ b/hosts.toml
@@ -32,7 +32,3 @@ user_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINKwMBLWWxpf4jZN3R3iQ7XEAOMq0
 
 wg_pubkey = "CWsD6IJYAbbAX756zb5TlChjEJEm0Q3KpeakfuaZIyA="
 wg_ip = "10.100.0.24"
-
-[hosts.io]
-hostnames = ["io", "192.168.50.3"]
-host_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXSvoVpMh/Y84THjKAYqkbuPmmv/yIU8DunMov7tKKT"
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index aceb772..307317a 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -2,7 +2,7 @@
   rust-shell = let
     rustProfile = pkgs.buildEnv {
       name = "rust-profile";
-      paths = with pkgs; [rustc cargo rust-analyzer];
+      paths = with pkgs; [rustc cargo rust-analyzer gcc];
     };
   in
     pkgs.writeShellScriptBin "rust-shell" ''
diff --git a/hosts/mercury/wireguard.nix b/hosts/mercury/wireguard.nix
index 35c6a24..a103328 100644
--- a/hosts/mercury/wireguard.nix
+++ b/hosts/mercury/wireguard.nix
@@ -40,10 +40,23 @@ in {
     wantedBy = ["multi-user.target"];
     after = ["network-online.target"];
     wants = ["network-online.target"];
-    serviceConfig = {
-      ExecStart = "${lib.getExe pkgs.udp2raw} -c -l 127.0.0.1:51820 -r 104.53.197.192:51843 -k shared-secret -a";
-      Restart = "on-failure";
-    };
+    script = ''
+      REMOTE_IP=$(${pkgs.dnsutils}/bin/dig +short williamsfam.us.com | ${pkgs.gawk}/bin/awk 'NR==1')
+
+      if [[ -z "$REMOTE_IP" ]]; then
+        echo "Failed to resolve DNS for configured domain" >&2
+        exit 1
+      fi
+
+      ${lib.getExe pkgs.udp2raw} \
+        -c \
+        -l 127.0.0.1:51820 \
+        -r "$REMOTE_IP":51843 \
+        --raw-mode faketcp \
+        --key "shared-secret" \
+        --auto-rule
+    '';
+    serviceConfig.Restart = "on-failure";
   };
 
   systemd.network.netdevs."10-wg" = {
diff --git a/modules/terminal/hjem/programs/git.nix b/modules/terminal/hjem/programs/git.nix
index 85db4ab..5a9fbbf 100644
--- a/modules/terminal/hjem/programs/git.nix
+++ b/modules/terminal/hjem/programs/git.nix
@@ -17,7 +17,10 @@
         unstage = "restore --staged";
       };
       init.defaultBranch = "main";
+
+      # automatic remote config
       push.autoSetupRemote = true;
+      checkout.defaultRemote = "origin";
     }
     (lib.mkIf cfg.installKey {
       # commit signing
diff --git a/modules/terminal/hjem/programs/helix.nix b/modules/terminal/hjem/programs/helix.nix
index db6beba..0df7de4 100644
--- a/modules/terminal/hjem/programs/helix.nix
+++ b/modules/terminal/hjem/programs/helix.nix
@@ -8,26 +8,24 @@
 
   languages = {
     language-server = {
-      rust-analyzer.command = let
-        env = pkgs.stdenv.mkDerivation {
-          name = "rust-analyzer-env";
-          src = ./.;
+      # rust-analyzer.command = let
+      #   env = pkgs.stdenv.mkDerivation {
+      #     name = "rust-analyzer-env";
+      #     src = ./.;
 
-          nativeBuildInputs = [pkgs.makeWrapper];
-          buildInputs = [pkgs.rust-analyzer];
-          installPhase = ''
-            mkdir -p $out/bin
-            makeWrapper ${pkgs.rust-analyzer}/bin/rust-analyzer $out/bin/rust-analyzer \
-              --prefix PATH : ${lib.makeBinPath (with pkgs; [rustc cargo])}
-          '';
-        };
-      in "${env}/bin/rust-analyzer";
+      #     nativeBuildInputs = [pkgs.makeWrapper];
+      #     buildInputs = [pkgs.rust-analyzer];
+      #     installPhase = ''
+      #       mkdir -p $out/bin
+      #       makeWrapper ${pkgs.rust-analyzer}/bin/rust-analyzer $out/bin/rust-analyzer \
+      #         --prefix PATH : ${lib.makeBinPath (with pkgs; [rustc cargo])}
+      #     '';
+      #   };
+      # in "${env}/bin/rust-analyzer";
 
       nil = {
         command = "${pkgs.nil}/bin/nil";
-        config = {
-          nil.nix.flake.autoArchive = true;
-        };
+        config.nil.nix.flake.autoArchive = true;
       };
       superhtml = {
         command = "${pkgs.superhtml}/bin/superhtml";
@@ -57,7 +55,7 @@
         name = "html";
         file-types = ["html"];
         language-servers = ["superhtml"];
-        auto-format = true;
+        auto-format = false;
       }
     ];
   };