From 9f9fe8cb8f8bafcd32fcd47be4368e13a78b4bf4 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 15 Feb 2024 14:21:59 +0800 Subject: [PATCH] repo: add editorconfig && format --- .editorconfig | 21 +++++++++++++++++++ .gitignore | 2 +- home/applications/bspwm/default.nix | 8 +++---- home/applications/rofi/rofi/colors.rasi | 2 +- home/applications/rofi/rofi/config.rasi | 2 +- .../fonts/fontconfig/conf.d/qt-fonts.conf | 2 +- .../fontconfig/conf.d/unliked-fonts.conf | 2 +- .../fontconfig/conf.d/windows-fonts.conf | 2 +- 8 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..ac53809 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +charset = utf-8 +end_of_line = lf +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 + +# Nix +[*.nix] +indent_size = 2 +indent_style = space diff --git a/.gitignore b/.gitignore index 67e4bed..1574d4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ result -.DS_Store \ No newline at end of file +.DS_Store diff --git a/home/applications/bspwm/default.nix b/home/applications/bspwm/default.nix index ca41d30..9a65b33 100644 --- a/home/applications/bspwm/default.nix +++ b/home/applications/bspwm/default.nix @@ -61,10 +61,10 @@ # start some nice programs if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f fi # https://wiki.archlinux.org/title/Cursor_themes#Change_X_shaped_default_cursor diff --git a/home/applications/rofi/rofi/colors.rasi b/home/applications/rofi/rofi/colors.rasi index 381a01e..eab9285 100644 --- a/home/applications/rofi/rofi/colors.rasi +++ b/home/applications/rofi/rofi/colors.rasi @@ -1,4 +1,4 @@ * { bg: #16161e; fg: #6a6f87; -} \ No newline at end of file +} diff --git a/home/applications/rofi/rofi/config.rasi b/home/applications/rofi/rofi/config.rasi index f05b4bd..3758b3a 100644 --- a/home/applications/rofi/rofi/config.rasi +++ b/home/applications/rofi/rofi/config.rasi @@ -127,4 +127,4 @@ element.alternate.urgent { element.alternate.active { background-color: transparent; text-color: @fg; -} \ No newline at end of file +} diff --git a/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/qt-fonts.conf b/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/qt-fonts.conf index ad6eef7..8c7b5a9 100644 --- a/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/qt-fonts.conf +++ b/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/qt-fonts.conf @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/unliked-fonts.conf b/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/unliked-fonts.conf index b5e5f78..f343a78 100644 --- a/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/unliked-fonts.conf +++ b/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/unliked-fonts.conf @@ -20,4 +20,4 @@ monospace - \ No newline at end of file + diff --git a/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/windows-fonts.conf b/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/windows-fonts.conf index 39a68fd..02e11b8 100644 --- a/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/windows-fonts.conf +++ b/nixos/profiles/common/graphical/home/fonts/fontconfig/conf.d/windows-fonts.conf @@ -25,4 +25,4 @@ serif - \ No newline at end of file +