From a6cb498371d90f62d8f2180853a5dbb1d3b1e372 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Wed, 12 Jul 2023 16:53:41 -0500 Subject: [PATCH] chore: add usql and remove nushell script Signed-off-by: jolheiser --- apps/default.nix | 1 + apps/nushell/jolheiser.nu | 1 - flake.nix | 4 ---- machines/chai/default.nix | 5 +++-- secrets/secrets.nix | 1 - secrets/shared/nushell.nu.age | 21 --------------------- 6 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 secrets/shared/nushell.nu.age diff --git a/apps/default.nix b/apps/default.nix index 92030e9..c18e505 100644 --- a/apps/default.nix +++ b/apps/default.nix @@ -34,6 +34,7 @@ just spotify-tui ripgrep + usql # LSPs gopls diff --git a/apps/nushell/jolheiser.nu b/apps/nushell/jolheiser.nu index 7dc53ee..c4ea008 100644 --- a/apps/nushell/jolheiser.nu +++ b/apps/nushell/jolheiser.nu @@ -16,7 +16,6 @@ def sshdev [port: int = 8080] { ## Other ## let-env EDITOR = hx let-env config = ($env.config | upsert "shell_integration" ("WEZTERM_PANE" not-in $env and "SSH_CLIENT" not-in $env)) -source /run/agenix/nushell.nu source ~/.config/nushell/zoxide.nu source ~/.config/nushell/ohmyposh.nu diff --git a/flake.nix b/flake.nix index 779aaf9..f07510d 100644 --- a/flake.nix +++ b/flake.nix @@ -56,10 +56,6 @@ file = ./secrets/shared/ssh-config-work.age; owner = "jolheiser"; }; - "nushell.nu" = { - file = ./secrets/shared/nushell.nu.age; - owner = "jolheiser"; - }; spotify-pw = { file = ./secrets/shared/spotify-pw.age; owner = "jolheiser"; diff --git a/machines/chai/default.nix b/machines/chai/default.nix index 9dd04df..d8d9b3c 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -33,6 +33,7 @@ in { enable = true; settings = {X11Forwarding = true;}; }; + globalprotect.enable = true; }; virtualisation.docker.enable = true; @@ -44,8 +45,8 @@ in { }; environment.systemPackages = with pkgs; [ - gp-saml-gui - openconnect + globalprotect-openconnect + python310 jetbrains.pycharm-professional jetbrains.idea-ultimate jetbrains.datagrip diff --git a/secrets/secrets.nix b/secrets/secrets.nix index d9d3953..f4071f5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,6 +7,5 @@ let in { "shared/ssh-config.age".publicKeys = all; "shared/ssh-config-work.age".publicKeys = all; - "shared/nushell.nu.age".publicKeys = all; "shared/spotify-pw.age".publicKeys = all; } diff --git a/secrets/shared/nushell.nu.age b/secrets/shared/nushell.nu.age deleted file mode 100644 index 5b83801..0000000 --- a/secrets/shared/nushell.nu.age +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyBPT21V -TG9HVUprbWRZcyt2VkVraVFyN2N4T2hEL3VUZGhNRkU0ZlAwSVJRClp4WG5mRjZT -YlRJVEZQejl0T1l3ekZOeEdJM3RUcHBRdG80QkNYQmNLYm8KLT4gc3NoLWVkMjU1 -MTkgeFVNdjJ3IFFvWU9KdEJvdUdFRjlXTFRnaDZucW1GaXhkUVVKUXRHUjNqbTVw -V1RQR2cKWWFMaUk3b0VZYlV1c1k0VkI4cmFRWGNEWHBOOXRhajl0UmxiUWFYdjZy -MAotPiBzc2gtZWQyNTUxOSBqbzFNUEEgMmFOK1ZocGFQQ2JZM1VEUVZWcDlUaHZJ -T3ZuTkZkMXhNM0RkSUgzUHMwYwovUnZSaDhxc1BKbGVCc1AxMzNoUGVHR1IvWWg4 -WTR6dkJTZFE0dlg0clVZCi0+IEEtZ3JlYXNlClNwaXV2SExJNVNnY1R5MUJTN1VT -MjFyNDNpMHZoa2xBWE02aGJXWVF0TUQ4R29QUkIvcHFGSjZYUWVrc2JYeDUKYTdH -K3ZZUitHbmZNZDhBeFBoS2QyWGp2MXY3QUxNTUFJemVKVDhjTXdUQkhRK0Z6V2dJ -M0lBCi0tLSBSNWNZNWV4OS8vcUVEaFBTZEFIQzYyZHF3aUVpcXcvMXZ2N3AzYm5T -anJjCsIQ1al/8ijJbFZd/voxqBWaK1vay0Dy0X83W44toUbxikhfFIsNK9xrSgtl -1TuRF4BTPgsVrqorBZqdkPxWdnngWHwm7wMYQkwCcEbXtov7lXXbSPsIZ30xoPwA -j9nZuuDdafwSUuELMx7zrrlzO5HbLYXmvdxfyQVQHbBSuaxdT+hFlKUAjM6RTAyq -eZbKWogPJE2ih/7YDyAYgewmfbj4lbffCAC7/IhKNSGem77IZ+y75O3Hj37JQjva -yMX7U5AETdJ1m64cl6QxB0CAJx7n26blLmr/p0chsGCsgeLu4kOSifFDqVv5YaVg -/bh9IM7dhSrudfufdvXti4kwdMF22YNNHYW8cvyvvYkAHvFwpb7qvteIOcOi9AG6 -MwZR5HH8OVkiONwhJd3JUaXbV89+iz01Lkap64EqHVypvPy/AOKIFc5nXpRXYHsO -JnZlsURUJxApSm2VL6zFEbI= ------END AGE ENCRYPTED FILE-----