🔧 add some topology information

flake.lock

@@ -978,11 +978,11 @@
         "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
-        "lastModified": 1724916929,
+        "lastModified": 1725014015,
-        "narHash": "sha256-QM8qdmnENvNGvfhLv0LsQsZgIot75Q7R8QV0Mm5I5yM=",
+        "narHash": "sha256-MFumiomiSQopOPcQgaBsqIRQZ8q2BJiEOm7bGomuu1U=",
         "ref": "main",
-        "rev": "82083225da7402d2bde9cfd3172374a96429b579",
+        "rev": "8a828064a794b75eb2459c6be499bef740c32721",
-        "revCount": 72,
+        "revCount": 74,
         "type": "git",
         "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git"
       },

flake.nix

@@ -115,7 +115,7 @@
               landingpage = landingpage.packages.${system}.plain;
               kmonad = kmonad.packages.${system}.kmonad;
               tasksh = taskshell.packages.${system}.tasksh;
-              inherit (self.packages.${system}) otpmenu taskwarrior-hooks;
+              inherit (self.packages.${system}) otpmenu taskwarrior-hooks nsxiv;
             })
           ];
         };
@@ -342,7 +342,7 @@
           clan-core.flakeModules.default
           ./nix/formatter.nix
           ./nix/packages
-          ./nix/topology.nix
+          ./nix/topology
         ];
 
         # Define your clan

homes/common/packages.nix

@@ -58,7 +58,7 @@ with lib;
         aspellDicts.es
 
         evince
-        sxiv
+        nsxiv
         gimp
         inkscape
 

homes/palo/packages/graphics.nix

@@ -16,7 +16,6 @@ with lib;
       gimp
       inkscape
       imagemagick
-      nsxiv
       blender
       lightburn
       colorpicker

machines/cherry/configuration.nix

@@ -18,6 +18,7 @@
     ./network-wireguard-wg1.nix
 
     ./37c3.nix
+    ./topology.nix
 
   ];
 

machines/cherry/topology.nix

