From 8dc9131c46ba5efb0e0b4a339db2034605123f02 Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 5 Mar 2025 22:07:33 -0600 Subject: [PATCH] uhhhh --- ssh/.ssh/ssh/config | 27 +++++++++++++++++++++ ssh/.ssh/ssh/id_ed25519 | 7 ++++++ ssh/.ssh/ssh/id_ed25519.pub | 1 + ssh/.ssh/ssh/known_hosts | 6 +++++ ssh/.ssh/ssh/known_hosts.old | 4 ++++ tmux/.tmux.conf | 44 +++++++++++++++++------------------ zsh/..zshrc.un~ | Bin 0 -> 965 bytes zsh/.p10k.zsh | 1 - zsh/.zshrc | 5 +--- 9 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 ssh/.ssh/ssh/config create mode 100644 ssh/.ssh/ssh/id_ed25519 create mode 100644 ssh/.ssh/ssh/id_ed25519.pub create mode 100644 ssh/.ssh/ssh/known_hosts create mode 100644 ssh/.ssh/ssh/known_hosts.old create mode 100644 zsh/..zshrc.un~ diff --git a/ssh/.ssh/ssh/config b/ssh/.ssh/ssh/config new file mode 100644 index 0000000..d3857fc --- /dev/null +++ b/ssh/.ssh/ssh/config @@ -0,0 +1,27 @@ +Host workstation + Hostname cnieves.aus.corp.google.com + User cnieves + LocalForward 5005 localhost:5005 # Java Debug + RemoteForward 5037 localhost:5037 # ADB + RemoteForward 2222 localhost:22 # SSH/SCP + RemoteForward 2489 localhost:2489 # Lemonade + Compression no + ControlMaster auto + ControlPath /tmp/ssh_control-%r-%h-%p + ControlPersist 5m + +Host vilya + Hostname vilya.c.googlers.com + User cnieves + LocalForward 5005 localhost:5005 # Java Debug + RemoteForward 5037 localhost:5037 # ADB + RemoteForward 2222 localhost:22 # SSH/SCP + RemoteForward 2489 localhost:2489 # Lemonade + Compression yes + ControlMaster auto + ControlPath /tmp/ssh_control-%r-%h-%p + ControlPersist 5m + +Host gateway-workaround + Hostname cnieves.aus.corp.google.com + ProxyCommand /usr/local/bin/corp-ssh-helper -relay=sup-ssh-relay.corp.google.com -enable_measurements -report_measurement_results -proxy-mode=grue -dst_username=%r %h %p diff --git a/ssh/.ssh/ssh/id_ed25519 b/ssh/.ssh/ssh/id_ed25519 new file mode 100644 index 0000000..a62326f --- /dev/null +++ b/ssh/.ssh/ssh/id_ed25519 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAiobqOMGqa/WV98SogFgRxmR8piZIjB9YHv+EaKOszPwAAAJgwYgAoMGIA +KAAAAAtzc2gtZWQyNTUxOQAAACAiobqOMGqa/WV98SogFgRxmR8piZIjB9YHv+EaKOszPw +AAAEDCx1cXVSYtGOaZ3eY5Pi+vxI8IFQePfbR6anh7EIXnQSKhuo4wapr9ZX3xKiAWBHGZ +HymJkiMH1ge/4Roo6zM/AAAAE2NocmlzdGlhbkBuaWV2ZXMuaW8BAg== +-----END OPENSSH PRIVATE KEY----- diff --git a/ssh/.ssh/ssh/id_ed25519.pub b/ssh/.ssh/ssh/id_ed25519.pub new file mode 100644 index 0000000..7eb5876 --- /dev/null +++ b/ssh/.ssh/ssh/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICKhuo4wapr9ZX3xKiAWBHGZHymJkiMH1ge/4Roo6zM/ christian@nieves.io diff --git a/ssh/.ssh/ssh/known_hosts b/ssh/.ssh/ssh/known_hosts new file mode 100644 index 0000000..c4b2191 --- /dev/null +++ b/ssh/.ssh/ssh/known_hosts @@ -0,0 +1,6 @@ +|1|CIIWBGAPZWh0AC6+VhzGeTCp2zU=|tvDRuKqQI9R5hYflMTFC0UjxSLg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl +|1|2zYwaWz04YT0n3X4DoUJ/GyfvJc=|qEkYdDiBbUaZBIJuJgSjpgAIIcc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= +|1|kyd+2TLRVx5WkeYWt5KZG5xkiRY=|Av44XxYX/tB5AylJYGwe1+aYRH8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= +|1|57Mc7AkMixA2wO/oaXe0kDmn7bk=|WEvNB7cfFsTcYNQSk2tRgin+mfg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXuVwIE9ZFHrqkRqzCToEwBR4V+1YoBZf+7PwQOm9uo +|1|Gc8JQLe9H1GKkfEpatYPwqaM5u0=|CsQrFpSf02UbF27MlvOQB0enGuQ= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCaRpBbAotScjprZd4DSlGw6FVRobxdo5YX1LLl9yoIhBfXXQIIHvYq3sRnS9GhhOBhoEBcqOZm7jj4GG8TnnANYEAoulR0dfGLAZbftpz95wNaWo9veiA45k8Ihx5fpZ2c0WlJnTZYyz+0+WaL3AY7yz7p1gyfTYOWp7Q4LJcY4kK/tkLnMYSsCTGwMAco2jR9CDdXZGLdAVB4BoZOAEYJ3wUGWCxcFMVgy+X7iQwIkrNyRCBw/BV3EjXqSNjD/XbrsMfuiVhhDgZS7r+u+yQCxqFu60OOLCXU9++UgKy2ICVDP8mBoJW/zKvJ0OOoylt7vSVWp67uiHe7f/0rywN1 +|1|wBajkjvDTSC0NG6PWiSGhwPPhdY=|USSmnu2FmIcv4gzM4t4+3+RoBV8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA8e+6iO+UmorfX7JWKglc4QptEczpe2LG3PidmsS7tDPcUK9Vbn/eyEkY61Us1Zo7rGqrAT3wABOnRpftfg0IA= diff --git a/ssh/.ssh/ssh/known_hosts.old b/ssh/.ssh/ssh/known_hosts.old new file mode 100644 index 0000000..0b665cd --- /dev/null +++ b/ssh/.ssh/ssh/known_hosts.old @@ -0,0 +1,4 @@ +|1|CIIWBGAPZWh0AC6+VhzGeTCp2zU=|tvDRuKqQI9R5hYflMTFC0UjxSLg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl +|1|2zYwaWz04YT0n3X4DoUJ/GyfvJc=|qEkYdDiBbUaZBIJuJgSjpgAIIcc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= +|1|kyd+2TLRVx5WkeYWt5KZG5xkiRY=|Av44XxYX/tB5AylJYGwe1+aYRH8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= +|1|57Mc7AkMixA2wO/oaXe0kDmn7bk=|WEvNB7cfFsTcYNQSk2tRgin+mfg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXuVwIE9ZFHrqkRqzCToEwBR4V+1YoBZf+7PwQOm9uo diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 7610e29..fd60f11 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -124,7 +124,7 @@ bind-key C-a set-option -g prefix C-a # No delay for escape key press set -sg escape-time 0 -set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M' +run ~/.tmux/plugins/tmux/catppuccin.tmux # text for the window when inactive set -g @catppuccin_window_default_fill "number" @@ -133,30 +133,27 @@ set -g @catppuccin_window_default_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_c set -g @catppuccin_window_current_fill "number" set -g @catppuccin_window_current_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}' -set -g @catppuccin_pane_status_enabled "yes" -set -g @catppuccin_pane_border_status "top" -set -g @catppuccin_pane_left_separator "" -set -g @catppuccin_pane_right_separator "" -set -g @catppuccin_pane_middle_separator "█ " -set -g @catppuccin_pane_number_position "left" -set -g @catppuccin_pane_default_fill "number" - -set -g @catppuccin_status_modules_right "host cpu weather date_time" -set -g @catppuccin_status_left_separator "" -set -g @catppuccin_status_right_separator " " -set -g @catppuccin_status_right_separator_inverse "yes" -set -g @catppuccin_status_fill "all" -set -g @catppuccin_status_connect_separator "no" -set -g @catppuccin_window_status_icon_enable "yes" - -set -g @catppuccin_icon_window_last "󰖰" -set -g @catppuccin_icon_window_current "󰖯" -set -g @catppuccin_icon_window_zoom "󰁌" -set -g @catppuccin_icon_window_mark "󰃀" -set -g @catppuccin_icon_window_silent "󰂛" -set -g @catppuccin_icon_window_activity "󰖲" set -g @catppuccin_icon_window_bell "󰂞" +# Make the status line pretty and add some modules + +set -g status-right-length 100 + +set -g status-left-length 100 + +set -g status-left "" + +set -g status-right "#{E:@catppuccin_status_application}" + +set -agF status-right "#{E:@catppuccin_status_cpu}" + +set -ag status-right "#{E:@catppuccin_status_session}" + +set -ag status-right "#{E:@catppuccin_status_uptime}" + +set -agF status-right "#{E:@catppuccin_status_battery}" + + # List of plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' @@ -170,6 +167,7 @@ set -g @plugin 'catppuccin/tmux' set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'tmux-plugins/tmux-prefix-highlight' +set -g @plugin 'catppuccin/tmux#v2.1.2' set -g @continuum-restore 'on' set -g @resurrect-dir '$HOME/.tmux/resurrect' diff --git a/zsh/..zshrc.un~ b/zsh/..zshrc.un~ new file mode 100644 index 0000000000000000000000000000000000000000..c92f41244c2395c2db1db46892a72efb482b16bc GIT binary patch literal 965 zcmWH`%$*;a=aT=Ffyt_6wTwpn(Hoz3CS*_bjp0^olbZBIS;6;$%*2px_0vWS3=AuQ z7z7qVC-qGXc%TlKPg?r0+MB9h`)fO0LlbwTma+;$R^`D;gMah0uJ2 NHR2e>OdFrC0szcwFgpMM literal 0 HcmV?d00001 diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index a1da23a..86b0432 100644 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -30,7 +30,6 @@ zmodload zsh/langinfo if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then - local LC_ALL=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8} fi # The list of segments shown on the left. Fill it with the most important segments. diff --git a/zsh/.zshrc b/zsh/.zshrc index 83c4112..24bc2f1 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -158,11 +158,8 @@ autoload -Uz add-zsh-hook [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh export EDITOR='nvim' +export PATH="$PATH:/opt/nvim/" export TERM=xterm-256color -export LANG="en_US.UTF-8" -export LC_ALL="en_US.UTF-8" -export LC_CTYPE="en_US.UTF-8" -export LANG_ALL="en_US.UTF-8" export CARGO_NET_GIT_FETCH_WITH_CLI=true