diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index bc976e0..692f4e2 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -8,16 +8,6 @@ let nvidia-offload mpv --shuffle --mute=yes "/run/user/1000/gvfs/smb-share:server=10.7.89.108,share=various2/$directory/" & done ''; - unlock-luks = pkgs.writeShellScriptBin "unlock-luks" '' - until ${pkgs.netcat}/bin/nc -vzw 2 $1 22; do - sleep 1 - done && - ${pkgs.openssh}/bin/ssh \ - -o UserKnownHostsFile=/dev/null \ - -o StrictHostKeyChecking=no \ - -o User=root \ - $1 - ''; in { imports = [ "${inputs.self}/home-manager/profiles/management.nix" ]; @@ -31,7 +21,6 @@ in sound-juicer unstable.tagger az-media - unlock-luks ]; }; diff --git a/home-manager/profiles/management.nix b/home-manager/profiles/management.nix index 327b843..02d6785 100644 --- a/home-manager/profiles/management.nix +++ b/home-manager/profiles/management.nix @@ -1,4 +1,16 @@ { inputs, pkgs, ... }: +let + unlock-luks = pkgs.writeShellScriptBin "unlock-luks" '' + until ${pkgs.netcat}/bin/nc -vzw 2 $1 22; do + sleep 1 + done && + ${pkgs.openssh}/bin/ssh \ + -o UserKnownHostsFile=/dev/null \ + -o StrictHostKeyChecking=no \ + -o User=root \ + $1 + ''; +in { imports = [ "${inputs.self}/home-manager/profiles/headless.nix" ]; @@ -7,9 +19,9 @@ docker-compose exercism git + unlock-luks ]; shellAliases = { - unlock-luks = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o User=root"; format-modules = "${pkgs.unstable.nixfmt-rfc-style}/bin/nixfmt **/*.nix"; }; };