chore(git): Update submodules (automated)

config/nvim v3.29.5

.python-version

@@ -1 +1 @@
-3
+3.11

Brewfile

@@ -6,9 +6,7 @@ tap "gesquive/tap"
 tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
-tap "homebrew/cask"
 tap "homebrew/cask-fonts"
-tap "homebrew/core"
 tap "homebrew/services"
 tap "jesseduffield/lazygit"
 tap "mongodb/brew"
@@ -16,7 +14,7 @@ tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
 tap "xwmx/taps"
-# Run your GitHub Actions locally 🚀
+# Run your GitHub Actions locally
 brew "act"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.11"
@@ -31,15 +29,13 @@ brew "arkade"
 # Automatic configure script builder
 brew "autoconf"
 # GNU File, Shell, and Text utilities
-brew "coreutils"
+brew "coreutils", link: false
 # Extendable version manager with support for Ruby, Node.js, Erlang & more
 brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
 # Official Amazon AWS command-line interface
 brew "awscli"
-# Terminal bandwidth utilization tool
-brew "bandwhich"
 # Clone of cat(1) with syntax highlighting and Git integration
 brew "bat"
 # Yet another cross-platform graphical process/system monitor
@@ -74,10 +70,14 @@ brew "dotenv-linter"
 brew "editorconfig-checker"
 # Useful examples at the command-line
 brew "eg-examples"
+# C/C++ and Java libraries for Unicode and globalization
+brew "icu4c"
+# OpenType text shaping engine
+brew "harfbuzz"
+# Development kit for the Java programming language
+brew "openjdk"
 # Run arbitrary commands when files change
 brew "entr"
-# CLI for templating and/or deploying FaaS functions
-brew "faas-cli"
 # Simple, fast and user-friendly alternative to find
 brew "fd"
 # Banner-like program prints strings as ASCII art
@@ -91,15 +91,13 @@ brew "fzf"
 # Graphics library to dynamically manipulate images
 brew "gd"
 # Disk usage analyzer with console interface written in Go
-brew "gdu", link: false
+brew "gdu"
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
 brew "git"
 # Small git utilities
 brew "git-extras"
-# AVH edition of git-flow
-brew "git-flow-avh"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
 # Open-source GitLab command-line tool
@@ -118,10 +116,6 @@ brew "gnupg"
 brew "go"
 # Image manipulation
 brew "netpbm"
-# C/C++ and Java libraries for Unicode and globalization
-brew "icu4c"
-# OpenType text shaping engine
-brew "harfbuzz"
 # Framework for layout and rendering of i18n text
 brew "pango"
 # Library to render SVG files using Cairo
@@ -160,12 +154,8 @@ brew "luarocks"
 brew "m-cli"
 # Mac App Store command-line interface
 brew "mas"
-# Terminal-based visual file manager
-brew "midnight-commander"
 # Ambitious Vim-fork focused on extensibility and agility
 brew "neovim"
-# No Nonsense Neovim Client in Rust
-brew "neovide", link: false
 # HTTP(S) server and reverse proxy, and IMAP/POP3 proxy server
 brew "nginx"
 # Port scanning utility for large networks
@@ -200,6 +190,8 @@ brew "rcm"
 brew "ripgrep"
 # Powerful, clean, object-oriented scripting language
 brew "ruby"
+# Safe, concurrent, practical language
+brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Autoformat shell script source code
@@ -208,14 +200,8 @@ brew "shfmt"
 brew "starship"
 # Version control system designed to be a better CVS
 brew "subversion"
-# Feature-rich console based todo list manager
-brew "task"
-# Terminal user interface for taskwarrior
-brew "taskwarrior-tui"
 # Send macOS User Notifications from the command-line
-brew "terminal-notifier", link: false
-# Tool to build, change, and version infrastructure
-brew "terraform", link: false
+brew "terminal-notifier"
 # Thin wrapper for Terraform e.g. for locking state
 brew "terragrunt"
 # Tool which checks for the support of TLS/SSL ciphers and flaws
@@ -368,14 +354,78 @@ cask "vlc"
 cask "voikkospellservice"
 # Rust-based terminal
 cask "warp"
-# Mastodon, Pleroma, and Misskey client
-cask "whalebird"
-# View output from scripts in the menu bar
-cask "xbar"
 mas "1Password for Safari", id: 1569813296
