Some fixes for org transclusion

flake.lock

@@ -547,6 +547,22 @@
         "type": "indirect"
       }
     },
+    "mini-frame": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1685981796,
+        "narHash": "sha256-HsGEu37oq2uuQFfE2m++VH1SwyGC89ChnmrBVFC/WME=",
+        "owner": "muffinmad",
+        "repo": "emacs-mini-frame",
+        "rev": "f420020aa33a1b00407000addd995170a36e026e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "muffinmad",
+        "repo": "emacs-mini-frame",
+        "type": "github"
+      }
+    },
     "nix-doom-emacs": {
       "inputs": {
         "doom-emacs": "doom-emacs",
@@ -888,6 +904,7 @@
         "home-manager": "home-manager",
         "hyprland-plugins": "hyprland-plugins",
         "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
+        "mini-frame": "mini-frame",
         "nix-doom-emacs": "nix-doom-emacs",
         "nix-straight": "nix-straight",
         "nixpkgs": "nixpkgs",

flake.nix

@@ -4,7 +4,7 @@
   outputs = inputs@{ self, nixpkgs, nixpkgs-staging-next, nixpkgs-stable, emacs-pin-nixpkgs,
                      kdenlive-pin-nixpkgs, home-manager, nix-doom-emacs, nix-straight, stylix,
                      blocklist-hosts, hyprland-plugins, rust-overlay, org-nursery, org-yaap,
-                     org-side-tree, org-timeblock, phscroll, ... }:
+                     org-side-tree, org-timeblock, phscroll, mini-frame, ... }:
     let
       # ---- SYSTEM SETTINGS ---- #
       systemSettings = {
@@ -123,6 +123,7 @@
             inherit (inputs) org-side-tree;
             inherit (inputs) org-timeblock;
             inherit (inputs) phscroll;
+            inherit (inputs) mini-frame;
             #inherit (inputs) nix-flatpak;
             inherit (inputs) stylix;
             inherit (inputs) hyprland-plugins;
@@ -215,6 +216,10 @@
       url = "github:misohena/phscroll";
       flake = false;
     };
+    mini-frame = {
+      url = "github:muffinmad/emacs-mini-frame";
+      flake = false;
+    };
 
     stylix.url = "github:danth/stylix";
 

system/hardware/power.nix

@@ -19,13 +19,13 @@
       CPU_SCALING_GOVERNOR_ON_AC = "performance";
       CPU_SCALING_GOVERNOR_ON_BAT = "schedutil";
 
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "performance";
       CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
 
       CPU_MIN_PERF_ON_AC = 0;
       CPU_MAX_PERF_ON_AC = 100;
       CPU_MIN_PERF_ON_BAT = 0;
-      CPU_MAX_PERF_ON_BAT = 80;
+      CPU_MAX_PERF_ON_BAT = 100;
     };
   };
 

user/app/doom-emacs/config.el

@@ -190,16 +190,22 @@
 ;; For camelCase
 (global-subword-mode 1)
 
-;; Mini-frames
+;; Mini-frames ;; cool but kinda suboptimal atm
-(setq mini-frame-show-parameters
+;(add-load-path! "~/.emacs.d/mini-frame")
-  '((left . 0.5)
+;(require 'mini-frame)
-   (top . 10)
+;(setq mini-frame-ignore-commands '(evil-ex-search-forward helpful-variable helpful-callable))
-   (width . 0.6)
+;(setq mini-frame-show-parameters
-   (height . 15))
+;    '((left . 216)
-)
+;     (top . 240)
-(setq mini-frame-resize nil)
+;     (width . 0.78)
-(setq mini-frame-standalone t)
+;     (height . 20)
-(mini-frame-mode -1) ;; don't enable this for now since it's kinda slow on my system
+;     (alpha-background . 90))
+;)
+;(setq mini-frame-detach-on-hide nil)
+;(setq mini-frame-resize t)
+;(setq resize-mini-frames t)
+;(setq mini-frame-standalone nil)
+;(mini-frame-mode 1)
 
 ;;;------ Registers ------;;;
 
@@ -419,7 +425,11 @@ same directory as the org-buffer and insert a link to this file."
                     '(file))
            (list (openwith-make-extension-regexp
                   '("flp"))
-                    "~/.local/bin/flstudio"
+                    "flstudio"
+                    '(file))
+           (list (openwith-make-extension-regexp
+                  '("mid"))
+                    "rosegarden"
                     '(file))
                ))
      (openwith-mode 1)))
