diff options
| author | Alan Pearce | 2018-10-07 17:57:16 +0200 |
|---|---|---|
| committer | Alan Pearce | 2018-10-07 17:57:16 +0200 |
| commit | 9b3676b546d963920e026ffd707176900e9a045f (patch) | |
| tree | 647648926f6c9854c58b8e98bc7a169835cea999 | |
| parent | 501ecb89c9d5fe00811b54caba74a87ac322505c (diff) | |
| parent | 6d2932987d881075ad3b02e4700f12e1dc13d11f (diff) | |
| download | nixfiles-9b3676b546d963920e026ffd707176900e9a045f.tar.lz nixfiles-9b3676b546d963920e026ffd707176900e9a045f.tar.zst nixfiles-9b3676b546d963920e026ffd707176900e9a045f.zip | |
Merge branch 'master' of https://git.alanpearce.eu/dotfiles
| -rw-r--r-- | autorandr/.config/autorandr/docked/config | 14 | ||||
| -rw-r--r-- | autorandr/.config/autorandr/docked/setup | 4 | ||||
| -rw-r--r-- | emacs/.emacs.d/main.el | 1 | ||||
| -rw-r--r-- | git/.config/git/config | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/autorandr/.config/autorandr/docked/config b/autorandr/.config/autorandr/docked/config index b343e8a2..b08880ab 100644 --- a/autorandr/.config/autorandr/docked/config +++ b/autorandr/.config/autorandr/docked/config @@ -1,20 +1,22 @@ output DP1 off -output HDMI1 -off output DP2 off +output DP2-3 +off +output HDMI1 +off output HDMI2 off -output DP2-3 +output VIRTUAL1 off output eDP1 off output DP2-1 mode 2560x1440 -pos 1920x0 +pos 0x0 rate 59.95 output DP2-2 -mode 1920x1200 -pos 0x240 +mode 2560x1440 +pos 2560x0 rate 59.95 diff --git a/autorandr/.config/autorandr/docked/setup b/autorandr/.config/autorandr/docked/setup index 18b8e0d5..607eacbc 100644 --- a/autorandr/.config/autorandr/docked/setup +++ b/autorandr/.config/autorandr/docked/setup @@ -1,3 +1,3 @@ -DP2-1 00ffffffffffff0030aeaf61010101010a1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20011f02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd -DP2-2 00ffffffffffff0015c33325b1a21403041b0104a5342178fa0495a9554d9d26105054a10800a9408180b300a9c081c0810001010101283c80a070b023403020360007442100001a023a801871382d40582c450007442100001e000000fd003b3d1f4c11000a202020202020000000fc004556323435350a20202020202001cf020312f145900403020123091f0783010000023a801871382d40582c450007442100001e011d007251d01e206e28550007442100001e8f0ad08a20e02d10103e96000744210000188c0ad08a20e02d10103e9600074421000018d50980a020e02d101060a20007442100001800000000000000000000000000000000000000a4 +DP2-1 00ffffffffffff0030aeaf61010101011c1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20010d02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd +DP2-2 00ffffffffffff0030aeaf61010101010a1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20011f02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd eDP1 00ffffffffffff0006af3d2400000000001a0104951f117802a2b591575894281c505400000001010101010101010101010101010101843a8034713828403064310035ad10000018d02e8034713828403064310035ad10000018000000fe0041554f0a202020202020202020000000fe004231343048414e30322e34200a00e4 diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index 407e2a53..e5d10f21 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -2469,6 +2469,7 @@ Pass ARG to `comint-delchar-or-maybe-eof'." "v" #'split-window-right "o" #'other-window "y" #'evil-avy-goto-line + "bb" #'ivy-switch-buffer "bx" #'kill-this-buffer "br" #'revert-buffer "dd" #'dired diff --git a/git/.config/git/config b/git/.config/git/config index a0aa5a64..3a095ef9 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -18,8 +18,9 @@ co = checkout ready = rebase -i @{u} lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\?[0-9]\" | tail -n1'" - pending = "!sh -c 'git log --oneline --grep=\"#[0-9]\" ...$(git lasttag)'" + pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'" lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' + prl = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' --grep="#" ignored = ls-files --others -i --exclude-standard bump = !bmpr [github] |