diff --git a/configuration.nix b/configuration.nix index aa09459..702cb71 100644 --- a/configuration.nix +++ b/configuration.nix @@ -126,7 +126,6 @@ neofetch direnv openssl - openvpn ollama # maybe ]; diff --git a/home.nix b/home.nix index 7cab7b3..54e5b96 100644 --- a/home.nix +++ b/home.nix @@ -46,9 +46,10 @@ # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: - (writeShellScriptBin "nx_connect_to_pnx" '' - cd /home/nx2/PNX/vpn - sudo openvpn /home/nx2/.ssl/ljk-pnx.ovpn --auth-user-pass ~/.ssl/ljk-pnx-pass.txt #gets put there by home-manager + (writeShellScriptBin "connect_to_pnx" '' + pushd ~/.ssl/ + sudo openvpn --config /home/nx2/.ssl/ljk-pnx.ovpn --auth-user-pass ~/.ssl/ljk-pnx-pass.txt #gets put there by home-manager + popd '') (writeShellScriptBin "nxrbs-nix" '' @@ -117,11 +118,11 @@ home.file = { - ".ssl/ljk-pnx-cert.pem" = secrets.pnxVpn.cert; - ".ssl/ljk-pnx-cert.key" = secrets.pnxVpn.certKey; - ".ssl/ljk-pnx-ca.pem" = secrets.pnxVpn.ca; - ".ssl/ljk-pnx.ovpn" = secrets.pnxVpn.ovpn; - ".ssl/ljk-pnx-pass.txt" = secrets.pnxVpn.pass; + ".ssl/ljk-pnx-cert.pem".text = secrets.pnxVpn.cert; + ".ssl/ljk-pnx-cert.key".text = secrets.pnxVpn.certKey; + ".ssl/ljk-pnx-ca.pem".text = secrets.pnxVpn.ca; + ".ssl/ljk-pnx.ovpn".text = secrets.pnxVpn.ovpn; + ".ssl/ljk-pnx-pass.txt".text = secrets.pnxVpn.pass; # ".config/libinput/gestures".text = '' @@ -242,6 +243,12 @@ client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}" client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}" ''; + # Remmina + ".local/share/remmina/pnx_rdp_srv-phoe3-vmdms_192-168-1-104.remmina".source = ./secrets/pnx-vpn/pnx_rdp_srv-phoe3-vmdms_192-168-1-104.remmina; + ".local/share/remmina/pnx_rdp_srv-phoenix-3_192-168-1-108.remmina".source = ./secrets/pnx-vpn/pnx_rdp_srv-phoenix-3_192-168-1-108.remmina; + ".local/share/remmina/pnx_rdp_srv-phoenix2_192_168-1-101.remmina".source = ./secrets/pnx-vpn/pnx_rdp_srv-phoenix2_1_92168-1-101.remmina; + ".local/share/remmina/pnx_rdp_srv-remote_192-168.1.21.remmina".source = ./secrets/pnx-vpn/pnx_rdp_srv-remote_192-168.1.21.remmina; + }; # Home Manager can also manage your environment variables through diff --git a/secrets/passwords-and-certificates.nix b/secrets/passwords-and-certificates.nix index 715cd39..6fc13de 100644 Binary files a/secrets/passwords-and-certificates.nix and b/secrets/passwords-and-certificates.nix differ diff --git a/secrets/pnx-vpn/pnx_rdp_srv-phoe3-vmdms_192-168-1-104.remmina b/secrets/pnx-vpn/pnx_rdp_srv-phoe3-vmdms_192-168-1-104.remmina new file mode 100644 index 0000000..2e725f9 Binary files /dev/null and b/secrets/pnx-vpn/pnx_rdp_srv-phoe3-vmdms_192-168-1-104.remmina differ diff --git a/secrets/pnx-vpn/pnx_rdp_srv-phoenix-3_192-168-1-108.remmina b/secrets/pnx-vpn/pnx_rdp_srv-phoenix-3_192-168-1-108.remmina new file mode 100644 index 0000000..a06d953 Binary files /dev/null and b/secrets/pnx-vpn/pnx_rdp_srv-phoenix-3_192-168-1-108.remmina differ diff --git a/secrets/pnx-vpn/pnx_rdp_srv-phoenix2_192-168-1-101.remmina b/secrets/pnx-vpn/pnx_rdp_srv-phoenix2_192-168-1-101.remmina new file mode 100644 index 0000000..a537d93 Binary files /dev/null and b/secrets/pnx-vpn/pnx_rdp_srv-phoenix2_192-168-1-101.remmina differ diff --git a/secrets/pnx-vpn/pnx_rdp_srv-remote_192-168-1-21.remmina b/secrets/pnx-vpn/pnx_rdp_srv-remote_192-168-1-21.remmina new file mode 100644 index 0000000..2a36852 Binary files /dev/null and b/secrets/pnx-vpn/pnx_rdp_srv-remote_192-168-1-21.remmina differ