From fb2183435bec47bbc4e03f5981291bfdadb6603e Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Thu, 16 Nov 2023 12:09:43 +0100
Subject: [PATCH] No risk, no fun

---
 emacs/init.el         | 22 +++++++++++++++-------
 home.nix              |  1 +
 hyprland/hyprland.nix |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 89e5508..346f65c 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -63,13 +63,16 @@
    (read-only t cursor-intangible t face minibuffer-prompt))
   (tab-always-indent 'complete)
   (enable-recursive-minibuffers t)
+  (enable-remote-dir-locals t)
   (global-hl-line-mode t)
   (menu-bar-mode nil)
   (scroll-bar-mode nil)
   (tool-bar-mode nil)
   (recentf-mode t)
   :hook
-  (minibuffer-setup . cursor-intangible-mode))
+  (minibuffer-setup . cursor-intangible-mode)
+  :config
+  (advice-add 'risky-local-variable-p :override #'ignore))
 
 ;;;; Org Mode
 (use-package org
@@ -294,16 +297,19 @@
 ;;;; Lisp Navigation and Editing
 ;;;;; Basic
 (use-package lispy
-  ;;:custom
-  ;;(lispy-compat ("cider" "edebug" "magit-blame-mode"))
+  :custom
+  (lispy-close-quotes-at-end-p t)
+  (lispy-compat '("cider" "edebug" "magit-blame-mode"))
+  (lispy-visit-method #'consult-find)
+  (lispy-occur-backend #'consult-line)
   :hook
   emacs-lisp-mode
+  scheme-mode
   :config
-  (setq lispy-close-quotes-at-end-p t)
   (evil-define-key 'insert 'prog-mode-map
     "(" #'lispy-parens
     "{" #'lispy-braces
-    "}" #'special-lispy-brackets
+    "}" #'lispy-brackets
     ")" #'lispy-right-nostring
     "\"" #'lispy-quotes
     (kbd "<DEL>") #'lispy-delete-backward
@@ -324,7 +330,8 @@
 ;;;;; Visual Aid
 (use-package rainbow-delimiters
   :hook
-  emacs-lisp-mode)
+  emacs-lisp-mode
+  scheme-mode)
 
 ;;;; Programming
 (use-package editorconfig
@@ -401,7 +408,8 @@
   (require 'sesman)
   (sesman-install-menu clojure-mode-map)
   :hook
-  ((clojure-ts-mode . eglot-ensure)
+  ((clojure-ts-mode . lispy-mode)
+   (clojure-ts-mode . eglot-ensure)
    (clojure-ts-mode . rainbow-delimiters-mode)
    (clojure-ts-mode . (lambda ()
 			(setq-local sesman-system 'CIDER)))
diff --git a/home.nix b/home.nix
index 2be21c4..72e7277 100644
--- a/home.nix
+++ b/home.nix
@@ -34,6 +34,7 @@ args@{ config, pkgs, hyprland, split-monitor-workspaces, flatpaks, ... }:
     libsForQt5.okular
     libuuid
     lm_sensors
+    gnumake
     (nerdfonts.override { fonts = [ "VictorMono" "MPlus" ]; })
     nil
     nixfmt
diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix
index 40c9e26..cd561fd 100644
--- a/hyprland/hyprland.nix
+++ b/hyprland/hyprland.nix
@@ -111,8 +111,8 @@
         "$mainMod, down, movefocus, d"
 
         # Move windows inside a workspace
-        "$mainMod SHIFT, h, movewindoworgroup, l"
-        "$mainMod SHIFT, l, movewindoworgroup, r"
+        "$mainMod SHIFT, a, movewindoworgroup, l"
+        "$mainMod SHIFT, d, movewindoworgroup, r"
 
         #Handle tabbed windows
         "$mainMod, tab, changegroupactive,"