Framework fixed

disko/impermanence-btrfs-luks.nix

@@ -54,10 +54,6 @@
                       mountpoint = "/";
                       mountOptions = ["subvol=root" "compress=zstd" "noatime"];
                     };
-                    "/home" = {
-                      mountpoint = "/home";
-                      mountOptions = ["subvol=home" "compress=zstd" "noatime"];
-                    };
                     "/nix" = {
                       mountpoint = "/nix";
                       mountOptions = ["subvol=nix" "compress=zstd" "noatime"];

nixos/homes/kylekrein/lisgd-config.h

@@ -15,34 +15,38 @@ unsigned int distancethreshold_pressed = 60;
 unsigned int degreesleniency = 15;
 unsigned int timeoutms = 800;
 unsigned int orientation = 0;
-unsigned int verbose = 0;
+unsigned int verbose = 1;
 double edgesizeleft = 50.0;
 double edgesizetop = 50.0;
 double edgesizeright = 50.0;
 double edgesizebottom = 50.0;
 double edgessizecaling = 1.0;
-char *device = "/dev/input/touchscreen";
+char *device = "/dev/input/event7";
 
 // Gestures can also be specified interactively from the command line using -g
 Gesture gestures[] = {
-    /* nfingers  gesturetype  command */
-    //{1, SwipeLR, EdgeAny, DistanceAny, ActModeReleased, "niri msg action "},
-    //{1, SwipeRL, EdgeAny, DistanceAny, ActModeReleased,
-    // "xdotool key --clearmodifiers Alt+Shift+r"},
-    //{1, SwipeDLUR, EdgeAny, DistanceAny, ActModeReleased, "sxmo_vol.sh up"},
-    //{1, SwipeURDL, EdgeAny, DistanceAny, ActModeReleased, "sxmo_vol.sh down"},
-    //{1, SwipeDRUL, EdgeAny, DistanceAny, ActModeReleased,
-    // "sxmo_brightness.sh up"},
-    //{1, SwipeULDR, EdgeAny, DistanceAny, ActModeReleased,
-     //"sxmo_brightness.sh down"},
-    //{2, SwipeLR, EdgeAny, DistanceAny, ActModeReleased,
-    // "xdotool key --clearmodifiers Alt+e"},
-    //{2, SwipeRL, EdgeAny, DistanceAny, ActModeReleased,
-    // "xdotool key --clearmodifiers Alt+r"},
-    {2, SwipeDU, EdgeAny, DistanceAny, ActModeReleased,
-     "pidof wvkbd-mobintl || wvkbd-mobintl -l simple,special,emoji &"},
-    {2, SwipeUD, EdgeAny, DistanceAny, ActModeReleased,
-     "pkill -9 -f wvkbd-mobintl"},
+    {1, SwipeRL, EdgeRight, DistanceAny, ActModeReleased,
+     "niri msg action focus-column-right"},
+    {1, SwipeLR, EdgeLeft, DistanceAny, ActModeReleased,
+     "niri msg action focus-column-left"},
+    {1, SwipeDU, CornerBottomRight, DistanceMedium, ActModeReleased,
+     "niri msg action focus-workspace-down"},
+    {1, SwipeUD, CornerTopRight, DistanceMedium, ActModeReleased,
+     "niri msg action focus-workspace-up"},
+    //{1, SwipeUD, EdgeTop, DistanceAny, ActModeReleased, "nwggrid -o 0.98"},
+    //"pkill -SIGRTMIN -f wvkbd"},
+    //{2, SwipeUD, EdgeAny, DistanceAny, ActModeReleased,
+     //"sway-interactive-screenshot -s focused-output"},
+    //{3, SwipeLR, EdgeAny, DistanceAny, ActModeReleased,
+     //"swaymsg layout tabbed"},
+    //{3, SwipeRL, EdgeAny, DistanceAny, ActModeReleased,
+     //"swaymsg layout toggle split"},
+    {2, SwipeUD, EdgeLeft, DistanceShort, ActModePressed, "niri msg action fullscreen-window"},
+    {2, SwipeUD, EdgeRight, DistanceMedium, ActModeReleased, "niri msg action close-window"},
+    {1, SwipeDU, EdgeBottom, DistanceAny, ActModeReleased,
+     "kill -34 $(ps -C wvkbd-mobintl)"},
+    //{2, SwipeUD, EdgeBottom, DistanceAny, ActModeReleased,
+     //"pkill -9 -f wvkbd-mobintl"},
     {3, SwipeDU, EdgeAny, DistanceAny, ActModeReleased,
      "niri msg action toggle-overview"},
 };

nixos/homes/kylekrein/niri.nix

@@ -9,7 +9,11 @@
   hwconfig,
   username,
   ...
-}: {
+}: 
+let 
+lisgd-patched = pkgs.callPackage ./lisgd.nix {};
+in
+{
   programs.fuzzel = {
     enable = true;
     settings.main.terminal = "kitty";
@@ -36,6 +40,7 @@
     ]
     ++ lib.optionals (hwconfig.hasTouchscreen) (with pkgs; [
       wvkbd # https://github.com/jjsullivan5196/wvkbd
+      lisgd-patched
     ]);
   programs.niri = {
     settings = {
@@ -61,12 +66,19 @@
         };
         touchscreen-gestures = lib.mkIf (hwconfig.hasTouchscreen) {
           command = [
-            "${lib.getExe (import ./lisgd.nix {inherit pkgs;})}" #https://git.sr.ht/~mil/lisgd
+            "while true; do ${lisgd-patched}/bin/lisgd; done" #https://git.sr.ht/~mil/lisgd
+          ];
+        };
+	touchscreen-keyboard = lib.mkIf(hwconfig.hasTouchscreen){
+	  command = [
+	    "wvkbd-mobintl"
+	    "--hidden"
 	  ];
 	};
       in [
         set-low-brightness
         touchscreen-gestures
+	touchscreen-keyboard
         {
           command = [
             "${lib.getExe pkgs.networkmanagerapplet}"
@@ -179,6 +191,7 @@
         "Mod+Tab".action = toggle-overview;
       };
       input = {
+        power-key-handling.enable = hwconfig.hostname != "kylekrein-framework12";
         focus-follows-mouse = {
           #enable = true;
         };

nixos/users/kylekrein/default.nix

@@ -14,7 +14,7 @@ in {
   users.users.${username} = {
     isNormalUser = true;
     description = "Aleksandr Lebedev";
-    extraGroups = ["networkmanager" "wheel"];
+    extraGroups = ["networkmanager" "wheel" "input"];
     #initialPassword = "1234";
     hashedPasswordFile = config.sops.secrets."users/${username}".path;
     packages = with pkgs; [];