feat: kile v2

home/desktop-river/default.nix

@@ -2,11 +2,11 @@
 
 {
   imports = [
+    ./kile
     ./bemenu.nix
     ./foot.nix
     ./init.nix
     ./kanshi.nix
-    ./kile.nix
     ./mako.nix
     ./swaybg.nix
     ./swaylock.nix
@@ -18,7 +18,6 @@
     glib
     gsettings-desktop-schemas
     imv
-    kile-wl
     light
     pamixer
     playerctl

home/desktop-river/kile.nix

@@ -1,64 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  shell = "${pkgs.dash}/bin/dash";
-
-  default_master_ratio = "0.6";
-  up_layout = "Up ((h: v v) 1 ${default_master_ratio} 0)";
-  down_layout = "Down ((h: v v) 1 ${default_master_ratio} 1)";
-  left_layout = "Left ((v: h h) 1 ${default_master_ratio} 0)";
-  right_layout = "Right ((v: h h) 1 ${default_master_ratio} 1)";
-  deck_layout = "Deck deck";
-  full_layout = "Full full";
-  wide_layout = "Wide ((v: h h h) 1 0.5 1)";
-  column_layout = "Cols (v: v)";
-  default_layout = left_layout;
-
-  riverctl = "${pkgs.river}/bin/riverctl";
-  kile = "${pkgs.kile-wl}/bin/kile";
-  kile_namespace = "kile";
-
-in {
-
-  systemd.user.services.kile-wl = {
-    Unit = {
-      Description = "kile layout generator";
-      BindsTo = [ "river-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart =
-        "${kile} --namespace ${kile_namespace} --layout '${default_layout}'";
-    };
-    Install = { WantedBy = [ "river-session.target" ]; };
-  };
-
-  xdg.dataFile.init-kile = {
-    executable = true;
-    target = "${config.xdg.configHome}/river/init-kile";
-    text = ''
-      #!${shell}
-
-      # Super+H and Super+L to decrease/increase the main ratio
-      ${riverctl} map -repeat normal Super Equal send-layout-cmd ${kile_namespace} "mod_main_ratio +0.01"
-      ${riverctl} map -repeat normal Super Minus send-layout-cmd ${kile_namespace} "mod_main_ratio -0.01"
-
-      # Super+Comma and Super+Period. to increment/decrement the main count
-      ${riverctl} map normal Super Comma  send-layout-cmd ${kile_namespace} "mod_main_amount +1"
-      ${riverctl} map normal Super Period send-layout-cmd ${kile_namespace} "mod_main_amount -1"
-
-      # Super+{Up,Right,Down,Left} to change layout orientation
-      ${riverctl} map normal Super+Control K send-layout-cmd ${kile_namespace} "focused ${up_layout}"
-      ${riverctl} map normal Super+Control J send-layout-cmd ${kile_namespace} "focused ${down_layout}"
-      ${riverctl} map normal Super+Control H send-layout-cmd ${kile_namespace} "focused ${left_layout}"
-      ${riverctl} map normal Super+Control L send-layout-cmd ${kile_namespace} "focused ${right_layout}"
-      ${riverctl} map normal Super+Control D send-layout-cmd ${kile_namespace} "focused ${deck_layout}"
-      ${riverctl} map normal Super+Control F send-layout-cmd ${kile_namespace} "focused ${full_layout}"
-      ${riverctl} map normal Super+Control W send-layout-cmd ${kile_namespace} "focused ${wide_layout}"
-      ${riverctl} map normal Super+Control C send-layout-cmd ${kile_namespace} "focused ${column_layout}"
-      ${riverctl} map normal Super+Shift Space send-layout-cmd ${kile_namespace} "focused ${default_layout}"
-
-      ${riverctl} default-layout ${kile_namespace}
-    '';
-  };
-}

home/desktop-river/kile/default.nix

@@ -0,0 +1,72 @@
+{ config, pkgs, ... }:
+
+let
+  shell = "${pkgs.dash}/bin/dash";
+
+  default_master_ratio = "0.6";
+  up_layout = "Up ((h: v v) 1 ${default_master_ratio} 0)";
+  down_layout = "Down ((h: v v) 1 ${default_master_ratio} 1)";
+  left_layout = "Left ((v: h h) 1 ${default_master_ratio} 0)";
+  right_layout = "Right ((v: h h) 1 ${default_master_ratio} 1)";
+  deck_layout = "Deck deck";
+  full_layout = "Full full";
+  wide_layout = "Wide ((v: h h h) 1 0.5 1)";
+  column_layout = "Cols (v: v)";
+  default_layout = left_layout;
+
+  riverctl = "${pkgs.river}/bin/riverctl";
+  kile = "${pkgs.kile-wl}/bin/kile";
+  kile_namespace = "kile";
+
+in {
+
+  home.packages = with pkgs; [ kile-wl ];
+
+  systemd.user.services.kile-wl = {
+    Unit = {
+      Description = "kile layout generator";
+      BindsTo = [ "river-session.target" ];
+    };
+    Service = {
+      Type = "simple";
+      ExecStart =
+        "${kile} --namespace ${kile_namespace}";
+    };
+    Install = { WantedBy = [ "river-session.target" ]; };
+  };
+
+  xdg.dataFile = {
+    layout = {
+      target = "${config.xdg.configHome}/river/layout.kl";
+      source = ./layout.kl;
+    };
+    init-kile = {
+      executable = true;
+      target = "${config.xdg.configHome}/river/init-kile";
+      text = ''
+        #!${shell}
+
+        # Super+H and Super+L to decrease/increase the main ratio
+        ${riverctl} map -repeat normal Super Equal send-layout-cmd ${kile_namespace} "mod_main_ratio +0.01"
+        ${riverctl} map -repeat normal Super Minus send-layout-cmd ${kile_namespace} "mod_main_ratio -0.01"
+
+        # Super+Comma and Super+Period. to increment/decrement the main count
+        ${riverctl} map normal Super Comma  send-layout-cmd ${kile_namespace} "mod_main_amount +1"
+        ${riverctl} map normal Super Period send-layout-cmd ${kile_namespace} "mod_main_amount -1"
+
+        # Super+{Up,Right,Down,Left} to change layout orientation
+        ${riverctl} map normal Super+Control K send-layout-cmd ${kile_namespace} "focused ${up_layout}"
+        ${riverctl} map normal Super+Control J send-layout-cmd ${kile_namespace} "focused ${down_layout}"
+        ${riverctl} map normal Super+Control H send-layout-cmd ${kile_namespace} "focused ${left_layout}"
+        ${riverctl} map normal Super+Control L send-layout-cmd ${kile_namespace} "focused ${right_layout}"
+        ${riverctl} map normal Super+Control D send-layout-cmd ${kile_namespace} "focused ${deck_layout}"
+        ${riverctl} map normal Super+Control F send-layout-cmd ${kile_namespace} "focused ${full_layout}"
+        ${riverctl} map normal Super+Control W send-layout-cmd ${kile_namespace} "focused ${wide_layout}"
+        ${riverctl} map normal Super+Control C send-layout-cmd ${kile_namespace} "focused ${column_layout}"
+        ${riverctl} map normal Super+Shift Space send-layout-cmd ${kile_namespace} "focused ${default_layout}"
+
+        ${riverctl} default-layout ${kile_namespace}
+      '';
+    };
+  };
+}

home/desktop-river/kile/layout.kl

@@ -0,0 +1,8 @@
+const ver Vertical
+const hor Horizontal
+
+const vsplit (ver | hor ([1 - 0.5] *hsplit))
+const hsplit (hor | ver ([1 - 0.5] *vsplit))
+
+# Preview
+const default vsplit

home/nixos-common.nix

@@ -18,27 +18,39 @@
     # })
 
     (self: super: {
-      # get latest version of kile-wl for compatibility with river's latest version
+      kile-wl = super.rustPlatform.buildRustPackage rec {
-      kile-wl = super.kile-wl.overrideAttrs (old: rec {
+        pname = "kile-wl";
-        version = "2023-04-13";
+        version = "v2-2023-05-19";
+
         src = super.fetchFromGitLab {
           owner = "snakedye";
           repo = "kile";
-          rev = "d5b6c1fd0f260e823e08811dae202e9394037c43";
+          rev = "625f91010b920587dbf0ee23113eb8aa51cc6ec3";
-          sha256 = "sha256-bWtuLSw4e57YOjdzbY7yobbe4kp67YzG15nhNce3pxA=";
+          sha256 = "sha256-4sfzF2g2kSz+Q55gTCePjM+7kvfrEJ2uLKyy/V+SLF4=";
         };
-        cargoDeps = old.cargoDeps.overrideAttrs (_: {
+
-          inherit src;
+        cargoLock = {
-          outputHash = "sha256-yXIW1/KHmUS9ubRYI8nAKD2VZaQ+vCyCBhm788pLpwA=";
+          lockFile = src + "/Cargo.lock";
-        });
+          outputHashes = {
-      });
+            "kilexpr-0.1.0" =
+              "sha256-wclffEkPr1rIYdeRTIb1FZhMbX5LhLy8yB0qMEDmx0k=";
+          };
+        };
+
+        meta = with super.lib; {
+          description = "A tiling layout generator for river";
+          homepage = "https://gitlab.com/snakedye/kile";
+          license = licenses.mit;
+          platforms =
+            platforms.linux; # It's meant for river, a wayland compositor
+          mainProgram = "kile";
+        };
+      };
     })
 
-    # I need the stable version of river to keep it compatible with kile
+    # These packages seem to be broken on the unstable channel, so I'm using
-    # (self: super: { river = stablePkgs.river; })
+    # the stable versions for now. Currently this is not happening for any
-
+    # package that I use :)
-    # these packages seem to be broken on the unstable channel, so I'm using
-    # the stable versions for now
   ];
 
   # Let Home Manager install and manage itself.