.config/emacs/init.org

@@ -229,11 +229,6 @@ Finish up
    org-download
    valign
    ;; Programming Languages
-   tuareg
-   dune
-   merlin
-   merlin-eldoc
-   utop
    highlight-quoted
    rustic
    ob-rust
@@ -2451,8 +2446,8 @@ it doesn't close it.
 (require 'tuareg)
 (require 'dune)
 (require 'utop)
-;; (require 'merlin)
-;; (require 'merlin-eldoc)
+(require 'merlin)
+(require 'merlin-eldoc)
 ;; Might be worth checking out, depeding on whether we stick with flycheck or not
 ;; (elpaca 'flycheck-ocaml)
 ;; Also check this out, see if it adds anything
@@ -2469,7 +2464,6 @@ it doesn't close it.
       (substring (shell-command-to-string
                   "opam config var share 2> /dev/null") 0 -1))
 (add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
-(add-to-list 'exec-path "/home/joe/.opam/default/bin/")
 #+end_src
 
 We won't use the LSP server but rather directly talk to Merlin, since I guess LSP just wraps Merlin
@@ -2751,7 +2745,7 @@ Org mode buffers have associated files.
 #+begin_src emacs-lisp
 (setq org-agenda-files '("~/Notes/Schedule.org" "~/Notes/Daily.org"))
 (setq org-agenda-time-grid '((daily today require-timed)
-                             (700 900 1200 1700 1900 2030 2300)
+                             (700 900 1200 1700 1900 20:30 23:00)
                              " ═════ "
                              " ════════════════════ "))
 (define-key global-map (kbd "C-c a") #'org-agenda)
@@ -2764,10 +2758,9 @@ Org mode buffers have associated files.
          ((agenda ""
                   ((org-agenda-overriding-header "Daily Agenda")
                    (org-agenda-span 1)
-                   ;; (org-agenda-time-grid nil)
-                   ;; (org-agenda-overriding-columns-format "%20ITEM %DEADLINE")
-                   (org-agenda-view-columns-initially nil)
-                   ))
+                   (org-agenda-time-grid nil)
+                   (org-agenda-overriding-columns-format "%20ITEM %DEADLINE")
+                   (org-agenda-view-columns-initially nil)))
           (tags-todo "dampsig"
                      ((org-agenda-overriding-header "🖥️📚🔢⚛️📊🕹️ DAMPSIG\n")
                       (org-agenda-block-separator ?*)))

.config/fish/config.fish

@@ -77,6 +77,3 @@ end
 fish_ssh_agent
 # The next line updates PATH for the Google Cloud SDK.
 if [ -f '/home/joe/Downloads/google-cloud-sdk/path.fish.inc' ]; . '/home/joe/Downloads/google-cloud-sdk/path.fish.inc'; end
-
-# opam configuration
-source /home/joe/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true

.config/qtile/config.py

@@ -74,7 +74,6 @@ def toggle_language(qtile):
         qtile.spawn("setxkbmap -layout us -variant altgr-intl")
         current_language[0] = "en"
 
-
 keys = [
     # A list of available commands that can be bound to keys can be found
     # at https://docs.qtile.org/en/latest/manual/config/lazy.html
@@ -258,17 +257,6 @@ def go_to_group(name: str) -> Callable:
         qtile.groups_map[name].toscreen()
     return _inner
 
-def swap_windows(name: str) -> Callable:
-    def _inner(qtile) -> None:
-        other_windows = [*qtile.groups_map[name].windows]
-        current_windows = [*qtile.current_group.windows]
-        for win in current_windows:
-            win.togroup(name)
-        for win in other_windows:
-            win.togroup(qtile.current_group.name)
-
-    return _inner
-
 for i in groups:
     keys.extend(
         [
@@ -287,12 +275,6 @@ for i in groups:
                 lazy.window.togroup(i.name, switch_group=False),
                 desc="Switch to & move focused window to group {}".format(i.name),
             ),
-            Key(
-                [mod, "control"],
-                i.name,
-                lazy.function(swap_windows(i.name)),
-                desc="Swap all windows with windows from N group".format(i.name),
-            ),
             # Or, use below if you prefer not to switch to that group.
             # # mod1 + shift + letter of group = move focused window to group
             # Key([mod, "shift"], i.name, lazy.window.togroup(i.name),