commit 2fd7cc32b0f02583c1b6951a308df609cf24f02f
parent f66f5af941b34bca3ac25c955c22fc7c69ce7a9b
Author: ssnf <ssnf@ssnf.xyz>
Date: Fri, 24 Jul 2020 14:03:31 +0000
few config changes
Diffstat:
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/.clang-format b/.clang-format
@@ -7,20 +7,20 @@ AlignConsecutiveDeclarations: 'true'
AlignEscapedNewlines: Left
AlignOperands: 'false'
AlignTrailingComments: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
-AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'false'
+AllowAllParametersOfDeclarationOnNextLine: 'true'
+AllowShortBlocksOnASingleLine: 'true'
+AllowShortCaseLabelsOnASingleLine: 'true'
AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: 'false'
-AllowShortLoopsOnASingleLine: 'false'
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLoopsOnASingleLine: 'true'
AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: 'false'
+AlwaysBreakBeforeMultilineStrings: 'true'
AlwaysBreakTemplateDeclarations: 'No'
BinPackArguments: 'true'
BinPackParameters: 'true'
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
-BreakBeforeTernaryOperators: 'false'
+BreakBeforeTernaryOperators: 'true'
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
BreakStringLiterals: 'false'
@@ -29,7 +29,7 @@ CompactNamespaces: 'false'
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
ConstructorInitializerIndentWidth: '1'
ContinuationIndentWidth: '0'
-Cpp11BracedListStyle: 'true'
+Cpp11BracedListStyle: 'false'
DerivePointerAlignment: 'false'
DisableFormat: 'false'
FixNamespaceComments: 'false'
@@ -46,6 +46,7 @@ ReflowComments: 'true'
SortIncludes: 'false'
SortUsingDeclarations: 'true'
SpaceAfterCStyleCast: 'false'
+SpaceAfterLogicalNot: 'false'
SpaceAfterTemplateKeyword: 'false'
SpaceBeforeAssignmentOperators: 'true'
SpaceBeforeCpp11BracedList: 'false'
diff --git a/.config b/.config
@@ -1,2 +1,2 @@
-let g:ale_c_clang_options = '-std=c99 -Wall -lX11 -lfontconfig -lXft -lXinerama -I/usr/X11R6/include -L/usr/X11R6/lib -I/usr/include/freetype2 -Wno-deprecated-declarations -0s'
-let g:ale_cpp_clang_options = '-std=c99 -Wall -lX11 -lfontconfig -lXft -lXinerama -I/usr/X11R6/include -L/usr/X11R6/lib -I/usr/include/freetype2 -Wno-deprecated-declarations -0s'
+let g:ale_c_gcc_options = '-Wall -Wextra -pedantic -std=c89 '
+let g:ale_cpp_gcc_options = '-Wall -Wextra -pedantic -std=c89'
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+*.o
+.config
+.clang-format
+dwm
diff --git a/config.h b/config.h
@@ -28,7 +28,6 @@ static const Rule rules[] = {
* WM_NAME(STRING) = title
*/
/* class instance title tags mask isfloating isterminal noswallow monitor */
- { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 },
{ "St", NULL, NULL, 0, 0, 1, 0, -1 },
{ NULL, NULL, "Event Tester", 0, 1, 0, 1, -1 }, /* xev */
};
@@ -103,8 +102,9 @@ static Key keys[] = {
{ MODKEY, XK_n, spawn, SHCMD("st -e newsboat") },
{ MODKEY, XK_m, spawn, SHCMD("st -e neomutt") },
{ MODKEY, XK_i, spawn, SHCMD("st -e htop") },
- { MODKEY, XK_p, spawn, SHCMD("push-video") },
- { MODKEY|ShiftMask, XK_p, spawn, SHCMD("pop-video") },
+ { MODKEY, XK_c, spawn, SHCMD("st -e calcurse") },
+ { MODKEY, XK_p, spawn, SHCMD("pop-video") },
+ { MODKEY|ShiftMask, XK_p, spawn, SHCMD("push-video") },
{ MODKEY|ShiftMask, XK_w, spawn, SHCMD("sudo wireshark") },
{ 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