+mas "Actions", id: 1586435171
 mas "Audiobook Builder", id: 1437681957
-mas "Flow", id: 1423210932
+mas "Ivory", id: 6444602274
 mas "Keynote", id: 409183694
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
 mas "Tailscale", id: 1475387142
+mas "Xcode", id: 497799835
+vscode "akamud.vscode-theme-onelight"
+vscode "amiralizadeh9480.laravel-extra-intellisense"
+vscode "andrewleedham.vscode-css-modules"
+vscode "andrewmcodes.tailwindcss-extension-pack"
+vscode "austenc.tailwind-docs"
+vscode "bmewburn.vscode-intelephense-client"
+vscode "Box-Of-Hats.bemhelper"
+vscode "bradlc.vscode-tailwindcss"
+vscode "christian-kohler.npm-intellisense"
+vscode "DavidAnson.vscode-markdownlint"
+vscode "dbaeumer.vscode-eslint"
+vscode "DotJoshJohnson.xml"
+vscode "eamodio.gitlens"
+vscode "EditorConfig.EditorConfig"
+vscode "esbenp.prettier-vscode"
+vscode "formulahendry.auto-close-tag"
+vscode "formulahendry.code-runner"
+vscode "gencer.html-slim-scss-css-class-completion"
+vscode "github.vscode-github-actions"
+vscode "GitHub.vscode-pull-request-github"
+vscode "GraphQL.vscode-graphql"
+vscode "GraphQL.vscode-graphql-execution"
+vscode "GraphQL.vscode-graphql-syntax"
+vscode "heybourn.headwind"
+vscode "JohnnyMorganz.stylua"
+vscode "jumpinjackie.vscode-map-preview"
+vscode "k--kato.intellij-idea-keybindings"
+vscode "liamhammett.inline-parameters"
+vscode "macieklad.tailwind-sass-syntax"
+vscode "MehediDracula.php-namespace-resolver"
+vscode "mikestead.dotenv"
+vscode "MrChetan.phpstorm-parameter-hints-in-vscode"
+vscode "mrorz.language-gettext"
+vscode "ms-azuretools.vscode-docker"
+vscode "ms-python.python"
+vscode "ms-python.vscode-pylance"
+vscode "ms-toolsai.jupyter"
+vscode "ms-toolsai.jupyter-renderers"
+vscode "ms-toolsai.vscode-jupyter-cell-tags"
+vscode "ms-toolsai.vscode-jupyter-slideshow"
+vscode "ms-vscode-remote.remote-containers"
+vscode "ms-vscode-remote.remote-wsl"
+vscode "ms-vscode.cpptools"
+vscode "msjsdiag.vscode-react-native"
+vscode "mtxr.sqltools"
+vscode "neilbrayfield.php-docblocker"
+vscode "nemesarial.dust"
+vscode "nhoizey.gremlins"
+vscode "octref.vetur"
+vscode "oderwat.indent-rainbow"
+vscode "pflannery.vscode-versionlens"
+vscode "phiter.phpstorm-snippets"
+vscode "SonarSource.sonarlint-vscode"
+vscode "stylelint.vscode-stylelint"
+vscode "syler.sass-indented"
+vscode "timonwong.shellcheck"
+vscode "tootone.org-mode"
+vscode "valeryanm.vscode-phpsab"
+vscode "Vue.volar"
+vscode "WakaTime.vscode-wakatime"
+vscode "wix.vscode-import-cost"
+vscode "xdebug.php-debug"
+vscode "xdebug.php-pack"
+vscode "yinfei.luahelper"
+vscode "yoavbls.pretty-ts-errors"
+vscode "ZainChen.json"

README.md

@@ -17,12 +17,26 @@ fork or download the repo as a zip and go from there with your own configs.
 3. ???
 4. Profit
 
+### Updates
+
+`cd $HOME/.dotfiles && git pull && ./install`
+
+## The looks
+
+## tmux with starship, the default view
+
+![screenshot of tmux with starship](./.github/screenshots/tmux-starship.png)
+
+## tmux + nvim (astronvim) editing this repository
+
+![screenshot of tmux showing nvim](.github/screenshots/tmux-nvim-astronvim.png)
+
 ## Interesting files and locations
 
 ### Interesting folders
 
 | Path                | Description                                  |
