sstent/vmimages
1
0
Fork 0
mirror of https://github.com/sstent/vmimages.git synced 2026-01-25 06:31:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
sstent
2023-03-01 16:51:24 +00:00
parent 25be0d06f4
commit 10b1faa250
4 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cat Normal file
View File

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

11
flake.nix
View File

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

3
home-manager/users/sstent/default.nix
View File

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

84
modules/home-manager/ssh-proxy/default.nix
View File

@@ -1,43 +1,43 @@
{ lib, pkgs, config, ... }: { lib, pkgs, config, ... }:
with lib; with lib;
let cfg = config.custom.ssh-proxy; let cfg = config.custom.ssh-proxy;
in { in {
options.custom.ssh-proxy = { options.custom.ssh-proxy = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
Enable ssh-proxy for WSL Enable ssh-proxy for WSL
''; '';
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
npiperelay npiperelay
socat socat
]; ];
systemd.user = { systemd.user = {
startServices = true; startServices = true;
services.ssh-proxy = { services.ssh-proxy = {
Unit = { Description = "WSL Proxy"; }; Unit = { Description = "WSL Proxy"; After = "network.target";};
Service = { Service = {
ExecStart = "${pkgs.writeShellScript "start-proxy" '' ExecStart = "${pkgs.writeShellScript "start-proxy" ''
# set -x set -x -o xtrace # print commands
${pkgs.coreutils}/bin/rm -f /home/sstent/.ssh/wsl-ssh-agent.sock ${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 ${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" ]; }; #Install = { WantedBy = [ "default.target" ]; };
}; };
}; };
}; };
} }