common/packages.nix

@@ -31,8 +31,6 @@
       interception-tools
       jq
       lm_sensors
-      man-pages
-      man-pages-posix
       meson
       mosh
       msmtp

nixy/configuration.nix

@@ -169,23 +169,27 @@
     sway.enable = true;
   };
 
-  documentation.dev.enable = true;
-
   # List services that you want to enable:
   systemd = {
     services = {
-      "zremap@" = {
+      "zremap" = {
-        enable = true;
+        description = "Intercepts keyboard udev events";
-        restartIfChanged = true;
+        wants = ["systemd-udevd.service"];
+        wantedBy = ["multi-user.target"];
         serviceConfig.Nice = -20;
-        unitConfig = {
+        script = ''
-          Description = "zremap on %I";
+                 sleep 1
-          ConditionPathExists = "%I";
+                 KBD1="/dev/input/by-path/platform-i8042-serio-0-event-kbd"
-        };
+          KBD2="/dev/input/by-path/pci-0000:07:00.3-usbv2-0:1.1.3.2:1.1-event-kbd"
-        serviceConfig = {
+          if [ -L "$KBD1" ]; then
-          Type = "simple";
+            ${zremap.defaultPackage.${system}}/bin/zremap "$KBD1" &
-          ExecStart = "${zremap.defaultPackage.${system}}/bin/zremap %I";
+          fi
-        };
+          if [ -L "$KBD2" ]; then
+            ${zremap.defaultPackage.${system}}/bin/zremap "$KBD2" &
+          fi
+
+          wait
+        '';
       };
     };
 
@@ -213,20 +217,21 @@
       pulse.enable = true;
     };
 
-    libinput.enable = true;
     xserver = {
       enable = true;
       dpi = 144;
+      libinput.enable = true;
       desktopManager.xterm.enable = false;
       displayManager = {
         lightdm.enable = false;
         startx.enable = true;
+        defaultSession = "none+i3";
       };
       windowManager.i3.enable = false;
     };
 
     udev = {
-      packages = [pkgs.openhantek6022 pkgs.openocd];
+      packages = [pkgs.rtl-sdr pkgs.openhantek6022 pkgs.openocd];
       extraRules = ''
         #Xilinx FTDI
         ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@@ -237,9 +242,6 @@
 
         #Arduino UNO r4
         SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", MODE:="0666"
-
-        #zremap on new keyboard
-        ACTION=="add", SUBSYSTEM=="input", ATTRS{phys}!="", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", ENV{ID_INPUT_KEYBOARD}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="zremap@$env{DEVNAME}.service"
       '';
     };
 
@@ -293,16 +295,13 @@
       settings = {
         ipv6_servers = true;
         require_dnssec = true;
-        require_nolog = true;
-        require_nofilter = true;
-        http3 = true;
 
         sources.public-resolvers = {
           urls = [
             "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
             "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
           ];
-          cache_file = "public-resolvers.md";
+          cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
           minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
         };
       };
@@ -415,7 +414,6 @@
       driSupport32Bit = true;
       extraPackages = with pkgs; [];
     };
-    rtl-sdr.enable = true;
   };
 
   zramSwap = {