Various updates

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>

home/.dotfiles/1-zsh

@@ -15,7 +15,6 @@ zstyle ':omz:update' mode reminder
 
 source `brew --prefix switch`/switch.sh
 
-
 # History
 HISTFILE="$HOME/.zsh_history"
 HISTIGNORE="&:exit:reset:clear:zh"
@@ -30,7 +29,6 @@ setopt HIST_REDUCE_BLANKS
 setopt autocd
 autoload -U add-zsh-hook
 
-
 DISABLE_AUTO_TITLE="true"
 
 # Override auto-title when static titles are desired ($ title My new title)
@@ -54,4 +52,6 @@ preexec() {
   printf "\033]0;%s\a" "${1%% *} | $cwd" # Omit construct from $1 to show args
 }
 
-eval "$(ssh-agent -s)" > /dev/null
+if [ $(/bin/ps -ef | /usr/bin/grep "ssh-agent" | /usr/bin/grep -v "grep" | wc -l) -eq 0 ]; then
+  eval "$(ssh-agent -s)" > /dev/null
+fi

home/.dotfiles/aliases

@@ -2,7 +2,7 @@
 alias _cat=`which cat`
 alias _curl=`which curl`
 alias _ls="/bin/ls"
-alias _grep="/bin/grep"
+alias _grep="/usr/bin/grep"
 alias _diff="/usr/bin/diff"
 alias _du=`which du`
 alias _df=`which df`

home/.hyper.js

@@ -1,156 +0,0 @@
-// Future versions of Hyper may add additional config options,
-// which will not automatically be merged into this file.
-// See https://hyper.is#cfg for all currently supported options.
-
-module.exports = {
-  config: {
-    // choose either `'stable'` for receiving highly polished,
-    // or `'canary'` for less polished but more frequent updates
-    updateChannel: 'stable',
-
-    scrollback: 10000000,
-
-    // default font size in pixels for all tabs
-    fontSize: 13,
-
-    // font family with optional fallbacks
-    fontFamily: '"OpenDyslexicMono Nerd Font", "Fira Code", Menlo, "DejaVu Sans Mono", Consolas, "Lucida Console", monospace',
-
-    // default font weight: 'normal' or 'bold'
-    fontWeight: 'normal',
-
-    // font weight for bold characters: 'normal' or 'bold'
-    fontWeightBold: 'bold',
-
-    // line height as a relative unit
-    lineHeight: 1,
-
-    // letter spacing as a relative unit
-    letterSpacing: 0,
-
-    // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk)
-    cursorColor: 'rgba(248,28,229,0.8)',
-
-    // terminal text color under BLOCK cursor
-    cursorAccentColor: '#000',
-
-    // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █
-    cursorShape: 'BEAM',
-
-    // set to `true` (without backticks and without quotes) for blinking cursor
-    cursorBlink: true,
-
-    // color of the text
-    foregroundColor: '#fff',
-
-    // terminal background color
-    // opacity is only supported on macOS
-    backgroundColor: '#000',
-
-    // terminal selection color
-    selectionColor: 'rgba(248,28,229,0.3)',
-
-    // border color (window, tabs)
-    borderColor: '#333',
-
-    // custom CSS to embed in the main window
-    css: `.line {
-      color: #999;
-      stroke: #999;
-    }`,
-
-    // custom CSS to embed in the terminal window
-    termCSS: '',
-
-    // if you're using a Linux setup which show native menus, set to false
-    // default: `true` on Linux, `true` on Windows, ignored on macOS
-    showHamburgerMenu: '',
-
-    // set to `false` (without backticks and without quotes) if you want to hide the minimize, maximize and close buttons
-    // additionally, set to `'left'` if you want them on the left, like in Ubuntu
-    // default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS
-    showWindowControls: '',
-
-    // custom padding (CSS format, i.e.: `top right bottom left`)
-    padding: '12px 14px',
-
-    // the full list. if you're going to provide the full color palette,
-    // including the 6 x 6 color cubes and the grayscale map, just provide
-    // an array here instead of a color map object
-    colors: {
-      black: '#000000',
-      red: '#C51E14',
-      green: '#1DC121',
-      yellow: '#C7C329',
-      blue: '#0A2FC4',
-      magenta: '#C839C5',
-      cyan: '#20C5C6',
-      white: '#C7C7C7',
-      lightBlack: '#686868',
-      lightRed: '#FD6F6B',
-      lightGreen: '#67F86F',
-      lightYellow: '#FFFA72',
-      lightBlue: '#6A76FB',
-      lightMagenta: '#FD7CFC',
-      lightCyan: '#68FDFE',
-      lightWhite: '#FFFFFF',
-    },
-
-    // the shell to run when spawning a new session (i.e. /usr/local/bin/fish)
-    // if left empty, your system's login shell will be used by default
-    //
-    // Windows
-    // - Make sure to use a full path if the binary name doesn't work
-    // - Remove `--login` in shellArgs
-    //
-    // Bash on Windows
-    // - Example: `C:\\Windows\\System32\\bash.exe`
-    //
-    // PowerShell on Windows
-    // - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`
-    shell: '',
-
-    // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`)
-    // by default `['--login']` will be used
-    shellArgs: ['--login'],
-
-    // for environment variables
-    env: {},
-
-    // set to `false` for no bell
-    bell: `false`,
-
-    // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard
-    copyOnSelect: false,
-
-    // if `true` (without backticks and without quotes), hyper will be set as the default protocol client for SSH
-    defaultSSHApp: true,
-
-    // if `true` (without backticks and without quotes), on right click selected text will be copied or pasted if no
-    // selection is present (`true` by default on Windows and disables the context menu feature)
-    // quickEdit: true,
-
-    // URL to custom bell
-    // bellSoundURL: 'http://example.com/bell.mp3',
-
-    // for advanced config flags please refer to https://hyper.is/#cfg
-  },
-
-  // a list of plugins to fetch and install from npm
-  // format: [@org/]project[#version]
-  // examples:
-  //   `hyperpower`
-  //   `@company/project`
-  //   `project#1.0.1`
-  plugins: ["hyper-search", "hyperterm-paste", "hyper-tabs-enhanced", "hyper-chesterish", "hyper-quit"],
-
-  // in development, you can create a directory under
-  // `~/.hyper_plugins/local/` and include it here
-  // to load it and avoid it being `npm install`ed
-  localPlugins: [],
-
-  keymaps: {
-    // Example
-    // 'window:devtools': 'cmd+alt+o',
-  },
-};

