From be2a6de51001a58df2f79fec74ee7c3f02d79290 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Sat, 2 Dec 2023 09:59:40 +0100
Subject: [PATCH] .

---
 emacs/emacs.nix  |  1 +
 emacs/init.el    |  9 ++++++++-
 home.nix         |  1 +
 swayfx/config.in | 17 ++++++++---------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/emacs/emacs.nix b/emacs/emacs.nix
index 76c11e2..6b2a2d4 100644
--- a/emacs/emacs.nix
+++ b/emacs/emacs.nix
@@ -47,6 +47,7 @@
       forge
       geiser
       geiser-chicken
+      geiser-guile
       git-gutter
       goto-chg
       guix
diff --git a/emacs/init.el b/emacs/init.el
index 23cc81d..3b22a03 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -108,6 +108,9 @@
   (org-mode . auto-fill-mode)
   :config
   (setq org-directory "~/org")
+  (org-babel-do-load-languages
+    'org-babel-load-languages
+    '((scheme . t)))
   (add-to-list 'org-modules 'collector))
 
 (use-package org-roam
@@ -621,7 +624,11 @@ Point must be at the beginning of balanced expression (sexp)."
   :custom
   (geiser-chicken-match-limit 200)
   :config
-  (defalias 'run-geiser 'geiser))
+  (defalias 'run-geiser 'geiser)
+  (when (executable-find "guix")
+    (after! geiser-guile
+            (add-to-list 'geiser-guile-load-path
+                         (expand-file-name "~/.config/guix/current/share/guile/site/3.0")))))
 
 ;; (use-package flymake-chicken
 ;;   :hook
diff --git a/home.nix b/home.nix
index 4b37716..aed74fd 100644
--- a/home.nix
+++ b/home.nix
@@ -29,6 +29,7 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }:
     git-doc
     git-filter-repo
     grim
+    guile
     guix
     home-manager
     hyprpaper
diff --git a/swayfx/config.in b/swayfx/config.in
index 86635fe..07bbab4 100644
--- a/swayfx/config.in
+++ b/swayfx/config.in
@@ -32,8 +32,8 @@ gaps inner 15
 gaps left 700
 gaps right 700
 
-bindsym $mod+g exec swaymsg gaps outer set 0
-bindsym $mod+i exec swaymsg "gaps left 700; gaps right 700"
+bindsym $mod+g gaps outer all set 0
+bindsym $mod+i gaps left all set 700; gaps right all set 700
 
 # window corner radius in px
 corner_radius 10
@@ -111,8 +111,8 @@ input * {
     bindsym $mod+c kill
 
     # Start your launcher
-    bindsym $mod+r exec swaymsg "focus parent; split h; exec fuzzel" | xargs swaymsg exec --
-    bindsym $mod+Shift+r exec swaymsg "focus parent; split v; exec fuzzel" | xargs swaymsg exec --
+    bindsym $mod+r exec swaymsg "focus parent; split h; exec fuzzel"
+    bindsym $mod+Shift+r exec swaymsg "focus parent; split v; exec fuzzel"
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -135,6 +135,8 @@ bindsym $mod+$left focus left
 bindsym $mod+$down focus down
 bindsym $mod+$up focus up
 bindsym $mod+$right focus right
+bindsym $mod+Tab focus next sibling
+bindsym $mod+Shift+Tab focus prev sibling
 # Or use $mod+[up|down|left|right]
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
@@ -245,10 +247,6 @@ mode "resize" {
 
 # Program-Specific Layouts
 
-for_window [class="Firefox"] layout tabbed
-for_window [class="Emacs"] layout default
-for_window [app_id="kitty"] layout tabbed
-
 #
 # Status Bar:
 #
@@ -269,6 +267,7 @@ for_window [app_id="kitty"] layout tabbed
 
 # Autostarts
 exec waybar
-exec swaymsg "exec kitty; move scratchpad"
+exec kitty && sleep 0.2s
+exec swaymsg move scratchpad
 
 include @sysconfdir@/sway/config.d/*