-| ------------------- | -------------------------------------------- |
+|---------------------|----------------------------------------------|
 | `.github`           | GitHub Repository configuration files.       |
 | `hosts/{hostname}/` | Configs that should apply to that host only. |
 | `local/bin`         | Helper scripts that I've collected or wrote. |
@@ -31,7 +45,7 @@ fork or download the repo as a zip and go from there with your own configs.
 ### dotfile folders
 
 | Repo      | Destination | Description                                 |
-| --------- | ----------- | ------------------------------------------- |
+|-----------|-------------|---------------------------------------------|
 | `base/`   | `.*`        | `$HOME` level files.                        |
 | `config/` | `.config/`  | Configurations for applications.            |
 | `local/`  | `.local/`   | XDG Base folder: `bin`, `share` and `state` |
@@ -47,32 +61,30 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
 
 ### XDG Variables
 
-| Var                | Default              |
-| ------------------ | -------------------- |
+| Env                | Default              |
+|--------------------|----------------------|
+| `$XDG_BIN_HOME`    | `$HOME/.local/bin`   |
+| `$XDG_CONFIG_HOME` | `$HOME/.config`      |
 | `$XDG_DATA_HOME`   | `$HOME/.local/share` |
 | `$XDG_STATE_HOME`  | `$HOME/.local/state` |
-| `$XDG_CONFIG_HOME` | `$HOME/.config`      |
-| `$XDG_BIN_HOME`    | `$HOME/.local/bin`   |
 
-- `$XDG_BIN_HOME` is a custom `env` for `.local/bin` folder.
+- `$XDG_BIN_HOME` defines directory that contains local binaries.
 - `$XDG_DATA_HOME` defines the base directory relative to which user-specific data
-  files should be stored. If `$XDG_DATA_HOME` is either not set or empty,
-  a default equal to `$HOME/.local/share` should be used.
-- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific configuration
-  files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty,
-  a default equal to `$HOME/.config` should be used.
+  files should be stored.
+  - If `$XDG_DATA_HOME` is either not set or empty, a default equal to
+    `$HOME/.local/share` should be used.
+- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific
+  configuration files should be stored.
+  - If `$XDG_CONFIG_HOME` is either not set or empty, a default equal to `$HOME/.config` should be used.
 - `$XDG_STATE_HOME` defines the base directory relative
   to which user-specific state files should be stored.
-  If `$XDG_STATE_HOME` is either not set or empty, a default
-  equal to `$HOME/.local/state` should be used.
-- The `$XDG_STATE_HOME` contains state data that should persist
-  between (application) restarts,
-  but that is not important or portable enough to the user that
-  it should be stored in `$XDG_DATA_HOME`.
-  It may contain:
-  - actions history (logs, history, recently used files, …)
-  - current state of the application that can be reused
-    on a restart (view, layout, open files, undo history, …)
+  - If `$XDG_STATE_HOME` is either not set or empty, a default equal to `$HOME/.local/state` should be used.
+- The `$XDG_STATE_HOME` contains state data that should persist between (application) restarts,
+  but that is not important or portable enough to the user that it should be stored in `$XDG_DATA_HOME`.
+  - It may contain:
+    - actions history (logs, history, recently used files, …)
+    - current state of the application that can be reused
+      on a restart (view, layout, open files, undo history, …)
 - User-specific executable files may be stored in `$HOME/.local/bin`.
   Distributions should ensure this directory shows up in the UNIX `$PATH`
   environment variable, at an appropriate place.
