feat(tinc): reaload if changed (stolen from @Mic92)

configs/default.nix

@@ -22,7 +22,7 @@ in {
           allowUnfree = true;
           packageOverrides = pkgs: {
             nur = import (builtins.fetchTarball
-              "https://github.com/nix-community/NUR/archive/aea85375c7a82297d977904de8dd7f41baf2d59a.tar.gz") {
+              "https://github.com/nix-community/NUR/archive/222ea29ec4afb09c5565a7e5dda14bfd65a4a9f6.tar.gz") {
                 inherit pkgs;
               };
             writeDashBin = pkgs.writers.writeDashBin;

configs/i3.nix

@@ -27,6 +27,9 @@ let
       "betacode" = pkgs.writers.writeDash "betacode" ''
         ${pkgs.scripts.betacode}/bin/betacode
       '';
+      "devanagari" = pkgs.writers.writeDash "devanagari" ''
+        ${pkgs.scripts.devanagari}/bin/devanagari
+      '';
     };
   };
 
@@ -173,8 +176,6 @@ in {
         "${modifier}+k" = "focus up";
         "${modifier}+l" = "focus right";
 
-        "${modifier}+Menu" = "exec ${klem}/bin/klem";
-
         "${modifier}+Shift+b" = "move window to workspace prev";
         "${modifier}+Shift+n" = "move window to workspace next";
         "${modifier}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
@@ -228,6 +229,7 @@ in {
         "${modifier}+F9" = "exec ${pkgs.redshift}/bin/redshift -O 4000 -b 0.85";
         "${modifier}+F10" = "exec ${pkgs.redshift}/bin/redshift -x";
         "${modifier}+F11" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
+        "${modifier}+F12" = "exec ${klem}/bin/klem";
 
         "Print" = "exec flameshot-once";
         "XF86AudioLowerVolume" =

configs/packages/default.nix

@@ -109,6 +109,7 @@ in {
     scripts.showkeys-toggle
     scripts.favicon
     scripts.ipa # XSAMPA to IPA converter
+    scripts.devanagari
     scripts.betacode # ancient greek betacode to unicode converter
     nur.repos.kmein.mahlzeit
     # nur.repos.kmein.slide

configs/wallpaper.nix

@@ -28,13 +28,13 @@ in {
 
   krebs.fetchWallpaper = {
     enable = true;
-    unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
+    # unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
-    url = "http://prism.r/realwallpaper.png";
+    url = "https://lassul.us/wallpaper-marker.png";
   };
 
   services.xserver = {
     display = lib.mkForce 0; # needed for fetchWallpaper to find the X display
-    displayManager.sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +LOCAL:"; 
+    displayManager.sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +LOCAL:";
   };
 
   /*

modules/retiolum.nix

@@ -55,6 +55,11 @@ in {
         mkdir -p /etc/tinc/${netname}/hosts/
         cp ${hostsPackage}/* /etc/tinc/${netname}/hosts/
       '';
+
+      # Some hosts require VPN for nixos-rebuild, so we don't want to restart it on update
+      reloadIfChanged = true;
+      # also in https://github.com/NixOS/nixpkgs/pull/106715
+      serviceConfig.ExecReload = "${config.services.tinc.networks.${netname}.package}/bin/tinc -n ${netname} reload";
     };
 
     networking.extraHosts =

packages/scripts/default.nix

@@ -204,6 +204,21 @@ in rec {
     sys.stdout.write(betacode.conv.beta_to_uni(sys.stdin.read()))
   '';
 
+  devanagari = pkgs.writers.writePython3Bin "devanagari" {
+    libraries = [ pkgs.nur.repos.kmein.python3Packages.indic-transliteration ];
+  } ''
+    from indic_transliteration import sanscript
+    from indic_transliteration.sanscript import transliterate
+    import sys
+
+    # Harvard Kyoto -> Devanagari
+    sys.stdout.write(transliterate(
+      sys.stdin.read(),
+      sanscript.HK,
+      sanscript.DEVANAGARI
+    ))
+  '';
+
   manual-sort = pkgs.writers.writeHaskellBin "manual-sort" {} ''
     {-# LANGUAGE LambdaCase #-}
     import Data.Char (toLower)