install.sh

@@ -2,18 +2,17 @@
 
 export PATH="/home/linuxbrew/.linuxbrew/bin:/opt/homebrew/bin/:$PATH"
 
-GITEMAIL=$(git config --get user.email)
-
 [ -d ~/.additional_dotfiles ] || (mkdir -p ~/.additional_dotfiles && touch ~/.additional_dotfiles/credentials)
 [ -d /usr/local/share/zsh/site-functions ] || (sudo mkdir -p /usr/local/share/zsh/site-functions && sudo chmod 777 /usr/local/share/zsh/site-functions)
 
 # Install homebrew
+echo "🔵  Installing homebrew"
 which brew >/dev/null || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 brew tap homebrew/core
-
+printf " ✅\n"
-echo "🔵  Setting up zsh"
 
 # Install oh-my-zsh
+echo "🔵  Setting up zsh"
 printf "Cloning oh-my-zsh..."
 [ -d ${HOME}/.oh-my-zsh ] || sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 printf " ✅\n"
@@ -30,24 +29,23 @@ sudo chmod -R 755 /usr/local/share/zsh/site-functions
 # Install tools
 BREW_TOOLS=(
   git argocd bandwhich bat danielfoehrkn/switch/switch derailed/k9s/k9s
-  dive doggo duf dust exa fd fzf git-delta go helm htop jq kind krew
+  dive doggo duf dust exa fd fzf git-delta go helm htop jq kind krew curl
   kubectl kustomize node procs progress ripgrep rs/tap/curlie rust starship
-  tektoncd/tools/tektoncd-cli tldr tailscale yq hashicorp/tap/vault
+  tektoncd/tools/tektoncd-cli tldr tailscale yq tabby vale jless macchina tz viddy
-  tabby vale lastpass-cli jless macchina tz vmware-tanzu/carvel/kapp viddy
+  homeassistant-cli act dnsmasq gh kubebuilder golangci-lint gnu-sed s3cmd
-  homeassistant-cli act dnsmasq gh kubebuilder golangci-lint gnu-sed
+  pulumi/tap/pulumi kubeseal podman podman-desktop fluxcd/tap/flux ical-buddy
-  pulumi/tap/pulumi kubeseal podman podman-desktop fluxcd/tap/flux
+  watch crane openssh siderolabs/talos/talosctl civo/tools/civo raspberry-pi-imager
-  watch crane openssh siderolabs/talos/talosctl civo/tools/civo
+  gron ssup2/tap/kpexec opentofu visual-studio-code 1password-cli scw smartmontools
-  pete911/tap/kubectl-iam4sa gron azure-cli ssup2/tap/kpexec
+  firefox signal slack ffmpeg openscad tsh colima docker docker-buildx
-  opentofu
   )
 # Brew tools only available / needed on Mac
 MAC_BREW_TOOLS=(
   pinentry-mac gpg gawk coreutils wget stats homebrew/cask-fonts/font-open-dyslexic-nerd-font
-  hiddenbar dimentium/autoraise/autoraiseapp
+  hiddenbar dimentium/autoraise/autoraiseapp appcleaner the-unarchiver finicky rar
   )
 CARGO_TOOLS=( bottom )
 NODE_TOOLS=( git-split-diffs )