@@ -81,14 +93,3 @@ The folder structure follows [XDG Base Directory Specification][xdg] where possi
   The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
 
 [xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-
-## Interesting links
-
-### Interesting dotfiles repos
-
-- [dotfiles.github.io/inspiration/](https://dotfiles.github.io/inspiration)
-- [frdmn/dotfiles](https://github.com/github.com/frdmn/dotfiles) - Ansible-based
-  dotfile setup for macOS
-- [mvdan/dotfiles](https://github.com/mvdan/dotfiles) - Here be dragons
-- [vsouza/dotfiles](https://github.com/vsouza/dotfiles) - 🏡 My dotfiles
-- [freekmurze/dotfiles](https://github.com/freekmurze/dotfiles) - My personal dotfiles

base/zshrc

@@ -6,7 +6,7 @@ colors
 setopt correct
 
 # Add completion scripts to zsh path
-fpath=(~/.config/zsh/completion $fpath)
+FPATH="~/.config/zsh/completion:$FPATH"
 autoload -Uz compinit && compinit -i
 
 # Defaults
@@ -49,4 +49,3 @@ have starship && eval "$(starship init zsh)"
 
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
   && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
-

config/astronvim/lua/user/plugins/community.lua

@@ -1,5 +1,7 @@
-return {                      -- Add the community repository of plugin specifications
-  "AstroNvim/astrocommunity", -- example of imporing a plugin, comment out to use it or add your own
+return {
+  -- Add the community repository of plugin specifications
+  "AstroNvim/astrocommunity",
+  -- example of imporing a plugin, comment out to use it or add your own.
   -- available plugins can be found at
   -- https://github.com/AstroNvim/astrocommunity
   {
@@ -27,7 +29,7 @@ return {                      -- Add the community repository of plugin specific
   {
     "folke/trouble.nvim",
     opts = {
-      auto_open = false,
+      auto_open = true,
       position = "right"
     }
   },

config/astronvim/lua/user/plugins/core.lua

@@ -5,20 +5,18 @@ return {
     opts = function(_, opts)
       -- customize the dashboard header
       opts.section.header.val = {
-        "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░",
-        "░░░░░░░░░░▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄░░░░░░░░░",
-        "░░░░░░░░▄▀░░░░░░░░░░░░▄░░░░░░░▀▄░░░░░░░",
-        "░░░░░░░░█░░▄░░░░▄░░░░░░░░░░░░░░█░░░░░░░",
-        "░░░░░░░░█░░░░░░░░░░░░▄█▄▄░░▄░░░█░▄▄▄░░░",
-        "░▄▄▄▄▄░░█░░░░░░▀░░░░▀█░░▀▄░░░░░█▀▀░██░░",
-        "░██▄▀██▄█░░░▄░░░░░░░██░░░░▀▀▀▀▀░░░░██░░",
-        "░░▀██▄▀██░░░░░░░░▀░██▀░░░░░░░░░░░░░▀██░",
-        "░░░░▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄█░░██░",
-        "░░░░░░░▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██░",
-        "░░░░░░░▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀░░",
-        "░░░░░░█▀▀█████████▀▀▀▀████████████▀░░░░",
-        "░░░░░░████▀░░███▀░░░░░░▀███░░▀██▀░░░░░░",
-        "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░"
+        "         ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄        ",
+        "       ▄▀░░░░░░░░░░░░▄░░░░░░░▀▄      ",
+        "       █░░▄░░░░▄░░░░░░░░░░░░░░█      ",
+        "       █░░░░░░░░░░░░▄█▄▄░░▄░░░█ ▄▄▄  ",
+        "▄▄▄▄▄  █░░░░░░▀░░░░▀█░░▀▄░░░░░█▀▀░██ ",
+        "██▄▀██▄█░░░▄░░░░░░░██░░░░▀▀▀▀▀░░░░██ ",
+        " ▀██▄▀██░░░░░░░░▀░██▀░░░░░░░░░░░░░▀██",
+        "   ▀████░▀░░░░▄░░░██░░░▄█░░░░▄░▄█░░██",
+        "      ▀█░░░░▄░░░░░██░░░░▄░░░▄░░▄░░░██",
+        "      ▄█▄░░░░░░░░░░░▀▄░░▀▀▀▀▀▀▀▀░░▄▀ ",
+        "     █▀▀█████████▀▀▀▀████████████▀   ",
+        "     ████▀  ███▀      ▀███  ▀██▀     ",
       }
       return opts
     end,
@@ -47,11 +45,15 @@ return {
         visible = false,
         show_hidden_count = true,
         hide_dotfiles = false,
-        hide_gitignored = true,
+        hide_gitignored = false,
         hide_by_name = {
+          '.idea',
+          '.DS_Store'
         },
         never_show = {
           '.git',
+          '.idea',
+          '.mypy_cache',
           '.DS_Store',
           'thumbs.db'
         },
@@ -99,9 +101,12 @@ return {
       require "plugins.configs.which-key" (plugin, opts)
       -- Add bindings which show up as group name
       local wk = require "which-key"
-      wk.register({
-        b = { name = "Buffer" },
-      }, { mode = "n", prefix = "<leader>" })
+      wk.register(
+        {
+          b = { name = "Buffer" },
+        },
+        { mode = "n", prefix = "<leader>" }
+      )
     end,
   },
 }

config/astronvim/lua/user/plugins/mason.lua

@@ -1,5 +1,6 @@
 -- customize mason plugins
-return { -- use mason-lspconfig to configure LSP installations
+return {
+  -- use mason-lspconfig to configure LSP installations
   {
     "williamboman/mason-lspconfig.nvim",
     -- overrides `require("mason-lspconfig").setup(...)`
@@ -8,7 +9,9 @@ return { -- use mason-lspconfig to configure LSP installations
         "diagnosticls",
       },
     },
-  }, -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
+  },
+  -- use mason-null-ls to configure Formatters/Linter
+  -- installation for null-ls sources
   {
     "jay-babu/mason-null-ls.nvim",
     -- overrides `require("mason-null-ls").setup(...)`

config/exports-apps

@@ -21,6 +21,14 @@ have ansible && {
   x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
 }
 
+# brew configuration
+have brew && {
+  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
+
+  autoload -Uz compinit
+  compinit
+}
+
 # composer, https://getcomposer.org/
 have composer && {
   export COMPOSER_HOME="$XDG_STATE_HOME/composer"

config/git/shared

@@ -12,7 +12,7 @@
   rebase = true
 
 [gpg]
-	format = ssh
+  format = ssh
 
 [alias]
   branchbydate = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
@@ -22,6 +22,7 @@
   nah = !git reset --hard && git clean -df
   reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
   reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
+  recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
   rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
   tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
   undo-commit = reset HEAD~ --soft
@@ -59,4 +60,5 @@
 
 # dotfiles special config
 [includeIf "hasconfig:remote.*.url:https://github.com/ivuorinen/dotfiles.git"]
-	path = ~/.dotfiles/config/git/special/dotfiles ;
+  path = ~/.dotfiles/config/git/special/dotfiles ;
+

config/iterm2/com.googlecode.iterm2.plist

@@ -2,14 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AboutToPasteTabsWithCancel</key>
-	<true/>
-	<key>AboutToPasteTabsWithCancel_selection</key>
-	<integer>0</integer>
 	<key>AllowClipboardAccess</key>
 	<true/>
-	<key>AlternateMouseScroll</key>
-	<true/>
 	<key>AutoHideTmuxClientSession</key>
 	<true/>
 	<key>Custom Color Presets</key>
@@ -344,7 +338,7 @@
 		</dict>
 	</dict>
 	<key>Default Bookmark Guid</key>
-	<string>82636119-EA17-4A26-9AA7-408172F4A9C8</string>
+	<string>B563F48B-314D-48CC-908E-ACA971D430BE</string>
 	<key>DimBackgroundWindows</key>
 	<false/>
 	<key>DimOnlyText</key>
@@ -353,16 +347,14 @@
 	<true/>
 	<key>HapticFeedbackForEsc</key>
 	<false/>
+	<key>HideScrollbar</key>
+	<true/>
 	<key>HotkeyMigratedFromSingleToMulti</key>
 	<true/>
 	<key>IRMemory</key>
 	<integer>4</integer>
 	<key>MaxVertically</key>
 	<true/>
-	<key>NeverWarnAboutShortLivedSessions_82636119-EA17-4A26-9AA7-408172F4A9C8</key>
-	<true/>
-	<key>NeverWarnAboutShortLivedSessions_82636119-EA17-4A26-9AA7-408172F4A9C8_selection</key>
-	<integer>0</integer>
 	<key>New Bookmarks</key>
 	<array>
 		<dict>
@@ -370,6 +362,8 @@
 			<true/>
 			<key>ASCII Ligatures</key>
 			<false/>
+			<key>Allow Title Reporting</key>
+			<true/>
 			<key>Ambiguous Double Width</key>
 			<false/>
 			<key>Ansi 0 Color</key>
@@ -610,26 +604,12 @@
 				<key>Red Component</key>
 				<real>1</real>
 			</dict>
-			<key>Badge Font</key>
-			<string>JetBrainsMonoNerdFontCompleteM-Bold</string>
-			<key>Badge Max Height</key>
-			<real>0.10000000000000001</real>
-			<key>Badge Max Width</key>
-			<real>0.45000000000000001</real>
-			<key>Badge Right Margin</key>
-			<real>10</real>
-			<key>Badge Text</key>
-			<string></string>
-			<key>Badge Top Margin</key>
-			<real>10</real>
-			<key>Blend</key>
-			<real>0.24709154211956524</real>
 			<key>Blinking Cursor</key>
 			<false/>
 			<key>Blur</key>
 			<true/>
 			<key>Blur Radius</key>
-			<real>9.5927277260638313</real>
+			<real>10</real>
 			<key>Bold Color</key>
 			<dict>
 				<key>Alpha Component</key>
@@ -648,11 +628,9 @@
 			<key>Close Sessions On End</key>
 			<true/>
 			<key>Columns</key>
-			<integer>120</integer>
+			<integer>130</integer>
 			<key>Command</key>
 			<string></string>
-			<key>Cursor Boost</key>
-			<real>0.0</real>
 			<key>Cursor Color</key>
 			<dict>
 				<key>Alpha Component</key>
@@ -720,11 +698,9 @@
 				<real>0.80392156862745101</real>
 			</dict>
 			<key>Guid</key>
-			<string>82636119-EA17-4A26-9AA7-408172F4A9C8</string>
+			<string>B563F48B-314D-48CC-908E-ACA971D430BE</string>
 			<key>Horizontal Spacing</key>
 			<real>1</real>
-			<key>Icon</key>
-			<integer>1</integer>
 			<key>Idle Code</key>
 			<integer>0</integer>
 			<key>Jobs to Ignore</key>
@@ -1030,8 +1006,6 @@
 				<key>Red Component</key>
 				<real>0.53725490196078429</real>
 			</dict>
-			<key>Minimum Contrast</key>
-			<real>0.14973958333333334</real>
 			<key>Mouse Reporting</key>
 			<true/>
 			<key>Name</key>
@@ -1057,7 +1031,7 @@
 			<key>Rows</key>
 			<integer>25</integer>
 			<key>Screen</key>
-			<integer>-2</integer>
+			<integer>-1</integer>
 			<key>Scrollback Lines</key>
 			<integer>0</integer>
 			<key>Selected Text Color</key>
@@ -1088,17 +1062,13 @@
 			</dict>
 			<key>Send Code When Idle</key>
 			<false/>
-			<key>Set Local Environment Vars</key>
-			<true/>
 			<key>Shortcut</key>
-			<string>T</string>
+			<string></string>
 			<key>Show Status Bar</key>
 			<true/>
 			<key>Show Timestamps</key>
 			<integer>2</integer>
 			<key>Silence Bell</key>
-			<false/>
-			<key>Smart Cursor Color</key>
 			<true/>
 			<key>Status Bar Layout</key>
 			<dict>
@@ -1107,17 +1077,17 @@
 					<key>algorithm</key>
 					<integer>0</integer>
 					<key>auto-rainbow style</key>
-					<integer>3</integer>
+					<integer>0</integer>
 					<key>font</key>
 					<string>.AppleSystemUIFont 12</string>
 					<key>remove empty components</key>
-					<false/>
+					<true/>
 				</dict>
 				<key>components</key>
 				<array>
 					<dict>
 						<key>class</key>
-						<string>iTermStatusBarJobComponent</string>
+						<string>iTermStatusBarClockComponent</string>
 						<key>configuration</key>
 						<dict>
 							<key>knobs</key>
@@ -1126,22 +1096,55 @@
 								<integer>1</integer>
 								<key>base: priority</key>
 								<real>5</real>
+								<key>format</key>
+								<string>YYYY-MM-dd HH:mm</string>
+								<key>localize</key>
+								<integer>0</integer>
+								<key>maxwidth</key>
+								<real>150</real>
+								<key>minwidth</key>
+								<real>150</real>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>remove empty components</key>
+								<false/>
+							</dict>
+						</dict>
+					</dict>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarHostnameComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>abbreviate-localhost</key>
+								<string></string>
+								<key>base: compression resistance</key>
+								<real>1</real>
+								<key>base: priority</key>
+								<real>5</real>
 								<key>maxwidth</key>
 								<real>+infinity</real>
 								<key>minwidth</key>
-								<integer>0</integer>
+								<string>0</string>
 								<key>shared text color</key>
 								<dict>
 									<key>Alpha Component</key>
 									<real>1</real>
 									<key>Blue Component</key>
-									<real>0.63</real>
+									<real>0.43218994140625</real>
 									<key>Color Space</key>
 									<string>sRGB</string>
 									<key>Green Component</key>
-									<real>0.63</real>
+									<real>0.34513998031616211</real>
 									<key>Red Component</key>
-									<real>0.90000000000000002</real>
+									<real>0.0</real>
 								</dict>
 							</dict>
 							<key>layout advanced configuration dictionary value</key>
@@ -1149,10 +1152,66 @@
 								<key>algorithm</key>
 								<integer>0</integer>
 								<key>auto-rainbow style</key>
-								<integer>3</integer>
+								<integer>0</integer>
 								<key>font</key>
 								<string>.AppleSystemUIFont 12</string>
 								<key>remove empty components</key>
+								<true/>
+							</dict>
+						</dict>
+					</dict>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarSpringComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>iTermStatusBarSpringComponentSizeMultipleKey</key>
+								<integer>1</integer>
+								<key>iTermStatusBarSpringComponentSpringConstantKey</key>
+								<real>0.01</real>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>font</key>
+								<string>.AppleSystemUIFont 12</string>
+								<key>remove empty components</key>
+								<true/>
+							</dict>
+						</dict>
+					</dict>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarSpringComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>iTermStatusBarSpringComponentSizeMultipleKey</key>
+								<integer>1</integer>
+								<key>iTermStatusBarSpringComponentSpringConstantKey</key>
+								<real>0.01</real>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>0</integer>
+								<key>remove empty components</key>
 								<false/>
 							</dict>
 						</dict>
@@ -1165,18 +1224,14 @@
 			<array/>
 			<key>Terminal Type</key>
 			<string>xterm-256color</string>
-			<key>Title Components</key>
-			<integer>512</integer>
 			<key>Transparency</key>
-			<real>0.10293218085106381</real>
+			<real>0.20000000000000004</real>
 			<key>Unlimited Scrollback</key>
 			<true/>
 			<key>Use Bold Font</key>
 			<true/>
 			<key>Use Bright Bold</key>
 			<true/>
-			<key>Use Cursor Guide</key>
-			<false/>
 			<key>Use Italic Font</key>
 			<true/>
 			<key>Use Non-ASCII Font</key>
@@ -1191,12 +1246,6 @@
 			<string>/Users/ivuorinen/Code</string>
 		</dict>
 	</array>
-	<key>OpenArrangementAtStartup</key>
-	<false/>
-	<key>OpenNoWindowsAtStartup</key>
-	<false/>
-	<key>OpenTmuxWindowsIn</key>
-	<integer>1</integer>
 	<key>PointerActions</key>
 	<dict>
 		<key>Button,1,1,,</key>
@@ -1230,16 +1279,26 @@
 			<string>kNextWindowPointerAction</string>
 		</dict>
 	</dict>
+	<key>PreserveWindowSizeWhenTabBarVisibilityChanges</key>
+	<true/>
+	<key>Print In Black And White</key>
+	<true/>
 	<key>PromptOnQuit</key>
 	<false/>
+	<key>SeparateStatusBarsPerPane</key>
+	<false/>
 	<key>SmartPlacement</key>
 	<true/>
 	<key>SoundForEsc</key>
 	<false/>
-	<key>SplitPaneDimmingAmount</key>
-	<real>0.59999999999999998</real>
+	<key>StatusBarPosition</key>
+	<integer>0</integer>
 	<key>TabStyleWithAutomaticOption</key>
 	<integer>5</integer>
+	<key>ThreeFingerEmulates</key>
+	<true/>
+	<key>TmuxUnpauseAutomatically</key>
+	<true/>
 	<key>VisualIndicatorForEsc</key>
 	<false/>
 	<key>kCPKSelectionViewPreferredModeKey</key>