From 1a95d955763ebcc7a6c0c5e4725dd0e21670ee52 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 28 Feb 2025 05:40:54 +0700
Subject: [PATCH] :art: nix fmt
---
homes/palo/atuin.nix | 3 +
nix/packages/nsxiv/config.def.h | 244 +++++++++---------
.../systemctl-find-service-config.sh | 48 ++--
scripts/bash_mouse_click.sh | 34 +--
4 files changed, 166 insertions(+), 163 deletions(-)
diff --git a/homes/palo/atuin.nix b/homes/palo/atuin.nix
index d7fa731..5ccc659 100644
--- a/homes/palo/atuin.nix
+++ b/homes/palo/atuin.nix
@@ -15,6 +15,9 @@
inline_height = 20;
keymap_mode = "vim-normal";
+ # because the daemon can't remember my mode (with Ctrl-r)
+ filter_mode = "directory";
+
# With workspace filtering enabled, Atuin will filter for commands executed
# in any directory within a git repository tree.
workspaces = true;
diff --git a/nix/packages/nsxiv/config.def.h b/nix/packages/nsxiv/config.def.h
index 3f93082..654bd7b 100644
--- a/nix/packages/nsxiv/config.def.h
+++ b/nix/packages/nsxiv/config.def.h
@@ -1,19 +1,20 @@
#ifdef INCLUDE_WINDOW_CONFIG
/* default window dimensions (overwritten via -g option): */
-static const int WIN_WIDTH = 800;
+static const int WIN_WIDTH = 800;
static const int WIN_HEIGHT = 600;
/* colors and font can be overwritten via X resource properties.
* See nsxiv(1), X(7) section Resources and xrdb(1) for more information.
- * X resource value (NULL == default) */
-static const char *WIN_BG[] = { "Nsxiv.window.background", "white" };
-static const char *WIN_FG[] = { "Nsxiv.window.foreground", "black" };
-static const char *MARK_FG[] = { "Nsxiv.mark.foreground", NULL };
+ * X resource value (NULL ==
+ * default) */
+static const char *WIN_BG[] = {"Nsxiv.window.background", "white"};
+static const char *WIN_FG[] = {"Nsxiv.window.foreground", "black"};
+static const char *MARK_FG[] = {"Nsxiv.mark.foreground", NULL};
#if HAVE_LIBFONTS
-static const char *BAR_BG[] = { "Nsxiv.bar.background", NULL };
-static const char *BAR_FG[] = { "Nsxiv.bar.foreground", NULL };
-static const char *BAR_FONT[] = { "Nsxiv.bar.font", "monospace-8" };
+static const char *BAR_BG[] = {"Nsxiv.bar.background", NULL};
+static const char *BAR_FG[] = {"Nsxiv.bar.foreground", NULL};
+static const char *BAR_FONT[] = {"Nsxiv.bar.font", "monospace-8"};
/* if true, statusbar appears on top of the window */
static const bool TOP_STATUSBAR = false;
@@ -25,10 +26,8 @@ static const bool TOP_STATUSBAR = false;
/* levels (in percent) to use when zooming via '-' and '+':
* (first/last value is used as min/max zoom level)
*/
-static const float zoom_levels[] = {
- 12.5, 25.0, 50.0, 75.0,
- 100.0, 150.0, 200.0, 400.0, 800.0
-};
+static const float zoom_levels[] = {12.5, 25.0, 50.0, 75.0, 100.0,
+ 150.0, 200.0, 400.0, 800.0};
/* default slideshow delay (in sec, overwritten via -S option): */
static const int SLIDESHOW_DELAY = 5;
@@ -37,10 +36,10 @@ static const int SLIDESHOW_DELAY = 5;
* (0, CC_STEPS] are mapped to the ranges [0, 1], and (1, *_MAX].
* Higher step count will have higher granulairy.
*/
-static const int CC_STEPS = 32;
-static const double GAMMA_MAX = 10.0;
-static const double BRIGHTNESS_MAX = 2.0;
-static const double CONTRAST_MAX = 4.0;
+static const int CC_STEPS = 32;
+static const double GAMMA_MAX = 10.0;
+static const double BRIGHTNESS_MAX = 2.0;
+static const double CONTRAST_MAX = 4.0;
/* command i_scroll pans image 1/PAN_FRACTION of screen width/height */
static const int PAN_FRACTION = 5;
@@ -53,9 +52,12 @@ static const int PAN_FRACTION = 5;
* NOTE: higher cache size means better image reloading performance, but also
* higher memory usage.
*/
-static const int CACHE_SIZE_MEM_PERCENTAGE = 3; /* use 3% of total memory for cache */
-static const int CACHE_SIZE_LIMIT = 256 * 1024 * 1024; /* but not above 256MiB */
-static const int CACHE_SIZE_FALLBACK = 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */
+static const int CACHE_SIZE_MEM_PERCENTAGE =
+ 3; /* use 3% of total memory for cache */
+static const int CACHE_SIZE_LIMIT =
+ 256 * 1024 * 1024; /* but not above 256MiB */
+static const int CACHE_SIZE_FALLBACK =
+ 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */
#endif
#ifdef INCLUDE_OPTIONS_CONFIG
@@ -82,7 +84,7 @@ static const bool TNS_FILTERS_IS_BLACKLIST = false;
#ifdef INCLUDE_THUMBS_CONFIG
/* thumbnail sizes in pixels (width == height): */
-static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
+static const int thumb_sizes[] = {32, 64, 96, 128, 160};
/* thumbnail size at startup, index into thumb_sizes[]: */
static const int THUMB_SIZE = 3;
@@ -98,115 +100,115 @@ static const KeySym KEYHANDLER_ABORT = XK_Escape;
/* keyboard mappings for image and thumbnail mode: */
static const keymap_t keys[] = {
- /* modifiers key function argument */
- { 0, XK_q, g_quit, 0 },
- { 0, XK_Q, g_pick_quit, 0 },
- { 0, XK_Return, g_switch_mode, None },
- { 0, XK_f, g_toggle_fullscreen, None },
- { 0, XK_b, g_toggle_bar, None },
- { ControlMask, XK_x, g_prefix_external, None },
- { 0, XK_g, g_first, None },
- { 0, XK_G, g_n_or_last, None },
- { 0, XK_r, g_reload_image, None },
- { 0, XK_D, g_remove_image, None },
- { ControlMask, XK_h, g_scroll_screen, DIR_LEFT },
- { ControlMask, XK_Left, g_scroll_screen, DIR_LEFT },
- { ControlMask, XK_j, g_scroll_screen, DIR_DOWN },
- { ControlMask, XK_Down, g_scroll_screen, DIR_DOWN },
- { ControlMask, XK_k, g_scroll_screen, DIR_UP },
- { ControlMask, XK_Up, g_scroll_screen, DIR_UP },
- { ControlMask, XK_l, g_scroll_screen, DIR_RIGHT },
- { ControlMask, XK_Right, g_scroll_screen, DIR_RIGHT },
- { 0, XK_plus, g_zoom, +1 },
- { 0, XK_KP_Add, g_zoom, +1 },
- { 0, XK_minus, g_zoom, -1 },
- { 0, XK_KP_Subtract, g_zoom, -1 },
- { 0, XK_m, g_toggle_image_mark, None },
- { 0, XK_M, g_mark_range, None },
- { ControlMask, XK_m, g_reverse_marks, None },
- { ControlMask, XK_u, g_unmark_all, None },
- { 0, XK_N, g_navigate_marked, +1 },
- { 0, XK_P, g_navigate_marked, -1 },
- { 0, XK_braceleft, g_change_gamma, -1 },
- { 0, XK_braceright, g_change_gamma, +1 },
- { ControlMask, XK_g, g_change_gamma, 0 },
- { ControlMask, XK_bracketright, g_change_brightness, +1 },
- { ControlMask, XK_bracketleft, g_change_brightness, -1 },
- { 0, XK_parenleft, g_change_contrast, -1 },
- { 0, XK_parenright, g_change_contrast, +1 },
+ /* modifiers key function argument */
+ {0, XK_q, g_quit, 0},
+ {0, XK_Q, g_pick_quit, 0},
+ {0, XK_Return, g_switch_mode, None},
+ {0, XK_f, g_toggle_fullscreen, None},
+ {0, XK_b, g_toggle_bar, None},
+ {ControlMask, XK_x, g_prefix_external, None},
+ {0, XK_g, g_first, None},
+ {0, XK_G, g_n_or_last, None},
+ {0, XK_r, g_reload_image, None},
+ {0, XK_D, g_remove_image, None},
+ {ControlMask, XK_h, g_scroll_screen, DIR_LEFT},
+ {ControlMask, XK_Left, g_scroll_screen, DIR_LEFT},
+ {ControlMask, XK_j, g_scroll_screen, DIR_DOWN},
+ {ControlMask, XK_Down, g_scroll_screen, DIR_DOWN},
+ {ControlMask, XK_k, g_scroll_screen, DIR_UP},
+ {ControlMask, XK_Up, g_scroll_screen, DIR_UP},
+ {ControlMask, XK_l, g_scroll_screen, DIR_RIGHT},
+ {ControlMask, XK_Right, g_scroll_screen, DIR_RIGHT},
+ {0, XK_plus, g_zoom, +1},
+ {0, XK_KP_Add, g_zoom, +1},
+ {0, XK_minus, g_zoom, -1},
+ {0, XK_KP_Subtract, g_zoom, -1},
+ {0, XK_m, g_toggle_image_mark, None},
+ {0, XK_M, g_mark_range, None},
+ {ControlMask, XK_m, g_reverse_marks, None},
+ {ControlMask, XK_u, g_unmark_all, None},
+ {0, XK_N, g_navigate_marked, +1},
+ {0, XK_P, g_navigate_marked, -1},
+ {0, XK_braceleft, g_change_gamma, -1},
+ {0, XK_braceright, g_change_gamma, +1},
+ {ControlMask, XK_g, g_change_gamma, 0},
+ {ControlMask, XK_bracketright, g_change_brightness, +1},
+ {ControlMask, XK_bracketleft, g_change_brightness, -1},
+ {0, XK_parenleft, g_change_contrast, -1},
+ {0, XK_parenright, g_change_contrast, +1},
- { 0, XK_h, t_move_sel, DIR_LEFT },
- { 0, XK_Left, t_move_sel, DIR_LEFT },
- { 0, XK_j, t_move_sel, DIR_DOWN },
- { 0, XK_Down, t_move_sel, DIR_DOWN },
- { 0, XK_k, t_move_sel, DIR_UP },
- { 0, XK_Up, t_move_sel, DIR_UP },
- { 0, XK_l, t_move_sel, DIR_RIGHT },
- { 0, XK_Right, t_move_sel, DIR_RIGHT },
- { 0, XK_R, t_reload_all, None },
+ {0, XK_h, t_move_sel, DIR_LEFT},
+ {0, XK_Left, t_move_sel, DIR_LEFT},
+ {0, XK_j, t_move_sel, DIR_DOWN},
+ {0, XK_Down, t_move_sel, DIR_DOWN},
+ {0, XK_k, t_move_sel, DIR_UP},
+ {0, XK_Up, t_move_sel, DIR_UP},
+ {0, XK_l, t_move_sel, DIR_RIGHT},
+ {0, XK_Right, t_move_sel, DIR_RIGHT},
+ {0, XK_R, t_reload_all, None},
- { 0, XK_n, i_navigate, +1 },
- { 0, XK_n, i_scroll_to_edge, DIR_LEFT | DIR_UP },
- { 0, XK_space, i_navigate, +1 },
- { 0, XK_p, i_navigate, -1 },
- { 0, XK_p, i_scroll_to_edge, DIR_LEFT | DIR_UP },
- { 0, XK_BackSpace, i_navigate, -1 },
- { 0, XK_bracketright, i_navigate, +10 },
- { 0, XK_bracketleft, i_navigate, -10 },
- { ControlMask, XK_6, i_alternate, None },
- { ControlMask, XK_n, i_navigate_frame, +1 },
- { ControlMask, XK_p, i_navigate_frame, -1 },
- { ControlMask, XK_space, i_toggle_animation, None },
- { ControlMask, XK_a, i_toggle_animation, None },
- { 0, XK_h, i_scroll, DIR_LEFT },
- { 0, XK_Left, i_scroll, DIR_LEFT },
- { 0, XK_j, i_scroll, DIR_DOWN },
- { 0, XK_Down, i_scroll, DIR_DOWN },
- { 0, XK_k, i_scroll, DIR_UP },
- { 0, XK_Up, i_scroll, DIR_UP },
- { 0, XK_l, i_scroll, DIR_RIGHT },
- { 0, XK_Right, i_scroll, DIR_RIGHT },
- { 0, XK_H, i_scroll_to_edge, DIR_LEFT },
- { 0, XK_J, i_scroll_to_edge, DIR_DOWN },
- { 0, XK_K, i_scroll_to_edge, DIR_UP },
- { 0, XK_L, i_scroll_to_edge, DIR_RIGHT },
- { 0, XK_z, i_scroll_to_center, None },
- { 0, XK_equal, i_set_zoom, 100 },
- { 0, XK_w, i_fit_to_win, SCALE_DOWN },
- { 0, XK_W, i_fit_to_win, SCALE_FIT },
- { 0, XK_F, i_fit_to_win, SCALE_FILL },
- { 0, XK_e, i_fit_to_win, SCALE_WIDTH },
- { 0, XK_E, i_fit_to_win, SCALE_HEIGHT },
- { 0, XK_less, i_rotate, DEGREE_270 },
- { 0, XK_greater, i_rotate, DEGREE_90 },
- { 0, XK_question, i_rotate, DEGREE_180 },
- { 0, XK_bar, i_flip, FLIP_HORIZONTAL },
- { 0, XK_underscore, i_flip, FLIP_VERTICAL },
- { 0, XK_a, i_toggle_antialias, None },
- { 0, XK_A, i_toggle_alpha, None },
- { 0, XK_s, i_slideshow, None },
+ {0, XK_n, i_navigate, +1},
+ {0, XK_n, i_scroll_to_edge, DIR_LEFT | DIR_UP},
+ {0, XK_space, i_navigate, +1},
+ {0, XK_p, i_navigate, -1},
+ {0, XK_p, i_scroll_to_edge, DIR_LEFT | DIR_UP},
+ {0, XK_BackSpace, i_navigate, -1},
+ {0, XK_bracketright, i_navigate, +10},
+ {0, XK_bracketleft, i_navigate, -10},
+ {ControlMask, XK_6, i_alternate, None},
+ {ControlMask, XK_n, i_navigate_frame, +1},
+ {ControlMask, XK_p, i_navigate_frame, -1},
+ {ControlMask, XK_space, i_toggle_animation, None},
+ {ControlMask, XK_a, i_toggle_animation, None},
+ {0, XK_h, i_scroll, DIR_LEFT},
+ {0, XK_Left, i_scroll, DIR_LEFT},
+ {0, XK_j, i_scroll, DIR_DOWN},
+ {0, XK_Down, i_scroll, DIR_DOWN},
+ {0, XK_k, i_scroll, DIR_UP},
+ {0, XK_Up, i_scroll, DIR_UP},
+ {0, XK_l, i_scroll, DIR_RIGHT},
+ {0, XK_Right, i_scroll, DIR_RIGHT},
+ {0, XK_H, i_scroll_to_edge, DIR_LEFT},
+ {0, XK_J, i_scroll_to_edge, DIR_DOWN},
+ {0, XK_K, i_scroll_to_edge, DIR_UP},
+ {0, XK_L, i_scroll_to_edge, DIR_RIGHT},
+ {0, XK_z, i_scroll_to_center, None},
+ {0, XK_equal, i_set_zoom, 100},
+ {0, XK_w, i_fit_to_win, SCALE_DOWN},
+ {0, XK_W, i_fit_to_win, SCALE_FIT},
+ {0, XK_F, i_fit_to_win, SCALE_FILL},
+ {0, XK_e, i_fit_to_win, SCALE_WIDTH},
+ {0, XK_E, i_fit_to_win, SCALE_HEIGHT},
+ {0, XK_less, i_rotate, DEGREE_270},
+ {0, XK_greater, i_rotate, DEGREE_90},
+ {0, XK_question, i_rotate, DEGREE_180},
+ {0, XK_bar, i_flip, FLIP_HORIZONTAL},
+ {0, XK_underscore, i_flip, FLIP_VERTICAL},
+ {0, XK_a, i_toggle_antialias, None},
+ {0, XK_A, i_toggle_alpha, None},
+ {0, XK_s, i_slideshow, None},
};
/* mouse button mappings for image mode: */
static const button_t buttons_img[] = {
- /* modifiers button function argument */
- { 0, 1, i_drag, DRAG_RELATIVE },
- { ControlMask, 1, i_drag, DRAG_RELATIVE },
- { 0, 2, i_drag, DRAG_ABSOLUTE },
- { 0, 3, g_switch_mode, None },
- { 0, 4, g_zoom, +1 },
- { 0, 5, g_zoom, -1 },
+ /* modifiers button function argument */
+ {0, 1, i_drag, DRAG_RELATIVE},
+ {ControlMask, 1, i_drag, DRAG_RELATIVE},
+ {0, 2, i_drag, DRAG_ABSOLUTE},
+ {0, 3, g_switch_mode, None},
+ {0, 4, g_zoom, +1},
+ {0, 5, g_zoom, -1},
};
/* mouse button mappings for thumbnail mode: */
static const button_t buttons_tns[] = {
- /* modifiers button function argument */
- { 0, 1, t_select, None },
- { 0, 3, t_drag_mark_image, None },
- { 0, 4, t_scroll, DIR_UP },
- { 0, 5, t_scroll, DIR_DOWN },
- { ControlMask, 4, g_scroll_screen, DIR_UP },
- { ControlMask, 5, g_scroll_screen, DIR_DOWN },
+ /* modifiers button function argument */
+ {0, 1, t_select, None},
+ {0, 3, t_drag_mark_image, None},
+ {0, 4, t_scroll, DIR_UP},
+ {0, 5, t_scroll, DIR_DOWN},
+ {ControlMask, 4, g_scroll_screen, DIR_UP},
+ {ControlMask, 5, g_scroll_screen, DIR_DOWN},
};
/* true means NAV_WIDTH is relative (33%), false means absolute (33 pixels) */
@@ -215,8 +217,6 @@ static const bool NAV_IS_REL = true;
static const unsigned int NAV_WIDTH = 33;
/* mouse cursor on left, middle and right part of the window */
-static const cursor_t imgcursor[3] = {
- CURSOR_LEFT, CURSOR_ARROW, CURSOR_RIGHT
-};
+static const cursor_t imgcursor[3] = {CURSOR_LEFT, CURSOR_ARROW, CURSOR_RIGHT};
#endif
diff --git a/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh b/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh
index 3cdb120..fa7a705 100644
--- a/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh
+++ b/nix/packages/systemctl-find-service-config/systemctl-find-service-config.sh
@@ -2,23 +2,23 @@
# Funktion zum Anzeigen der Nutzung
display_usage() {
- echo "Usage: $0 <service> <regex>"
- echo " <service>: Name des Systemdienstes"
- echo " <regex>: Regex für die Konfigurationsdatei"
- exit 1
+ echo "Usage: $0 <service> <regex>"
+ echo " <service>: Name des Systemdienstes"
+ echo " <regex>: Regex für die Konfigurationsdatei"
+ exit 1
}
# Prüfen, ob mindestens ein Argument übergeben wurde
if [ $# -lt 1 ] || [ $# -gt 2 ]; then
- display_usage
+ display_usage
fi
SERVICE=$1
# Spezialfall: Wenn nur ein Argument übergeben wurde
if [ $# -eq 1 ]; then
- systemctl cat "$SERVICE"
- exit 0
+ systemctl cat "$SERVICE"
+ exit 0
fi
REGEX=$2
@@ -26,30 +26,30 @@ REGEX=$2
# Holen der Service-Konfiguration
description=$(systemctl cat "$SERVICE" 2>/dev/null)
if [ $? -ne 0 ]; then
- echo "Fehler: Service '$SERVICE' konnte nicht gefunden werden."
- exit 2
+ echo "Fehler: Service '$SERVICE' konnte nicht gefunden werden."
+ exit 2
fi
# Durchsuchen der Ausgabe nach der gesamten Zeile, die mit ExecStart beginnt, und Aufspalten in Strings
CONFIG_FILE=$(echo "$description" | grep -oP "(?<=ExecStart=).*" | tr ' ' '\n' | grep -E "$REGEX" | head -n 1)
if [ -n "$CONFIG_FILE" ]; then
- if [ -f "$CONFIG_FILE" ]; then
- echo "Gefundene Datei: $CONFIG_FILE"
- read -p "Möchten Sie den Inhalt der Datei anzeigen? (Y/n): " CONFIRM
- if [[ -z "$CONFIRM" || "$CONFIRM" =~ ^[Yy]$ ]]; then
- cat "$CONFIG_FILE"
- else
- echo "Anzeigen der Datei abgebrochen."
- exit 0
- fi
+ if [ -f "$CONFIG_FILE" ]; then
+ echo "Gefundene Datei: $CONFIG_FILE"
+ read -p "Möchten Sie den Inhalt der Datei anzeigen? (Y/n): " CONFIRM
+ if [[ -z "$CONFIRM" || "$CONFIRM" =~ ^[Yy]$ ]]; then
+ cat "$CONFIG_FILE"
else
- echo "Fehler: Gefundene Datei '$CONFIG_FILE' existiert nicht oder ist nicht lesbar."
- exit 3
+ echo "Anzeigen der Datei abgebrochen."
+ exit 0
fi
+ else
+ echo "Fehler: Gefundene Datei '$CONFIG_FILE' existiert nicht oder ist nicht lesbar."
+ exit 3
+ fi
else
- echo "Fehler: Keine Datei gefunden, die dem Regex '$REGEX' entspricht."
- echo "Die aktuelle Ausgabe von 'systemctl cat $SERVICE':"
- echo "$description"
- exit 4
+ echo "Fehler: Keine Datei gefunden, die dem Regex '$REGEX' entspricht."
+ echo "Die aktuelle Ausgabe von 'systemctl cat $SERVICE':"
+ echo "$description"
+ exit 4
fi
diff --git a/scripts/bash_mouse_click.sh b/scripts/bash_mouse_click.sh
index ad5362c..6db5ea2 100644
--- a/scripts/bash_mouse_click.sh
+++ b/scripts/bash_mouse_click.sh
@@ -2,9 +2,9 @@
# Function to perform a mouse click at specific coordinates
click_at() {
- local x=$1
- local y=$2
- xdotool mousemove "$x" "$y" click 1
+ local x=$1
+ local y=$2
+ xdotool mousemove "$x" "$y" click 1
}
# First click coordinates (replace with desired values)
@@ -22,34 +22,34 @@ REPETITIONS=$1
# Validate that the number of repetitions is a positive integer
if ! [[ "$REPETITIONS" =~ ^[0-9]+$ ]]; then
- echo "Error: Number of repetitions must be a positive integer."
- exit 1
+ echo "Error: Number of repetitions must be a positive integer."
+ exit 1
fi
# Countdown from 10
echo "Starting in..."
for (( i=10; i>0; i-- ))
do
- echo "$i..."
- sleep 1
+ echo "$i..."
+ sleep 1
done
# Repeat the clicks n times
for (( i=0; i<$REPETITIONS; i++ ))
do
- # Perform first click
- click_at $FIRST_X $FIRST_Y
+ # Perform first click
+ click_at $FIRST_X $FIRST_Y
- # Wait for 5 seconds
- sleep 3
+ # Wait for 5 seconds
+ sleep 3
- # Perform second click
- click_at $SECOND_X $SECOND_Y
- sleep 1
- click_at $SECOND_X $SECOND_Y
+ # Perform second click
+ click_at $SECOND_X $SECOND_Y
+ sleep 1
+ click_at $SECOND_X $SECOND_Y
- # Wait for 5 seconds
- sleep 1
+ # Wait for 5 seconds
+ sleep 1
done
# Resetting the coordinates transformation matrix to default