-KREW_TOOLS=( gs outdated tree stern explore blame )
+KREW_TOOLS=( gs outdated tree stern explore blame access-matrix cert-manager rbac-tool resource-capacity view-secret )
 APT_TOOLS=( zsh gcc )
 
 echo "🔵  Installing / updating tools"

other-files/dnsmasq/dnsmasq.conf

@@ -1,3 +1,4 @@
+server=/cluster.local/192.168.1.3
 server=192.168.1.3
 server=192.168.1.4
 server=192.168.1.5
@@ -7,3 +8,4 @@ listen-address=127.0.0.1
 bogus-priv
 no-resolv
 bind-interfaces
+auth-ttl=0

other-files/tabby/config.yaml

@@ -1,4 +1,4 @@
-version: 3
+version: 7
 profiles: []
 hotkeys:
   copy-current-path: []
@@ -129,37 +129,71 @@ hotkeys:
   switch-profile:
     - ⌘-Shift-E
   toggle-window: []
+  scroll-to-bottom: []
+  delete-line:
+    - ⌘-Backspace
+  settings-tab: {}
+  explode-tab:
+    - ⌘-Shift-.
+  combine-tabs:
+    - ⌘-Shift-,
+  pane-nav-1: []
+  pane-nav-2: []
+  pane-nav-3: []
+  pane-nav-4: []
+  pane-nav-5: []
+  pane-nav-6: []
+  pane-nav-7: []
+  pane-nav-8: []
+  pane-nav-9: []
+  pane-increase-vertical: []
+  pane-decrease-vertical: []
+  pane-increase-horizontal: []
+  pane-decrease-horizontal: []
+  focus-all-tabs:
+    - ⌘-⌥-Shift-I
+  scroll-to-top:
+    - Shift-PageUp
+  scroll-up:
+    - ⌥-PageUp
+  scroll-down:
+    - ⌥-PageDown
+  restart-tab: []
+  reconnect-tab: []
+  disconnect-tab: []
+  command-selector:
+    - ⌘-Shift-P
 terminal:
   searchOptions: {}
   colorScheme:
-    name: Desert
+    name: hyper-chesterish
-    foreground: '#ffffff'
+    foreground: '#CDD2E9'
-    background: '#333333'
+    background: '#293340'
-    cursor: '#00ff00'
+    cursor: '#2C85F7'
     colors:
-      - '#4d4d4d'
+      - '#293340'
-      - '#ff2b2b'
+      - '#E17E85'
-      - '#98fb98'
+      - '#61BA86'
-      - '#f0e68c'
+      - '#FFEC8E'
-      - '#cd853f'
+      - '#4CB2FF'
-      - '#ffdead'
+      - '#BE86E3'
-      - '#ffa0a0'
+      - '#2DCED0'
-      - '#f5deb3'
+      - '#CDD2E9'
-      - '#555555'
+      - '#546386'
-      - '#ff5555'
+      - '#E17E85'
-      - '#55ff55'
+      - '#61BA86'
-      - '#ffff55'
+      - '#FFB68E'
-      - '#87ceff'
+      - '#4CB2FF'
-      - '#ff55ff'
+      - '#BE86E3'
-      - '#ffd700'
+      - '#2DCED0'
-      - '#ffffff'
+      - '#CDD2E9'
   font: OpenDyslexicMono Nerd Font
   ligatures: true
   cursor: beam
   pasteOnMiddleClick: false
-  autoOpen: true
   customColorSchemes: []
   background: colorScheme
+  autoOpen: true
 ssh: {}
 configSync:
   parts: {}
@@ -176,3 +210,9 @@ recoverTabs: false
 electronFlags:
   - - force_discrete_gpu
     - '0'
+accessibility: {}
+hacks: {}
+groups: []
+providerBlacklist: []
+commandBlacklist: []
+profileBlacklist: []