@@ -538,6 +548,8 @@ same directory as the org-buffer and insert a link to this file."
    :desc "Org Transclusion Mode" "t" #'org-transclusion-mode))
 (map! :leader :prefix "n" "l" #'org-transclusion-live-sync-start)
 
+(setq org-transclusion-exclude-elements '(property-drawer keyword))
+
 (add-hook 'org-mode-hook #'org-transclusion-mode)
 
 (defun org-jekyll-new-post ()
@@ -788,13 +800,20 @@ same directory as the org-buffer and insert a link to this file."
   (setq org-agenda-files (append org-agenda-files (org-roam-list-notes-by-tag "todos")))
 )
 
+(defun org-roam-append-ids-to-org-id-files (db)
+  (org-roam-switch-db db t)
+  (setq org-id-files (append org-id-files (org-roam-list-files)))
+)
+
 ;; Refreshing org roam agenda
 (defun org-roam-refresh-agenda-list ()
   (interactive)
   (setq prev-org-roam-db-choice org-roam-db-choice)
   (setq org-agenda-files '())
+  (setq org-id-files '())
   (dolist (DB full-org-roam-db-list-pretty)
     (org-roam-append-notes-to-agenda "todos" DB)
+    (org-roam-append-ids-to-org-id-files DB)
   )
   (setq org-agenda-files (-uniq org-agenda-files))
   (org-roam-switch-db prev-org-roam-db-choice 1)

user/app/doom-emacs/doom.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs-emacs, pkgs-stable, userSettings, systemSettings,
-  org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
+  org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, mini-frame, ... }:
 let
   themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
   dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
@@ -107,6 +107,10 @@ in
     source = "${phscroll}";
   };
 
+  home.file.".emacs.d/mini-frame" = {
+    source = "${mini-frame}";
+  };
+
   home.file.".emacs.d/system-vars.el".text = ''
   ;;; ~/.emacs.d/config.el -*- lexical-binding: t; -*-
 

user/app/doom-emacs/doom.org

@@ -253,16 +253,22 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu
 ;; For camelCase
 (global-subword-mode 1)
 
-;; Mini-frames
+;; Mini-frames ;; cool but kinda suboptimal atm
-(setq mini-frame-show-parameters
+;(add-load-path! "~/.emacs.d/mini-frame")
-  '((left . 0.5)
+;(require 'mini-frame)
-   (top . 10)
+;(setq mini-frame-ignore-commands '(evil-ex-search-forward helpful-variable helpful-callable))
-   (width . 0.6)
+;(setq mini-frame-show-parameters
-   (height . 15))
+;    '((left . 216)
-)
+;     (top . 240)
-(setq mini-frame-resize nil)
+;     (width . 0.78)
-(setq mini-frame-standalone t)
+;     (height . 20)
-(mini-frame-mode -1) ;; don't enable this for now since it's kinda slow on my system
+;     (alpha-background . 90))
+;)
+;(setq mini-frame-detach-on-hide nil)
+;(setq mini-frame-resize t)
+;(setq resize-mini-frames t)
+;(setq mini-frame-standalone nil)
+;(mini-frame-mode 1)
 
 #+END_SRC
 ** Registers
@@ -496,7 +502,11 @@ same directory as the org-buffer and insert a link to this file."
                     '(file))
            (list (openwith-make-extension-regexp
                   '("flp"))
-                    "~/.local/bin/flstudio"
+                    "flstudio"
+                    '(file))
+           (list (openwith-make-extension-regexp
+                  '("mid"))
+                    "rosegarden"
                     '(file))
                ))
      (openwith-mode 1)))
@@ -655,6 +665,8 @@ exit
    :desc "Org Transclusion Mode" "t" #'org-transclusion-mode))
 (map! :leader :prefix "n" "l" #'org-transclusion-live-sync-start)
 
+(setq org-transclusion-exclude-elements '(property-drawer keyword))
+
 (add-hook 'org-mode-hook #'org-transclusion-mode)
 
 #+END_SRC
@@ -921,13 +933,20 @@ exit
   (setq org-agenda-files (append org-agenda-files (org-roam-list-notes-by-tag "todos")))
 )
 
+(defun org-roam-append-ids-to-org-id-files (db)
+  (org-roam-switch-db db t)
+  (setq org-id-files (append org-id-files (org-roam-list-files)))
+)
+
 ;; Refreshing org roam agenda
 (defun org-roam-refresh-agenda-list ()
   (interactive)
   (setq prev-org-roam-db-choice org-roam-db-choice)
   (setq org-agenda-files '())
+  (setq org-id-files '())
   (dolist (DB full-org-roam-db-list-pretty)
     (org-roam-append-notes-to-agenda "todos" DB)
+    (org-roam-append-ids-to-org-id-files DB)
   )
   (setq org-agenda-files (-uniq org-agenda-files))
   (org-roam-switch-db prev-org-roam-db-choice 1)
@@ -1941,13 +1960,12 @@ Any git package can be configured for a particular commit or branch:
 (package! org-ql)
 (package! persist)
 (package! sudo-edit)
-(package! mini-frame)
 #+END_SRC
 * Nix Integration
 In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]].
 #+BEGIN_SRC nix :tangle doom.nix
 { config, lib, pkgs-emacs, pkgs-stable, userSettings, systemSettings,
-  org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
+  org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, mini-frame, ... }:
 let
   themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
   dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
@@ -2055,6 +2073,10 @@ in
     source = "${phscroll}";
   };
 
+  home.file.".emacs.d/mini-frame" = {
+    source = "${mini-frame}";
+  };
+
   home.file.".emacs.d/system-vars.el".text = ''
   ;;; ~/.emacs.d/config.el -*- lexical-binding: t; -*-
 

user/app/doom-emacs/packages.el

@@ -30,4 +30,3 @@
 (package! org-ql)
 (package! persist)
 (package! sudo-edit)
-(package! mini-frame)