Emacs: use newer projectile variable name

Emacs: make underscore part of word in c-like modes

javascript: ensure make is available

Make sekey usage darwin-dependent

i3: don't force Firefox to open on workspace 4

Emacs: enable npm-based tools in json files

dev/javascript: fix reference to node2nix packages

dev/web: use pre-packaged stylelint

Fix syntax error

Move and split javascript module to dev/javascript,web

dev/base: add yaml langserver

Move dockerfile langserver to dev/base

emacs: enable racket, racket-xp modes

base: install vimv

base: install abduco & dvtm

dev/base: enable shell auto-formatting

dev/base: remove discount (markdown)

Add script to generate SSH keys on secure enclave

Update private submodule

javascript: rename node alias to nodejs

Emacs: switch to a mildly-colourful theme (doom-homage-white)

satoshipay: use caddy v2

Emacs: use package-quickstart

SatoshiPay: use newer version of docker-compose

Remove unused cursor theme

Use system nodejs version for node2nix packages

javascript: specify pnpm version more precisely

syncthing: run as user service

Extract always-requested system packages to module

base: ensure cachix is installed

javascript: use zsh to interpret package scripts

satoshipay: don't run postgres as a system daemon (use docker)

Emacs: open tsx files via typescript-mode by default

bare-metal: add more network optimisations

javascript: update pnpm to 5.15

Emacs: set up format-all-mode with default formatters

