diff --git a/apps/default.nix b/apps/default.nix index c18e5054f271cf6579a52836153f46bbf0d88f97..92030e9ee20ada674479506e9473c0512867d6f7 100644 --- a/apps/default.nix +++ b/apps/default.nix @@ -35,8 +35,6 @@ just spotify-tui ripgrep config, - ./bat.nix - config, ./bottom.nix # LSPs gopls diff --git a/apps/nushell/jolheiser.nu b/apps/nushell/jolheiser.nu index c4ea008a4a1f521f0fb9ee7be773c926b762bee8..7dc53eedc7e8058b20a352f356eac9e39da78b55 100644 --- a/apps/nushell/jolheiser.nu +++ b/apps/nushell/jolheiser.nu @@ -16,6 +16,7 @@ ## 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 f07510df19e5fa0a0bdfd8228493f8f81d397edd..779aaf9d40d372b3d1545e55ad07015678f1ebaf 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,10 @@ ssh-config-work = { 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 d8d9b3c7634c0d645d0f87fe391babc6e43fed7a..9dd04dfe10dcabdc4859c60fc2c32308e8eba1f9 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -33,7 +33,6 @@ openssh = { enable = true; settings = {X11Forwarding = true;}; }; - globalprotect.enable = true; }; virtualisation.docker.enable = true; @@ -45,8 +44,8 @@ shell = pkgs.nushell; }; environment.systemPackages = with pkgs; [ - globalprotect-openconnect + gp-saml-gui - python310 + openconnect jetbrains.pycharm-professional jetbrains.idea-ultimate jetbrains.datagrip diff --git a/secrets/secrets.nix b/secrets/secrets.nix index f4071f5c9644779af9361373ae93389884597189..d9d395396914f6426972d24f179ebeb13fab3298 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -8,4 +8,6 @@ in { "shared/ssh-config.age".publicKeys = all; "shared/ssh-config-work.age".publicKeys = all; let + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"; +let } diff --git a/secrets/shared/nushell.nu.age b/secrets/shared/nushell.nu.age new file mode 100644 index 0000000000000000000000000000000000000000..5b83801030fc5d9976d8c77f3b85535ee4d12d40 --- /dev/null +++ b/secrets/shared/nushell.nu.age @@ -0,0 +1,21 @@ +-----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-----