more stuff

modules/home/desktop/niri/default.nix

@@ -14,13 +14,16 @@
 
   ifLaptop = mkIf (hostName != "dunamis");
 
-  commonArgs = {
+  commonArgs = rec {
     inherit config inputs lib osConfig perSystem pkgs;
-    launcher = getExe pkgs.walker;
+    baseMenu = getExe perSystem.vicinae.default;
+    clipboard = baseMenu + " vicinae://extensions/vicinae/clipboard/history";
+    launcher = baseMenu + " toggle";
     lockscreen = getExe pkgs.gtklock;
   };
 in {
   imports = with inputs; [
+    # vicinae.homeManagerModules.default
     walker.homeManagerModules.default
   ];
   options = {
@@ -70,7 +73,7 @@ in {
       platformTheme.name = "gtk3";
     };
 
-    programs.walker = import ./programs/walker commonArgs;
+    # programs.walker = import ./programs/walker commonArgs;
     programs.waybar = import ./programs/waybar commonArgs;
     services = import ./services commonArgs;
 
@@ -154,7 +157,7 @@ in {
             copyq = mkGraphicalService {Service.Environment = mkForce "QT_QPA_PLATFORM=wayland";};
             network-manager-applet = mkGraphicalService {};
             udiskie = mkGraphicalService {};
-            walker = mkGraphicalService {};
+            # walker = mkGraphicalService {};
             waybar = mkGraphicalService {};
             wpaperd =
               mkGraphicalService {}
@@ -186,7 +189,7 @@ in {
                 ExecStart =
                   "${pkgs.lisgd}/bin/lisgd"
                   + " -d /dev/input/by-path/pci-0000:00:15.1-platform-i2c_designware.1-event"
-                  + " -g \"1,DU,TL,*,P,niri msg action toggle-overview\""
+                  + ''-g "1,DU,TL,*,P,niri msg action toggle-overview"''
                   + " -g \"3,UD,T,*,P,niri msg action focus-workspace-up\""
                   + " -g \"3,DU,B,*,P,niri msg action focus-workspace-down\""
                   + " -g \"3,LR,L,*,P,niri msg action focus-column-left\""

modules/home/desktop/niri/niri.nix

@@ -4,6 +4,7 @@
   osConfig,
   perSystem,
   # pkgs,
+  clipboard,
   launcher,
   lockscreen,
   ...
@@ -303,12 +304,12 @@ in {
       Mod+Ctrl+Space   repeat=false { toggle-overview; }
 
       Mod+Return       repeat=false { spawn "/bin/sh" "-c" "$TERMINAL"; }
-      Mod+BackSpace    repeat=false { spawn "${launcher}"; }
-      Mod+A            repeat=false { spawn "${launcher}"; }
+      Mod+BackSpace    repeat=false { spawn "sh" "-c" "${launcher}"; }
+      Mod+D            repeat=false { spawn "sh" "-c" "${launcher}"; }
       Mod+Ctrl+L       repeat=false { spawn "${lockscreen}"; }
-      Mod+Ctrl+V       repeat=false { spawn "copyq" "menu"; }
+      Mod+Ctrl+V       repeat=false { spawn "sh" "-c" "${clipboard}"; }
 
-      Mod+Shift+W      repeat=false { spawn "walker" "-m" "windows"; }
+      // Mod+Shift+W      repeat=false { spawn "walker" "-m" "windows"; }
 
       Mod+Ctrl+Shift+BracketLeft   { quit; }
       Mod+Ctrl+Shift+BracketRight  { power-off-monitors; }

modules/home/desktop/niri/services/default.nix

@@ -1,8 +1,9 @@
 {
+  config,
   lib,
+  lockscreen,
   osConfig,
   pkgs,
-  lockscreen,
   ...
 }:
 lib.attrsets.recursiveUpdate {
@@ -17,6 +18,7 @@ lib.attrsets.recursiveUpdate {
   # swaync = import ./swaync;
   swayosd.enable = true;
   udiskie.enable = true;
+  # vicinae = import ./vicinae;
   wpaperd.enable = true;
 }
 {