sync

cat

@@ -0,0 +1 @@
+/nix/store/x958rg592dqk6cr7rh2kqab3y5nvgi9h-start-proxy

flake.nix

@@ -62,6 +62,10 @@
       packages = forEachPkgs (pkgs: import ./pkgs { inherit pkgs; });
       devShells = forEachPkgs (pkgs: import ./shell.nix { inherit pkgs; });
       overlays = import ./overlays { inherit inputs; };
+
+
+      # Output all modules in ./modules to flake. Modules should be in
+      # individual subdirectories and contain a default.nix file
       nixosModules = builtins.listToAttrs (map
         (x: {
           name = x;
@@ -69,6 +73,9 @@
         })
         (builtins.attrNames (builtins.readDir ../modules/nixos)));
         
+
+      ##import our HM modules
+      ## -- imported in ./home-manger/general  
       homeManagerModules = builtins.listToAttrs (map
         (name: {
           inherit name;
@@ -107,7 +114,7 @@
             # > Our main home-manager configuration file <
             ./home-manager/users/sstent
             inputs.sops-nix.homeManagerModules.sops         
-          ]++ (builtins.attrValues self.homeManagerModules);
+          ];
         };
         "sstent@StuPC" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
@@ -116,7 +123,7 @@
             # > Our main home-manager configuration file <
             ./home-manager/users/sstent
             inputs.sops-nix.homeManagerModules.sops         
-          ]++ (builtins.attrValues self.homeManagerModules);
+          ];
         };
       };
 

home-manager/users/sstent/default.nix

@@ -45,7 +45,6 @@
         terraform
         wget
         curl
-        socat
         p7zip
         #git-run
         mr
@@ -61,8 +60,6 @@
 ssh-proxy.enable = true;
 beets.enable = true;
 keybase.enable = true;
-
-
       };
 
 # home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig";

modules/home-manager/ssh-proxy/default.nix

@@ -26,12 +26,12 @@ in {
   startServices = true;
 
   services.ssh-proxy = {
-    Unit = { Description = "WSL Proxy"; };
+    Unit = { Description = "WSL Proxy"; After = "network.target";};
     Service = {
       ExecStart = "${pkgs.writeShellScript "start-proxy" ''
-        # set -x
-        ${pkgs.coreutils}/bin/rm -f /home/sstent/.ssh/wsl-ssh-agent.sock
-        ${pkgs.util-linux}/bin/setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/home/sstent/.ssh/wsl-ssh-agent.sock,fork EXEC:"${pkgs.npiperelay}/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork
+set -x -o xtrace # print commands
+${pkgs.coreutils}/bin/rm -f /home/sstent/.ssh/wsl-ssh-agent.sock
+${pkgs.util-linux}/bin/setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/home/sstent/.ssh/wsl-ssh-agent.sock,fork EXEC:"${pkgs.npiperelay}/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork
       ''}";
     };
     #Install = { WantedBy = [ "default.target" ]; };