@@ -0,0 +1,22 @@
+{ config, ... }:
+with config.lib.topology;
+{
+  topology.self = {
+
+    interfaces.wg0 = {
+      network = "wg0";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces.ztbn67ogn2 = {
+      network = "wg0";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces."tinc.private" = {
+      network = "tinc.private";
+      type = "ethernet";
+      virtual = true;
+    };
+  };
+}

machines/chungus/configuration.nix

@@ -52,6 +52,8 @@
 
     ./zerotier-controller.nix
 
+    ./topology.nix
+
   ];
 
   components.gui.enable = false;

machines/chungus/topology.nix

@@ -0,0 +1,33 @@
+{ config, ... }:
+with config.lib.topology;
+{
+  topology.self = {
+
+    interfaces.enp0s31f6 = {
+      network = "home";
+      type = "ethernet";
+    };
+    interfaces.wg0 = {
+      addresses = [ "10.100.0.2" ];
+      network = "wg0";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces.ztbn67ogn2 = {
+      network = "wg0";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces."tinc.private" = {
+      network = "tinc.private";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces."tinc.retiolum" = {
+      network = "tinc.retiolum";
+      type = "ethernet";
+      virtual = true;
+    };
+
+  };
+}

machines/orbi/configuration.nix

@@ -41,6 +41,8 @@
     #./social-jitsi.nix
     ./social-matrix-terranix.nix
 
+    ./topology.nix
+
   ];
 
   services.logrotate.checkConfig = false; # because uid 3000 does not exist in here

machines/orbi/topology.nix

@@ -0,0 +1,28 @@
+{ config, ... }:
+with config.lib.topology;
+{
+  topology.self = {
+
+    #    interfaces.enp0s31f6 = {
+    #      network = "home"; # internet
+    #      type = "ethernet";
+    #    };
+    interfaces.wg0 = {
+      addresses = [ "10.100.0.1" ];
+      network = "wg0";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces.ztbn67ogn2 = {
+      network = "wg0";
+      type = "ethernet";
+      virtual = true;
+    };
+    interfaces."tinc.private" = {
+      network = "tinc.private";
+      type = "ethernet";
+      virtual = true;
+    };
+
+  };
+}

nix/packages/default.nix

@@ -8,5 +8,6 @@ _: {
       #packages.sononym = callPackage ./sononym { };
       #packages.sononym-crawler = callPackage ./sononym-crawler { };
       packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
+      packages.nsxiv = (pkgs.nsxiv.override { conf = builtins.readFile ./nsxiv/config.def.h; });
     };
 }

nix/packages/nsxiv/config.def.h

@@ -0,0 +1,222 @@
+#ifdef INCLUDE_WINDOW_CONFIG
+
+/* default window dimensions (overwritten via -g option): */
+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 };
+#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" };
+
+/* if true, statusbar appears on top of the window */
+static const bool TOP_STATUSBAR = false;
+#endif /* HAVE_LIBFONTS */
+
+#endif
+#ifdef INCLUDE_IMAGE_CONFIG
+
+/* 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
+};
+
+/* default slideshow delay (in sec, overwritten via -S option): */
+static const int SLIDESHOW_DELAY = 5;
+
+/* color correction: the user-visible ranges [-CC_STEPS, 0] and
+ * (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;
+
+/* command i_scroll pans image 1/PAN_FRACTION of screen width/height */
+static const int PAN_FRACTION = 5;
+
+/* percentage of memory to use for imlib2's cache size.
+ *   3 means use 3% of total memory which is about 245MiB on 8GiB machine.
+ *   0 or less means disable cache.
+ * 100 means use all available memory (but not above CACHE_SIZE_LIMIT).
+ *
+ * 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 */
+
+#endif
+#ifdef INCLUDE_OPTIONS_CONFIG
+
+/* if false, pixelate images at zoom level != 100%,
+ * toggled with 'a' key binding (overwritten via `--anti-alias` option)
+ */
+static const bool ANTI_ALIAS = true;
+
+/* if true, use a checkerboard background for alpha layer,
+ * toggled with 'A' key binding (overwritten via `--alpha-layer` option)
+ */
+static const bool ALPHA_LAYER = false;
+
+/* list of whitelisted/blacklisted directory for thumbnail cache
+ * (overwritten via --cache-{allow,deny} option).
+ * see THUMBNAIL CACHING section in nsxiv(1) manpage for more details.
+ */
+static const char TNS_FILTERS[] = "";
+/* set to true to treat `TNS_FILTERS` as a blacklist instead */
+static const bool TNS_FILTERS_IS_BLACKLIST = false;
+
+#endif
+#ifdef INCLUDE_THUMBS_CONFIG
+
+/* thumbnail sizes in pixels (width == height): */
+static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
+
+/* thumbnail size at startup, index into thumb_sizes[]: */
+static const int THUMB_SIZE = 3;
+
+#endif
+#ifdef INCLUDE_MAPPINGS_CONFIG
+
+/* these modifiers will be used when processing keybindings */
+static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask;
+
+/* abort the keyhandler */
+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 },
+
+	{ 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 },
+};
+
+/* 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 },
+};
+
+/* 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 },
+};
+
+/* true means NAV_WIDTH is relative (33%), false means absolute (33 pixels) */
+static const bool NAV_IS_REL = true;
+/* width of navigation area, 0 disables cursor navigation, */
+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
+};
+
+#endif

nix/topology/default.nix

@@ -31,6 +31,7 @@
         overlays = [ inputs.nix-topology.overlays.default ];
       };
       topology.modules = [
+        ./networks.nix
         {
           # Inline module to inform topology of your existing NixOS hosts.
         }

nix/topology/networks.nix

@@ -0,0 +1,20 @@
+{ config, ... }:
+with config.lib.topology;
+{
+
+  networks.wg0 = {
+    name = "wg0";
+    cidrv4 = "10.100.0.0/24";
+  };
+
+  networks."tinc.private" = {
+    name = "tinc private";
+    cidrv4 = "10.23.42.0/24";
+  };
+
+  networks."tinc.retiolum" = {
+    name = "tinc retiolum";
+    #cidrv4 = "192.168.0.0/24";
+  };
+
+}