Emacs: add pair for elisp docstring `+' pairing

Emacs: only make / a surround pair in javascript-mode

Emacs: assume html files are django-like templates

zsh: follow symbolic links with ll

darwin: install and use sekey

Use optimised kernel and CPU governor on PCs (laptops and desktops)

Disable default DHCP when connman is used

prefect: use connman

prefect: automount NTFS filesystems via autofs

Extract wireless setup fvrom connman.nix to iwd.nix

connman: use a nicer management UI

connman: use updated nixos schema

prefect: disable mail setup

Add nix-community cache declaratively

Remove system "trillian"

Move common nix-darwin config to darwin.nix

Extract always-requested system packages to module

base: ensure cachix is installed

prefect: use linux-zen instead of vanilla 5.10

prefect: enable bluetooth

laptop: merge imports

bare-metal: don't force bfq module to load

Optimise startup on machines with / on NVMe

bare-metal: set optimal IO scheduler per disk type

Extract bluetooth settings from laptop module

Ensure mouse settings are applied

prefect: load Model 01 module

prefect: migrate from deprecated networking.useDHCP

prefect: update IPv6 ULA prefix in firewall rules

base: ensure vim is always installed

satoshipay: remove mongodb

nixpkgs: pass config to nixpkgs-unstable

prefect: remove samba setup

prefect: switch to AMD

Add configuration for new machine

Emacs: load magit immediately

zsh: fix HISTFILE setup

zsh: cache expensive completions to disk

Use gls to call prefixed coreutils rather than git ls-files

TabNine: provision registration key from private repository

zsh: remove mcfly

Emacs: remove ivy-prescient

Emacs: fix evil warnings about undo-system

TabNine: move back to .local/tabnine/

Emacs: remove deprecated evil-magit package

Add new system file for mba

base: use default neovim package

Fix light-themed CLI util display in X terminals

Fix coc.nvim errors on non-dev systems

TabNine: configure coc

Don't assume usages of XDG_ will be expanded

neovim: configure coc.nvim via nix

TabNine: move binaries to XDG data directory

Update SSH config

darwin: stop Terminal saving zsh sessions on exit

Use nixpkgs for more NPM packages

Emacs: unbind C-j in company

TabNine: update to 3.2.28

Emacs: configure feature-mode

zsh: enable working directory titlebar updates on darwin

xterm: start with bitmap fonts

prefect: remove DNS search domain

Update SSH setup

Simplify mouse acceleration setup

xresources: fix display of light themes in CLI tools

Add stellar nodes to .hosts

zsh: Install mcfly via home-manager option

Emacs: install and enable ivy-prescient

Emacs: don't show recent tags in magit

zsh: don't complete local users in ssh commands

zsh: use .hosts for hostname completion

Remove private token envvars

Save more lines in all terminals

Fix ghq get creating odd directory structure

Revert "satoshipay: let macports manage kubectl on darwin"

Emacs: start server

Update pnpm to v5.4.11

satoshipay: enable docker container->host connections

Move barrier to workspace 10

i3: add workspace 0 (grave)

i3: allow moving windows to workspace 10

Emacs: fix undo

Emacs: use undo-tree as undo system in evil

prefect: autostart work applications

Move workspace assignments to i3 module

prefect: share Music and Videos folders via CIFS

satoshipay: update kubectl-aliases

zsh: remove less-used plugins

zsh: improve startup time by managing completion manually

darwin: fix terminal display of Unicode combining chars

trillian: move zsh setup to darwin.nix

Emacs: Workaround format-all errors in templated yaml files

satoshipay: install DigitalOcean CLI tool

satoshipay: let macports manage kubectl on darwin

prefect: enable syncthing

prefect: enable local network postgres connections

zsh: Fix invisible text in mcfly

Emacs: remove company-lsp (obsolete)

Emacs: fix magit error

Update TabNine to v3.1.20

javascript: remove gnumake

Emacs: fix eldoc-box initialisation

prefect: boot Windows by default

satoshipay: add alias to show kubernetes context & namespace

Use remake instead of make

Update node2nix packages

neovim: configure smart completion

prefect: update stateVersion

base: remove unnecessary hosts entries for self

networking: specify search instead of domain

gaming: enable steam module

Upgrade builders for NixOS 20.09

zsh: Enable mcfly for intelligent history searches

Reformat zsh.nix

Reduce nix GC aggressiveness when calling `ngc` aliases

zsh: package and install command-help

extra-packages: use pkgs.callPackage instead of import

Emacs: replace prettier-js and sqlformat with format-all

Update TabNine config

Update TabNine to v3.1.11

Update private submodule

Update tabnine darwin hash

Install ldns on all non-darwin systems

base: add zstd for tar extraction

update-tabnine: fail more informatively

TabNine: update to v3.1.4

NextDNS: Don't enable by default

Emacs: optimise text flowing

trillian: explain disabled completion setting

trillian: read system default zprofile

Cleanup trillian zsh configuration

zsh: add more home-manager aliases

satoshipay: remove redis

Emacs: improve lsp key help

Emacs: fix lsp not initialised in ts files

satoshipay: tweak database permissions

prefect: simplify dual-booting with grub2

trillian: don't use Nix's gnupg-agent (prefer GPGTools)

Emacs: don't install desktop file on darwin

satoshipay: ensure postgresql tools are installed

zsh: include untracked files in fzf ^X^F binding

zsh: remove g alias for ripgrep

base: add commentary and vim-surround vim plugins

Update private submodule

Emacs: enable editing of root-owned remote files

Update private submodule

Update private submodule

Add server config for home-manager

zsh: show/hide user and host depending on SSH status

zsh: skip kubernetes rprompt logic when connected via SSH

Emacs: add magit-log-buffer-file shortcut

Emacs: initialise sqlformat hook correctly

nextdns: support local DNS lookups (based on common router IPs)

nextdns: support /etc/hosts

nextdns: remove darwin support

Update TabNine to v3.0.8

zsh: Fix missing leading characters in fzf file search

zsh: Update plugins

SatoshiPay: set up PostgreSQL server

Emacs: format SQL files on save

zeroconf: enable publishing

Emacs: move relevant config to early-init

BC! Emacs: move config to XDG config dir

Update TabNine to v2.9.4

Fix local mongo connection issues

Remove prettier_d

Emacs: remove LSP workaround

Emacs: update to unstable channel (27.1)

Enable cross-platform use of unstable channel

base: don't install pre-installed utilities on macOS

Add script to ease TabNine updates

Update TabNine to v2.9.3

Update pnpm to v4.14.0

Use ripcord derivation from nixos-unstable

Fix syntax error

Emacs: don't bury magit buffers with ESC

Remove unused development packages

Remove dangling reference to yaml-language-server

Update tabnine to v2.8.12

javascript: remove yaml-language-server

zsh: add alias for nix-shell

Set ZSH history file globally

prefect: support trezor

prefect: mount NTFS filesystems

Emacs: add keybind for lsp-ivy-workspace-symbol

Emacs: fix company configuration (broken by tide load side-effects)

Reduce number of globally-installed javascript packages

TabNine: update to v2.8.9

trillian: import base ssh settings

Fix error when running home-manager outside of X

zsh: fix XDG_DATA_HOME error on first install

Update stateVersion on prefect (re-installed)

Extract music packages into separate file

Emacs: Add lsp-ivy for nice goto-workspace-definition command

systemd-boot: Fix broken UEFI install

zsh: create function to add project to emacs

git: set GitHub username for ghq

Reformat emacs init file

TabNine: add new configuration option

Emacs: sort projectile results by mtime

Emacs: improve uniquified buffer names

Update TabNine

keyboard: remove norman layout

zsh: show kubernetes status in all satoshipay repositories

zsh: leverage declarative installs instead of checking for binaries

zsh: add secondary binding for switching to project directories

zsh: prefer user custom bin folder in path

zsh: fix history migration

Fix SSH identity override

Optimise rofi

Remove rofi-pass

i3: run rofi on keydown rather than keyup

javascript: add shell alias for updating dependencies to latest

ssh: add initial settings

Emacs: add tide for live TS type checking

javascript: Install stylelint

Update gaming setup

Emacs: configure emmet-mode

prefect: allow updating EFI variables

Emacs: improve window-splitting behaviour

Update private submodule

Update TabNine to version 2.8.5

javascript: add stylelint

zsh: move history (with migration path)

javascript: move pnpm-store from $HOME

Remove Keybase

Set XDG directories

Update TabNine to v2.8.3

javascript: enable running npm inside Emacs

Emacs: set default tab-width

Update private

Emacs: search hidden files automatically with ripgrep

javascript: add pnpm multi uninstall alias

Fix syntax errors

Move chat programs into user module

nix: update all channels before auto-upgrade

Emacs: fix trash/thread keybinds in mu4e

Emacs: fix lsp <leader> key

Move private submodule away from Keybase

Update private settings

Add neovim fallback editor

Make cleanup and upgrade task scheduling work-specific

zsh: hide user name in prompt display

zsh: disable unnecessary prompt features

zsh: update plugins

Emacs: remove relative-buffers package (404)

Switch to Capitane cursors

javascript: add alias for pruning production dependencies

Update TabNine to v2.8.1

satoshipad: fix luks loaOf deprecation warning

Remove unused system wine module

Emacs: enable git-gutter after tweaking fringes

TabNine: upgrade to v2.7.0

Fix for NixOS 20.03 deprecations

nvidia-gpu: ensure nouveau module is not loaded

i3: use Xorg version of Terminus font

xserver: remove deprecated fontconfig ultimate settings

Remove pgadmin3

Emacs: re-add company-lsp

xresources: configure and enable vector fonts

Emacs: add lsp-mode shortcut to <leader>

javascript: add ava shortcuts

prefect: add hardware tweaks from nixos-hardware

Merge branch 'master' of https://git.alanpearce.eu/nixfiles

Add more common shell aliases

Emacs: reduce fruit salad effect, regardless of theme

prefect: set cpu bias to performance

prefect: disable syncthing

prefect: fix screen tearing

i3: fix config file link

Emacs: Install doom themes

trillian: fix darwinConfig

private: update ssh targets

Emacs: make deletion of modified vc-backed files easier

Remove infrastructure module

Reorganise folder structure to remove hidden files

Update TabNine to v2.6.0

ripcord: update to v0.4.24

Prefect: set up for work

satoshipad: disable printing

thinkpad: enable fan control

Emacs: use kubel in place of kubernetes.el

Update pnpm to 4.11.6

TabNine: Update to v2.5.1

keyboard: use qwerty,norman

satoshipad: remove unused configuration imports

xserver: change font stack

darwin: install watch and coreutils-prefixed

trillian: use darwin settings

Shell: make compatible with darwin

Move accounting module to user/

dunst: use left-click to perform notification actions

Emacs: optimise file loading at startup

Emacs: optimise GC during minibuffer usage

zsh: optimise startup

zsh: precompile plugins

zsh: fix startup slowness (google-cloud-sdk)

xserver: Fix fontconfig config error

shell: remove duplicate compinit call

Emacs: enable previewing buffers when switching

Emacs: tell doom-modeline to use projectile

Emacs: don't load git-gutter

Emacs: remove minions

Emacs: optimise startup

Emacs: remove tabnine load-path override

Emacs: fix company-tabnine startup

Emacs: optimise startup and GC

Emacs: optimise lsp setup

Emacs: use proper form of general keymap mapping

Emacs: fix lsp

Emacs: use amx without smex history migration

Emacs: remove deprecated lsp variable

TabNine: update to v2.3.5

xresources: make xterm 256 colour and utf-8 aware

zsh: make ds() safer

Remove system private dir

Emacs: remove use-package calls for non-packages

Emacs: ensure theme package is loaded

Emacs: improve startup speed

xserver: remove unused fonts

xresources: enable opening links in browser

xresources: update current environment via home-manager switch

Use nix-shell to run node2nix

TabNine: Upgrade to v2.2.2

javascript: update pnpm to v4.9.3

zsh: remove unused better-npm-completion plugin

javascript: add aliases for pnpm (multi) install-test

Emacs: use emacs-nix overlay for more up-to-date packages

javascript: add vscode-json-languageserver

Update javascript packages

satoshipay: update kubectl-aliases

Emacs: remove beancount

Configure golang dev environment

javascript: use node-gyp packages from node 12

laptop: configure lid power actions

TabNine: update config according to schema

Emacs: make projectile-kill-buffers ignore special buffers

Update prettier_d to a working commit of v6

TabNine: Enable local ML-based completions except on satoshipad

Update TabNine to 2.2.1

SatoshiPay: don't install docker compose on macOS

trillian: disable systemwide zsh completion

Emacs: fix evil-collection warnings

Accounting: remove fava

Emacs: improve company tab handling

Emacs: use web-mode for html

Emacs: Set css inndentation

Emacs: fix unbound regex in tsx mode specification

Emacs: improve flycheck responsiveness

Emacs: disable lsp-ui-doc-mode properly

Add module for browsing CIFS shares

Emacs: add slash surround pair

user-interface: remove hexchat

zsh: remove careful_rm

Emacs: bind C-a/C-q to change number at point like vim

Emacs: install evil-matchit for better jumping between begin/end

Emacs: configure evil-embrace to supplement evil-surround

Emacs: show number of search matches in minibuffer or modeline

printing: install configuration panel

satoshipad: set a clearer avahi hostname for other people

Emacs: tweak startup ordering

autorandr: make docked-open similar to docked-close

Emacs: use emacs state in ledger-reconcile buffers

Update tabnine to 2.1.22

window-manager: startup nmapplet

Sync .hosts file

Update personal email

Move kubernetes shell configuration to kubernetes.nix

Emacs: delay completion when not using TabNine

Install npm-merge-driver instead of relying on npx

satoshipay: fix conditional git user.email setting

Add node2nix packages as overlay

Emacs: remove unused monochrome-ish themes

Update private e-mail setup

Emacs: increase minimum width of windows before splitting

Emacs: update relative-buffers configuration

Revert "Emacs: remove relative-buffers"

tabnine: add crude management of tabnine installation and config

tabnine: switch config directory by system type

Mail: fix mail fetch timer to startup time

Autotrandr: set primary monitor in docked-close configuration

Emacs: remove old eshell alias file

Emacs: create eshell module to handle aliases

Emacs: Fix init errors in eshell configuration

window-manager: ensure xterm is actually installed

xresources: add recommended sixel configuration

Emacs: increase max length of VCS info in modeline

Emacs: add global keybinding for eshell-toggle

Emacs: start eshell in insert mode

Emacs: bind <leader>c to C-c, whatever that may do

Emacs: disable icons in treemacs

Emacs: use tab, not enter for completion

Update private submodule

prefect: enable autologin

Add script to fetch secrets before git config can be set

Emacs: fix company-mode initialisation

Emacs: add secondary shortcut to spam folder

Add e-mail setup to private submodule

git: Ensure keybase:// repositories can be used as submodules

Simplify satoshipay setup

Emacs: Fix evil shifting

Move secrets to keybase git submodule

Emacs: Replace remaining customize calls with setq

Emacs: use setq instead of :custom

Emacs: Show column number alongside line number in

Emacs: remove relative-buffers

accounting: install hledger

Emacs: right-align completion annotations

Emacs: set defaults for evil pre-init variables

Emacs: use sliders icon for minion mode-line-lighter

Emacs: save files silently

Emacs: replace moody with doom-modeline

Emacs: keep menu-bar-mode explicitly enabled on darwin

Emacs: remove basic-theme

Emacs: don't load site-lisp when byte-compiling

nextdns: fix infinite recursion on NixOS

darwin: alias drill to dig

nextdns: fix darwin incompatibility

stubby: log errors

xserver: improve font setup

javascript: add pnpm dislink alias

satoshipay: install kubetail

Emacs: Enable company-lsp

Emacs: fix undefined function warning

tabnine: fixup toml file

Merge branch 'master' of origin/master

git: ignore tabnine_root globally

Stop tabnine from ascending past the root

xserver: disable sound themes

ripcord: add a desktop item

ripcord: use standard package naming convention

Update ripcord to 0.4.21

satoshipad: set browser to Firefox Developer Edition

satoshipad: start and assign ripcord at startup

Fix variable definition

xserver: remove extra theme packages

xserver: prefer corefonts to substitutes

Emacs: auto-cleanup whitespace in ledger buffers

prefect: fix missing keyboard settings

NVidia: run compton to avoid window sizing issues

nextdns: fix infinite recursion

Emacs: improve ledger setup

Update ripcord

Install ripcord on work machines

Allow extra-package overlay to be used in home-manager

Add ripcord package

node2nix: upgrade to node 12

javascript: don't override node passed to node2nix

javascript: fix package quoting

zsh: Don't immediately share history between terminals

javascript: Upgrade to node 12

javascript: clarify packageset name

javascript: Ask packages not to phone home

javascript: remove tern

javascript: split node2nixPackages

Configure nextdns usage via module

Emacs: setup ledger and evil-ledger

Emacs: fix mu4e setup

zsh: fix missing python error

darwin: use emacs-macport

Rename overlay

xserver: configure font stack based on antialias setting

development: install yamllint

Emacs: enable progressively-nicer goto-{def,ref} commands

Emacs: remove lsp-flymake setup

Emacs: silence evil-want-keybinding error when byte-compiling

Emacs: declutter lsp-ui sideline

zsh: update kubectl-aliases

xresources: add alt+shift+{c,v} for clipboard copy/paste

Add lumen package and autoloaded overlay

git: enable commit graphs (v2.23+)

thinkpad: remove config duplicated from nixos-hardware

satoshipad: update CPU throttling fix

network-manager: fix syntax error

laptop: fix autorandr failing at startup

Remove missing zsh user option

javascript: fix pnpm add alias

xserver: remove some unwanted bitmap fonts

Add missing file

Emacs: reduce flycheck frequency

Add netlify-cli to javascript packages

Split network-manager and kresd

sxhkd: fix play keybind

Merge remote-tracking branch 'origin/master'

Fix nixos not using overlayed firefox packages

Nix: Remove traces of unstable usage

Emacs: enable flycheck automatically in lsp modes

javascript: enable alias expansion with pmx alias

zsh: update kubectl prompt setup

shell: remove system compinit

Emacs: use prettier with js files

nix: use localised Firefox builds

Emacs: limit node_modules recursive upwards search

xresources: Enable clipboard-based copy and paste in xterm

xresources: make alt/meta key usable for shortcuts

xresources: apply XTerm settings to UXTerm

SatoshiPay: use web browser for Slack

javascript: Update pnpm to v4.1.7

user-interface: switch to xterm

Use single terminal config variable

xresources: configure xterm backspace

network-manager: switch stub resolver to kresd

javascript: make pi alias only install current directory packages

laptop: don't restart bluetooth when switching generations

sxhkd: Use playerctl to manage music players

satoshipad: Only assign firefox-devedition to i3 workspace 2

zsh: update git aliases

zsh: add cg=cd-gitroot alias

Add aliases for new git switch/restore commands (v2.23)

zsh: add gm=git merge alias

zsh: remove gi=git alias

Remove cachix

zsh: don't record commands starting with spaces

thinkpad: fix non-operational fan speed scaling

rofi: use dmenu interface for networkmanager_dmenu

Merge remote-tracking branch 'origin/master'

network-manager: use unbound+stubby for cached DNS-over-TLS

Simplify gcloud completion setup

intel-gpu: switch back to intel driver

Move javascript aliases to javascript file

zsh: Add further nix aliases

Don't use pkgsUnstable unnecessarily

zsh: install git and -lfs, even on darwin

development/base: add nix development packages

passwords: add keyring cli package

Replace parts of T470s configuration with nixos-hardware

thinkpad: enable firmware updates

rofi: use Arc theme

dunst: use rofi as dmenu

dunst: fix format option

rofi: create dmenu alias

development/base: remove go

development/base: replace checkbashisms with shellcheck

xserver: add bitmap fonts

user-interface: use keyring-based ssh agent

base: use stable version of sd

zsh: use dc function for docker-compose aliases

zsh: add npm aliases

zsh: add docker aliases

Update user README

Remove configuration for marvin

Move autorandr to system

Fix X not starting on T470s

window-manager: fix syntax error

user-interface: remove compton

Emacs: add ex command for plain ripgrep

Ignore nix-build results

nix: let wheel group view build traces

Fix e-mail address override

Set an initial password for VMs and new installs

Choose EMAIL via home-manager

Prefer firefox to -devedition

Move Firefox to userspace

Update prefect stateVersion

Make changes for release 19.09

zsh: add alias pl=pnpm ls

zsh: add alias gfa=git fetch --all

zsh: add pnpm run build alias

zsh: use pnpm-add for aliases

zsh: add more nix-channel aliases

Emacs: trigger git-gutter updates with magit actions

nixos: add aliases for sudo + nixos-* commands

darwin: disable terminal last login message

Use latest release of agkozak prompt

zsh: Don't override agkozak prompt with fallback

zsh: remove lunchy (unused)

Replace zplugin with home-manager zsh.plugins

zsh: Fix fallback prompt

Fix mail setup error on other machines

zsh: Add aliases for nix-channel commands

Unify mail setup

Remove obsoleted file

zsh: add pnpm-based aliases

zsh: use more history for command analysis

Remove fast-syntax-highlighting

Emacs: show flycheck errors in sideline

Emacs: setup flycheck like flymake and prefer it in lsp-ui

Emacs: fix wrong mu version

Extract TabNine LSP config into module

mv modules settings

Emacs: use single configuration file, compiled by home-manager

zsh: Fix zplugin compilation warning

Emacs: remove exec-path-from-shell. Not necessary with home-manager

Emacs: separate files to link

Emacs: replace ns-auto-titlebar with simple code

Inline TabNine configuration

Trillian: run gc as user

Use nixpkgs as unstable on darwin

Don't try to install vim on darwin

zsh: add aliases for git reset

zsh: fix home-manager help alias

Emacs: enable dired-git-info, bound to )

Emacs: hide dired details by default

i3: fix manual locking

Fix i3 issues on satoshipad

i3: add missing default keybindings

zsh: add alias for home-manager-help

Import and modularise i3 config

xserver: allow use of Terminus as TTF

user-interface: install sshfs

Add shell aliases for common development and administration tasks

Ignore build artifacts

Move mosh to user space

Move darwin configuration to user

zsh: make l1 really simple

zsh: move current aliases to home-manager

zsh: Remove unused ec alias

zsh: remove ls wrapper

zsh: Don't add colour to ls output

Add missing references to user-interface module

Fix errors in passwords modules

Remove support for GNU ls on darwin

Purge unstable from system/

Fix whois conflict

Move shell and UI packages to user

Move gaming packages to user

Move password module to user

Fix overzealous find/replace

Optimise zsh startup

zsh: remove zplugin module check

zsh: import zplugin to home-manager

user-interface: ensure zsh has access to completions

Use home-manager where possible for zsh configuration

zsh: source home-manager environment

satoshipay: disable broken GUI packages on macOS

Import emacs package to home-manager configuration

Re-organise development configuration

Support unstable overlay on non-nixos systems

Inline rofi configuration

Delete unused rofi-pass configuration

Remove configuration for unused terminals

Inline sxhkd config

Inline ledger configuration

Combine javascript configurations

Move dotfile-related packages to home-manager

Remove stow and scripts

Emacs: solve home-manager logic difference

prefect: use nixos config

Simplify console keyboard config by using Xkb config

Enable home-manager HTML manual

Set session variables across all platforms

Move satoshipay packages to home-manager

Move javascript package setup to home-manager

Merge duplicate xkbOptions definitions

Move Emacs to user configuration

Import nixos-unstable as overlay

dunst: add missing configuration

dunst: show newlines

Simplify nix configuration

Migrate git config to home-manager

user-interface: use OpenGL for compton

prefect: fix networking.domain

xserver: bind capslock to escape

Create private directory

Add trillian user configuration

installer: explain failures

Migrate dunst to home-manager

Add 'system/' from commit '5016c7440ad771fd990e1aa142fc4de0bdc382bd'

Add 'user/' from commit 'a261579a74bc3bf9ec673ef190f1ec4bb625b86b'

Initial commit

Remove TabNine configuration file

Create initial configuration for satoshipad

Ignore build artifact

Create initial configuration for prefect

Create shim home-manager modules

Prepare for home-manager migration

Cleanup unused dotfile categories

Emacs: display flymake errors in echo area

zsh: alias pino to pino-pretty

zsh: remove bunyan alias (installed as system package)

Emacs: add kill-buffer keybind

zsh: hide loading message for kubectl-aliases

Setup networkmanager_dmenu

Emacs: add binding for evil-avy-goto-symbol-1

Merge branch 'master' of https://git.alanpearce.eu/dotfiles

Emacs: parse ANSI colour codes in compilation (e.g. tsc) buffers

zsh: use pnpx for javascript packages

zsh: Remove docker-compose completion

sxhkd: map audio buttons to cmus-remote

Emacs: delay loading of mu4e

Emacs: show prettier errors in echo area

Emacs: fix typo

Emacs: optimise startup time

zsh: fix zplugin module detection logic

xresources: configure xst

i3: launch updated xst

zsh: Tweak plugin loading

zsh: conditionally lazy load docker-compose and kubernetes plugins

zsh: enable zplugin reporting

zsh: load zplugin module if available

Emacs: increase line-spacing

zsh: add aliases for ava with --tap

zsh: remove ava-ts aliases

i3: use firefox developer edition

xresources: give st a small amount of padding

i3: use bitmap fonts

termite: use `compile` to reload configuration

i3: Use xst/st as terminal

i3: use xautolock as locker

xresources: remove padding in xst

xresources: normalise font configuration

i3: Remove ssh option from rofi

Emacs: add smerge hydra

Emacs: fix missing projectile hydra options on first call

Emacs: disable evil-quickscope in git-rebase mode

trezor: use ed25519 curves for SSH

TabNine: add haskell language server

Emacs: Disable mu4e if missing mu

Emacs: add dockerfile and yaml language servers

TabNine: add dockerfile and yaml language servers

Emacs: improve company + tabnine setup

Emacs: auto-find monorepo sub-projects

Emacs: fix prettier_d config

zsh: improve docker-compose setup

zsh: improve argument-killing widgets

autorandr: remove DPI setting

autorandr: Split docked config into -open and -closed

Emacs: reformat

Emacs: make eyebrowse mode-line indicator more compact

Emacs: pick first mu4e context

Emacs: use typescript parser for prettier_d

Emacs: enable projectile-ripgrep to be used

Emacs: set default projectile search to ripgrep

Emacs: make mu4e indexing quieter and more efficient

xresources: use Babita Oil theme

Emacs: configure MTA

Emacs: fix mu4e UID problem

Emacs: use partial completion in eshell

Emacs: fix mu4e at work

Emacs: fix winner keybindings

Emacs: configure eshell-toggle

Emacs: do nothing after switching to new workspace

zsh: Remove yarn wrapper

Emacs: copy basic zsh aliases to eshell

zsh: remove unused aliases

Emacs: Simplify modeline display

Override system monospace fonts

Emacs: fix deprecation warning

Emacs: auto-update mu4e

Emacs: moodify eyebrowse

Emacs: pick work context automatically on satoshipad

Re-add e-mail setup

Xresources: Switch to DMZ cursor theme

Emacs: setup esh-buf-stack after eshell

Emacs: remove trash function

Emacs: setup ws-butler

Emacs: reduce byte-compiler warnings

Emacs: enable company-tabnine at startup

i3: prioritise commands over windows in rofi

i3: bind Cmd/Super + w to kill

Emacs: improve eshell setup

Emacs: ensure prettier_d respects configuration

Emacs: delete outdated Makefile

zsh: remove autopair to enable completion in braces

Emacs: use prettier_d if available

Emacs: use tabs in makefiles

Emacs: make tab key also indent

git: add .git to .gitignore to improve rg --hidden

Emacs: Ensure no byte-compile warnings for string-trim

Emacs: use preloaded trim function

Emacs: load counsel-projectile earlier

zsh: configure careful_rm to trash files under $HOME

Emacs: run local checkout of company-tabnine

TabNine: update configuration

Emacs: configure lsp-mode for haskell

Emacs: ignore (p)npm lockfiles in projectile

Emacs: don't auto-enable prettier in JS files

Git: add lfs config

Emacs: make company case-{preserving,sensitize}

Termite: increase yellow contrast

TabNine: add more language server configurations

Emacs: split windows horizontally, never vertically

Emacs: remove sudo prompts when reading Emacs source

Emacs: tweak window settings

Emacs: don't automatically byte-compile custom.el

Emacs: remove magit section highlighting

Emacs: disable hl-line-mode

Emacs: remove magit section indicators from fringe

Emacs: switch to almost-mono-white theme

Emacs: remove company-lsp

Emacs: run exec-path-from-shell before other :init steps

Fix TabNine adoption

Emacs: enable LSP in more modes

Emacs: configure flymake-diagnostic-at-point

Add TabNine configuration

Emacs: fix company-tabnine/lsp interaction

Rofi: make matching more predictable

Emacs: don't clobber minibuffer completion

Emacs: Fix lsp javascript setup

Emacs: appease the byte compiler

Emacs: optimise exec-exec-path-from-shell init

Emacs: add keybind to bypass company-tabnine

Emacs: fix lsp configuration

Emacs: enable lsp in javascript-mode

Emacs: appease byte-compiler

Emacs: setup nix-update

Emacs: update company setup

Emacs: fix exec-path on macOS

Add Trezor-based GnuPG configuration

adopt: fix on macOS

GnuPG: switch to OpenPGP keyserver

Emacs: configure "transparent" titlebars on macOS

Emacs: default crux-reopen-as-root-mode off

Emacs: always show eyebrowse indicator

Emacs: disable evil-company-tng again

Emacs: properly disable snippet warning in lsp-ui

Emacs: Don't normalise case of dabbrev completions

zsh: remove EDITOR override

Emacs: fix missing keymap-package autoload

Emacs: tweak lsp-ui configuration

Emacs: disable evil-quickscope in magit-mode

Emacs: enable winner-mode

Emacs: disable tabs

Emacs: use company-tng

Emacs: use correct customize function

Emacs: Enable swiper

Emacs: correctly organise minibuffer/modeline code

Emacs: define some ex commands

Emacs: fix eyebrowse init

Emacs: appease the byte compiler

Emacs: configure avy to focus on current window

Emacs: defer more packages

Emacs: fix keybinds

Emacs: appease evil-collection config check

Emacs: change completion mode

Emacs: fix leader in magit

Emacs: fix evil/evil-collection pre-init

Emacs: fix window config

Emacs: remove unused helpers

Emacs: rework config

i3: update startup programs

Emacs: fix nix indentation

Emacs: Fix startup errors

Emacs: always ignore node_modules in projectile

Emacs: fix startup error

Emacs: Remove call to uninstalled evil-mu4e package

Emacs: Improve contrast of inactive buffer modeline and (mini)buffer

Emacs: Remove github-only open-pull-request function

Emacs: Display flycheck tooltips for longer

Emacs: Bind <leader> x to C-x keymap

Emacs: Make minions lighter nicer

i3: Add startup applications

i3: Auto-assign windows to workspaces

Emacs: bind help-map to <leader> h

Termite: Enable "infinite" scrollback

zsh: re-add wprop alias

Emacs: prettify mode line with moody

Emacs: clarify minions mode-line lighter

Emacs: replace diminish with minions

Only install nix-zsh-completions on non-NixOS + Nix setups

Revert "Recreate autorandr config"

zsh: lowercase git branch for kubernetes commands

i3: use termite

Recreate autorandr config

termite: Create initial config

i3: switch to mate-terminal

Emacs: Explicitly enable TIDE completion

autorandr: Don't restart i3 on monitor hotplug

Bind workspaces to outputs

autorandr: set primary monitor when docked

i3: Add workspace move commands

i3: remove gaps

Remove mail setup

Remove mu4e

zsh: Add kubernetes release detection

zsh: Sort pending deployments

Emacs: remove non-working LSP setup

Decrease laptop DPI

Decrease Emacs font size

xmodmap: Remap caps lock to escape

zsh: Improve pending_deployments alias

Emacs: ignore package-lock.json in projectile

git: add sp: URL alias

git: rebase by default, except on master

zsh: Hide rprompt from copy/paste

zsh: add aliases for common npm package commands

Emacs: fix crux command shortcuts

Emacs: Configure k8s-mode

Git: fix SatoshiPay auto config include

Git: remove bulkworkspaces setup

Emacs: improve macOS chrome display

JavaScript: always use HTTPS registry

Emacs: Fix LSP setup

zsh: Replace kubectl-aliases with my own fork

zsh: Re-add kns and kx aliases

zsh: replace dbz/kube-aliases with ahmetb/kubectl-aliases

zsh: Add pending_deployments alias

Emacs: Set evil-shift-width correctly

npm: Disable update notifications

Emacs: remove modeline configuration

Emacs: Tweak startup

nix: Remove node-packages overlay

nix: Remove nixpkg overrides

zsh: Don't set emacsclient as EDITOR unless present

zsh: Install zsh-you-should-use

zsh: Install zsh-nix-shell

zsh: Fix ls -l on macOS

zsh: Fix kube-aliases fixup

Emacs: add mu4e "open in browser" action

Emacs: stop mu4e asking silly questions

mbsync: Improve gmail folder layout

npm: don't rebuild bundles all the time

Emacs: search hidden files with counsel-ag

Merge branch 'master' of https://git.alanpearce.eu/dotfiles

zsh: Enable watch with aliases

zsh: Show kubectl namespace when in a kubernetes folder

zsh: auto-create HISTFILE dir on startup

zsh: Fix SSH optimisation

zsh: remove unused OS compatibility

zsh: Optimise plugins for ssh/mosh connections

zsh: Fix SSH_AUTH_SOCK setting without gpgconf

zsh: Update zplugin init code

zsh: cleanup

zsh: optimise startup

zsh: Set a basic fallback prompt

zsh: Add calc plugin

zsh: install autosuggestions

mlterm: Make colours nicer

zsh: Install careful_rm, cd-gitroot

zsh: Fix kube-aliases help

zsh: add kx=kubectx alias

zsh: Optimise startup

zsh: Optimise startup

zsh: Add kube context to prompt

zsh: Use agkozak prompt

zsh: simplify OMZ snippet loads

zsh: remove = from WORDCHARS

Merge remote-tracking branch 'origin/master'

Emacs: fix ob-sh startup error

Emacs: simplify macOS font setup

mlterm: increase scrollback

Emacs: use global eldoc mode

autorandr: Don't toggle wifi on docked state

Emacs: update directories

Emacs: remove ledger

zsh: Remove outdated environment variable

zsh: Enable colours in ls on OSX

Emacs: Only enable async byte compile if loaded

Emacs: Fix evil/evil-collection compatibility

Emacs: Fix oddities with counsel-projectile

Emacs: Configure spaceline for normal Emacs

Emacs: remove outshine + navi

Simplify email setup

Git: enable SatoshiPay configuration for GitLab

Emacs: add useful leader key sequences

Merge branch 'master' of https://git.alanpearce.eu/dotfiles

Emacs: fix spacemacs theme loading

git: enable pending with GitHub squash-merges

git: Show tags in git lg

Emacs: Configure prettier-js

Emacs: setup tslint automatically

Make terminal colours more readable

Emacs: use spacemacs-theme

emacs: dedicate a prefix to beancount

emacs: Silence some warnings

emacs: fix open-project in non-default ghq root

emacs: fix pull-request command

xresources: Specify emacs font

mlterm: update fonts

Git: fix lasttag showing non-version tags

mlterm: make yellow readable on white

git: improve lasttag alias

git: workaround bulkworkspaces weirdness

Emacs: make closing buffers less confusing

Emacs: don't require pinentry

Emacs: Enabled display-line-numbers mode, if available

Emacs: load sentence-navigation with care

Emacs: fix projectile project types after breaking change

zsh: Setup helm completion more reliably

Emacs: Fix eyebrowse evil keybinds missing

Emacs: Rename spam->junk

emacs: add more evil leader keys

git: fix conditional include

emacs: setup kubernetes.el

zsh: load helm completion

zsh: fix incorrect loading of syntax/completion

Emacs: setup typescript

emacs: turn subword-mode back on

emacs: configure magit-repos

emacs: auto-compile asynchronously

Emacs: don't use tern in web-mode

mlterm: Use a nice colour scheme

Emacs: Add git-chore command

Emacs: use xdg-open when found, even if not in a DE

mlterm: autosave

Update mail config

emacs: remove prog-fill

emacs: remove outdated comment

Emacs: make sure missing/outdated helm doesn't halt init

emacs: Remove non-working em-smart init code

emacs: Don't auto-fill markdown

emacs: Fix eshell prompt matching

emacs: Discard packages superceded by evil

emacs: Discard more unused modes

emacs: reformat

emacs: Discard some unused programming modes

emacs: Remove mu4e loading workaround

emacs: Only consider applying dtrt-indent in prog modes

mlterm: Fix font size not changing with DPI

emacs: Make git-gutter deleted fringe match others

emacs: Remove some old emacs-style keybinds

emacs: Use crux function to delete buffer and file

emacs: avoid error loading org files with evil-org

emacs: Remove evil-goggles

Emacs: remove cyphejor version check

Switch back to monotropic-theme

zsh: customise fzf/anyframe

emacs: Fix eyebrowse+evil

emacs: Fix open-pr command

git: Add bulk workspace

git: Remove some aliases included in git-extras

Emacs: Move eyebrowse keys to fit evil

zsh: re-configure history

zsh: Setup gcloud completion

zsh: optimise zplugin startup

zsh: Cleanup old code

Emacs: convert to the dark side

mlterm: tweak fonts

git: Add sopsdiffer command

i3: Make status bar font a little larger

Emacs: Make mu4e maildirs nicer

Emacs: Move ehelp

Emacs: Update flycheck nix wrapper

Emacs: Remove email address

Emacs: Make ag also search hidden files

Tweak fonts some more

Update font configuration

autorandr: Update docked configuration

Use mlterm everywhere

Add mlterm configuration

git: add merge driver for npm lockfiles

dunst: Don't clobber ctrl- keybindings

Fix mbsync

Emacs: rip out smartparens

sxhkd: Increase brightness steps

zsh: Enable kubectl completion

i3: don't lock so easily

Emacs: Search hidden files with ripgrep

git: add alias to bmpr

Create overlay of custom node packages

Emacs: add extra discover-my-major keybind

Remove xmodmap content

i3: add easier keybind for exit menu

Emacs: fix helpful keybinds

Emacs: run npm version as a normal shell command

Emacs: improve mocha output

Emacs: use normal qwerty avy-keys

Emacs: Don't warn on inconsistent js return statements

Emacs: setup ivy-hydra

i3: use qwerty keybinds again

Emacs: Don't hide trashed messages

Add npm version bump command

mbsync: Sync expunges in both directions

Emacs: Grab symbol at point for ripgrep searches

Emacs: Fix counsel-projectile preferring ag to rg

MBSync: propagate remote deletions

Emacs: Fix incorrect function call

Emacs: Fix chained method call indentation in Javascript

Emacs: Tweak theme

Emacs: add line spacing

Use bitmap fonts again

Emacs: Automatically resize powerline after setting font

Move more startup applications to nixos configuration

Emacs: Configure prog-fill

Emacs: Disable company-lsp async

Spaceline: auto-calculate a nice height

Emacs: switch to monotropic-theme

Emacs: Install prog-fill-mode

Emacs: Only configure lsp-javascript if server installed

Emacs: run add-node-modules-path also for typescript

Emacs: Fix lsp-imenu setup

Emacs: use LSP for javascript and typescript

Emacs: Configure language server protocol

emacs: change emacsclient desktop file

Emacs: Improve fringe display

Fix NPM registry for npm command

Yarn: fix registry

Emacs: Enable magit-file-mode globally

Emacs: Enable diagnostics for auto-revert

Emacs: Remove magithub

Emacs: Tell mocha to fail early

autorandr: Make laptop DPI a little smaller

Emacs: Fix typo in alias

Emacs: Use more inclusive test path for mocha

zsh: Unalias git->hub

Emacs: configure mocha.el

Emacs: Hide trashed messages in mu4e

Emacs: Bind helpful keys

git: add aliases for lasttag and pending (merged PRs not in a tag)

Emacs: Remove hide/show mode-line functions

autorandr: Don't restart redshift

xprofile: Remove xsetroot call

Emacs: Tweak spaceline

Emacs: Load spaceline-config later

i3: Remove unnecessary special rule for Chrome

i3: Stop windows from moving when opening new windows

zsh: Add quicklisp local-projects to ghq roots

xprofile: Don't run dunst/sxhkd

i3: Try a larger border

i3: Remove gaps

i3: Tweak bar colours

i3: Update statusbar highlight colours

Delete old Spotcap git config

rofi: Add initial rofi-pass config

i3: Use tomorrow-night colour scheme

Use base16-tomorrow instead of mexico-light

xprofile: Fix rofi-pass typing

Move old files to stow-correct positions

i3: Rely on physlock instead of $Locker

rofi: Add initial configuration

Xresources: set font for rofi

i3: Use rofi in place of dmenu

Emacs: Configure eacl (and grep)

Xresources: Make fonts smaller

Autorandr: Make satoshipad fonts the same size as marvin's

nix: Remove zr

Emacs: Re-install magithub

Emacs: Add command to open pull requests

npm: Fix yarn (!)

Emacs: Add commands for git helpers

i3: Don't expect startup notification from locker

Emacs: Fix outline-minor-mode prefix

Emacs: Configure spaceline

Emacs: Fix incorrect setup of docker-compose-mode

Emacs: Keep package-archives even in nix-emacs

Emacs: enable completion in docker-compose files

Merge remote-tracking branch 'origin/master'

Emacs: Configure define-word package

Emacs: Open .handlebars with web-mode

i3: Change gaps to only inner

Git: Use github username instead of email

Emacs: Add use-fixed-fonts function

Emacs: Change mu4e shortcuts

Emacs: Fix flycheck setup in js2-mode

Emacs: Add npm-yarn aliases

xprofile: Fix missing notifications

git: Push relevant tags by default

git: Don't sign commits by default

Emacs: fix mu folders for Riseup

Mail: Update password paths again

xprofile: Remove gpg-connect-agent

Emacs: Use prettier-standard if installed

Emacs: Add npx-run command for node projects

Emacs: Make yarn- commands DWIM w.r.t. yarn/npm

Make fonts the right size across autorandr profiles

i3status: Add 5-minute loadavg

i3status: Add disk low space threshold

Emacs: Increase mail check frequency

Emacs: Set mu home to default

autorandr: Restart redshift without blocking

Emacs: Add contextual shortcuts for mu4e

Emacs: Use mu4e contexts correctly

Emacs: Improve mu4e UI

Emacs: Improve mu4e message composition

javascript: fix NPM token

Emacs: add mu4e optimisations

Emacs: Get email per-context directly in mu4e

Emacs: Configure mu4e for mbsync compatibility

Configure mbsync

Emacs: Use mu4e as mail agent

offlineimap: Delegate mu index update to emacs if `mu` fails

Emacs: Add reload-user-init-file command

xresources: Tweak font sizes again...

Emacs: Enable navi-mode

Git: Sign commits by default

Emacs: Remove unnecessary SRC blocks

xresources: Remove disabled cursor line

npm: Sign git tags

zsh: Remove gh alias

Emacs: Fix headers

Merge remote-tracking branch 'origin/master'

Balance font sizes between setups correctly

Emacs: Diminish js2-refactor-mode

Emacs: Only wrap lines in non-prog modes

Emacs: Diminish all beginend modes

Emacs: Fully diminish redshank-mode

Emacs: remove incorrect counsel-projectile-rg keybinding

Emacs: Diminish company some more

Emacs: Don't complain about projectile-global-mode deprecation

Emacs: Complain more when editorconfig is missing

msmtp: Fix google mail password

autorandr: Set correct DPI for external monitors

offlineimap: Use app-specific password for mail

Emacs: Optimise projectile usage

Emacs: Enable projectile-mode globally

Emacs: Use correct keybinding syntax for projectile-ripgrep

Merge remote-tracking branch 'origin/master'

Emacs: Fix beancount loading

git: Use satoshipay email for its repositories

git: Fix gpg invocation

Emacs: Move projectile-vc key to C-M-g

i3status: Shorten networking info

xprofile: Don't run nitrokey-app

i3: Configure gaps

i3: Switch back to bitmap fonts

Emacs: Remove nix info from frame title

npmrc: Fix creation of '$HOME' dir

autorandr: Add notification to postswitch script

xprofile: Move X settings after autorandr switch

autorandr: Fix profile detection

Emacs: Add autoload for beancount-mode

Emacs: Make sure pre-set SSH_AUTH_SOCK exists before using it

msmtp: Fix password fetching

Merge remote-tracking branch 'origin/master'

i3: Use client/server rxvt-unicode

Emacs: Add mu4e variable declarations

Emacs: Add mu4e-refile-folder for satoshipay

XResources: Override background colour

xprofile: Start nitrokey-app

i3: Disable mouse warping

Emacs: fix error when checking if beancount is available

Emacs: Move outline-cycle away from tab

Emacs: Use electric-pair mode in nix-mode buffers

Emacs: Add shortcut to insert current date in beancount

zsh: Fix email switch

Emacs: Add fontawesome

Emacs: Use system default font from Xresources

Remove trailing spaces

Emacs: Add company fallback keybind to overriding keymap

Emacs: Replace beacon with builtin hl-line-mode

Emacs: appease emacs-lisp-checkdoc

Emacs: reformat to outshine style

yarn+npm: login

xresources: Add compile-command for emacs

i3: Set urxvt as terminal

xresources: Use system-wide default fonts for uxrvt

i3: change font size to follow DPI

autorandr: Add initial setup (for satoshipad)

xprofile: Run autorandr on startup

i3: Remove border from google-chrome

Revert "XResources: Remove rxvt-unicode configuration"

i3: Make bar text clearer

Emacs: Ensure shift keys are not overridden in org-mode

Emacs: Disable crux-reopen-as-root-mode

Emacs: Extract first-frame-hook

offlineimap: check more often

i3: Float pinentry windows

i3: Add extra keybind for shutdown mode

Emacs: hook up `standard` and `eslint` if available

Emacs: Add yarn-remove command

git: Update signing key

Emacs: Update mu4e automatically

i3: Add mode for power commands

i3: Fix "wait" cursor after launching

i3: Add locker

offlineimap: Change pass structure

zsh: Set EMAIL

zsh: Fix OS check for SSH agent

Emacs: Improve first-frame-hook

Emacs: Configure beancount mode

Emacs: Silence most byte-compiler warnings

Emacs: Fix daemon startup error

msmtp: Add satoshipay

msmtp: Remove duplicate riseup setting

Emacs: Set shr-like keybindings in mu4e

Add satoshipay email

Emacs: Fix syntax error

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Add riseup to email system

adopt: Use stow wrapper script

xprofile: Run NetworkManager's applet instead of connman's

Emacs: Remove workaround for echo-area-message

Emacs: Force-bind avy shortcuts

sxhkd: Use disper for XF86Display shortcut

Emacs: Add desktop file

msmtp: Add initial configuration

offlineimap: Add initial configuration

zsh: Set SSH_AUTH_SOCK to GnuPG SSH agent socket

i3: Use i3status from current-system

i3: Fix passmenu binding

zsh: Ensure cache directory is present for HISTFILE

Emacs: Configure mu4e

Emacs: Default to SSH socket from GnuPG

gpg: Use builtin tor method

i3: Fix duplicate keybinds again

zsh: Don't init gnupg on macOS.

Emacs: Remove base16-theme

Emacs: add lentic configuration

Emacs: Fix C-c p s s binding

Emacs: Update encrypted configuration

Configure GPG (version 2.1)

xprofile: Increase delay for setting cursor

i3: Tweak keybinds

Merge remote-tracking branch 'origin/master'

i3: Tweak keybindings

Emacs: Fix execution of old code at startup

Merge branch 'master' of ssh://alanpearce.eu/dotfiles

Xprofile: Run cmst

Emacs: Update linux fonts

Emacs: Guard against startup errors from frame-title setting

Emacs: Fix typo in base16-theme init

i3: Don't toggle workspaces

Emacs: Move eyebrowse bindings from under WM keybinds

i3: Add initial configuration

adopt: Use stow to create backlinks

Merge remote-tracking branch 'origin/master'