From eeb0baf8b029ce77c2d6ff0f6aaf3f19561437b2 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Fri, 21 Jul 2023 18:13:19 +0200
Subject: [PATCH] feat: fixes to river and kile

---
 home/desktop-river/init.nix       |  2 ++
 home/desktop-river/kile/layout.kl | 14 ++++++++++++--
 home/nixos-common.nix             |  9 ++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/home/desktop-river/init.nix b/home/desktop-river/init.nix
index b03d52a..d42bc6e 100644
--- a/home/desktop-river/init.nix
+++ b/home/desktop-river/init.nix
@@ -161,6 +161,8 @@ in {
           ${riverctl} map $mode None XF86MonBrightnessDown spawn '${light} -U 5'
       done
 
+      ${riverctl} attach-mode bottom
+
       # Set background and border color
       ${riverctl} background-color 0x282828
       ${riverctl} border-color-focused 0x458588
diff --git a/home/desktop-river/kile/layout.kl b/home/desktop-river/kile/layout.kl
index 12765d1..f3a74cd 100644
--- a/home/desktop-river/kile/layout.kl
+++ b/home/desktop-river/kile/layout.kl
@@ -8,7 +8,17 @@ const right ([- 1 -] hor_base)
 
 const deck  Deck
 const full  Full
-const wide  ([- 1 -] (Vertical | Horizontal Horizontal Horizontal))
-const cols  ([0 0 0] Vertical)
+# const wide  ([- 1 -] (Vertical | Horizontal Horizontal Horizontal))
+const wide (
+  3 <
+    ([1 0 -] (Vertical | Horizontal Horizontal))
+  ? (
+      4 <
+        ([1 1 -] (Vertical | Horizontal Horizontal Horizontal))
+      ? ([- 1 -] (Vertical | Horizontal Horizontal Horizontal))
+    )
+)
+
+const cols ([0 - -] Vertical)
 
 const default left
diff --git a/home/nixos-common.nix b/home/nixos-common.nix
index e7d0511..55a4fc9 100644
--- a/home/nixos-common.nix
+++ b/home/nixos-common.nix
@@ -20,20 +20,19 @@
     (self: super: {
       kile-wl = super.rustPlatform.buildRustPackage rec {
         pname = "kile-wl";
-        version = "2023-07-09";
-
+        version = "2023-07-20";
         src = super.fetchFromGitLab {
           owner = "snakedye";
           repo = "kile";
-          rev = "f66d94a97b0cf6f2b5440ae884794a04b59fc5a3";
-          sha256 = "sha256-6mHjrI+m8lmKk+gEV1AeutpZ8GK4iSak/FxbNeF+w9E=";
+          rev = "e32cacf57ce69923482e56ea633a568ed06c9abf";
+          sha256 = "sha256-TGsdsKd9KrLu9eLTCS/zDXqSrHsiy0Wjxkq5ouCP8bg=";
         };
 
         cargoLock = {
           lockFile = src + "/Cargo.lock";
           outputHashes = {
             "kilexpr-0.1.0" =
-              "sha256-zxXxAekkuSw9/4rkEhXNbH5YrBYfGGX4iYMoRoSY3Wc=";
+              "sha256-Bw6vYtzhheAJ8NLQtr3gLjZ9/5ajuABURRYDnVF9W1Y=";
           };
         };