From d09a73fd1f7012b41870df83477aed515a5327b6 Mon Sep 17 00:00:00 2001 From: Scott Scoble Date: Sun, 17 May 2026 01:38:55 -0700 Subject: [PATCH] Fix wineWow64Packages, add network tools, imports --- modules/laptop.nix | 50 +++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/modules/laptop.nix b/modules/laptop.nix index dc8cf73..20b8208 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -2,11 +2,6 @@ { imports = [ ../hardware-configuration.nix ./emulation.nix ]; - # DNS fallback (Tailscale MagicDNS sometimes blocks public resolvers) - networking.nameservers = [ "1.1.1.1" "8.8.8.8" ]; - security.sudo.extraRules = [ - { groups = [ "wheel" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } - ]; # === System Packages === environment.systemPackages = with pkgs; [ @@ -34,14 +29,26 @@ openssh mosh - # SMB/CIFS mount support - cifs-utils - mount-truenas-shared # Network debugging bind traceroute mtr netcat + + # SMB/CIFS mount support + cifs-utils + mount-truenas-shared + + # Windows apps via Wine + wineWow64Packages.stable + ]; + + # DNS fallback (Tailscale MagicDNS sometimes blocks public resolvers) + networking.nameservers = [ "1.1.1.1" "8.8.8.8" ]; + + # Passwordless sudo for sscoble + security.sudo.extraRules = [ + { groups = [ "wheel" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } ]; # === Network Shares === @@ -52,11 +59,6 @@ ]; systemd.services.mount-truenas-shared = { - # Network debugging - bind - traceroute - mtr - netcat description = "Mount TrueNAS Shared SMB volume"; after = [ "network-online.target" "tailscaled.service" ]; wants = [ "network-online.target" ]; @@ -65,28 +67,13 @@ Type = "oneshot"; RemainAfterExit = true; ExecStart = "${pkgs.mount-truenas-shared}/bin/mount-truenas-shared"; - # Network debugging - bind - traceroute - mtr - netcat ExecStop = "${pkgs.mount-truenas-shared}/bin/mount-truenas-shared umount"; - # Network debugging - bind - traceroute - mtr - netcat }; }; nixpkgs.overlays = [ (final: prev: { mount-truenas-shared = prev.writeShellScriptBin "mount-truenas-shared" '' - # Network debugging - bind - traceroute - mtr - netcat set -o pipefail SHARE="Shared" @@ -219,13 +206,12 @@ # === Boot === boot.loader.systemd-boot.enable = true; - + boot.loader.efi.canTouchEfiVariables = true; +} + # === SSH Server === services.openssh = { enable = true; settings.PasswordAuthentication = false; openFirewall = true; }; - -boot.loader.efi.canTouchEfiVariables = true; -} \ No newline at end of file