From 28e473517de2c2bb827b1d5adad947d64d7835a0 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 30 Dec 2020 01:00:12 -0700 Subject: [PATCH] editorconfig: fixup --- .editorconfig | 23 +++++++++++++++++-- profiles/develop/kakoune/plugins/kakboard.kak | 4 ++-- profiles/graphical/qutebrowser/config.py | 4 ++-- profiles/graphical/xmonad/_xmonad.hs | 12 +++++----- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6e87a00..96e5188 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,11 +2,30 @@ root = true [*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true charset = utf-8 indent_style = space indent_size = 2 -insert_final_newline = true -trim_trailing_whitespace = true + +# Ignore diffs/patches +[*.{diff,patch}] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +indent_size = unset + +[{.*,secrets}/**] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset +indent_style = unset +indent_size = unset + +[*.py] +indent_size = 4 [*.md] max_line_length = off diff --git a/profiles/develop/kakoune/plugins/kakboard.kak b/profiles/develop/kakoune/plugins/kakboard.kak index b35df42..acf0c7f 100644 --- a/profiles/develop/kakoune/plugins/kakboard.kak +++ b/profiles/develop/kakoune/plugins/kakboard.kak @@ -37,7 +37,7 @@ define-command -docstring 'copy system clipboard if current register is unset' \ # Pull the clipboard and execute the key with the same context define-command -docstring 'copy system clipboard then execute keys' \ - kakboard-with-pull-clipboard -params 1 %{ + kakboard-with-pull-clipboard -params 1 %{ kakboard-pull-if-unset evaluate-commands %sh{ if test -n "$kak_register"; then @@ -69,7 +69,7 @@ define-command -docstring 'set system clipboard if current register is unset' \ # Set the clipboard and execute the key with the same context define-command -docstring 'execute keys then set system clipboard' \ - kakboard-with-push-clipboard -params 1 %{ + kakboard-with-push-clipboard -params 1 %{ evaluate-commands %sh{ if test -n "$kak_register"; then register="\"$kak_register" diff --git a/profiles/graphical/qutebrowser/config.py b/profiles/graphical/qutebrowser/config.py index b9cf346..5274654 100644 --- a/profiles/graphical/qutebrowser/config.py +++ b/profiles/graphical/qutebrowser/config.py @@ -258,8 +258,8 @@ c.colors.hints.match.fg = '#5AF78E' # leave listed modes easily with for mode in\ ['caret', 'command', 'hint', - 'insert', 'passthrough', 'prompt', - 'yesno']: + 'insert', 'passthrough', 'prompt', + 'yesno']: config.bind('', 'leave-mode', mode=mode) # Bindings for normal mode diff --git a/profiles/graphical/xmonad/_xmonad.hs b/profiles/graphical/xmonad/_xmonad.hs index 14b153f..67aa6e3 100644 --- a/profiles/graphical/xmonad/_xmonad.hs +++ b/profiles/graphical/xmonad/_xmonad.hs @@ -28,7 +28,7 @@ import XMonad.Layout.PerWorkspace (onWorkspace) import XMonad.Layout.Reflect (reflectHoriz) import XMonad.Util.Cursor import qualified XMonad.StackSet as S (StackSet, greedyView, - shift) + shift) main :: IO () main = @@ -39,17 +39,17 @@ main = , workspaces = myWorkspaces , startupHook = myAutostart , manageHook = myManageHook - <+> manageHook defaultConfig - <+> manageDocks + <+> manageHook defaultConfig + <+> manageDocks , borderWidth = 0 , logHook = takeTopFocus } `additionalKeys` myKeys myLayout = smartBorders - . mkToggle ( NBFULL ?? EOT) - . onWorkspace "7:im" ( half ||| Mirror half ||| tiled ||| reflectHoriz tiled ) - $ tiled ||| reflectHoriz tiled ||| half ||| Mirror half + . mkToggle ( NBFULL ?? EOT) + . onWorkspace "7:im" ( half ||| Mirror half ||| tiled ||| reflectHoriz tiled ) + $ tiled ||| reflectHoriz tiled ||| half ||| Mirror half where tiled = ResizableTall nmaster delta ratiot [] half = ResizableTall nmaster delta ratioh []