diff --git a/flake.lock b/flake.lock index 546de95..c59b34f 100644 --- a/flake.lock +++ b/flake.lock @@ -547,22 +547,6 @@ "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", @@ -904,7 +888,6 @@ "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", diff --git a/flake.nix b/flake.nix index 7779111..32507ec 100644 --- a/flake.nix +++ b/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, mini-frame, ... }: + org-side-tree, org-timeblock, phscroll, ... }: let # ---- SYSTEM SETTINGS ---- # systemSettings = { @@ -123,7 +123,6 @@ 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; @@ -216,10 +215,6 @@ url = "github:misohena/phscroll"; flake = false; }; - mini-frame = { - url = "github:muffinmad/emacs-mini-frame"; - flake = false; - }; stylix.url = "github:danth/stylix"; diff --git a/system/hardware/power.nix b/system/hardware/power.nix index 8d014be..eef4d28 100644 --- a/system/hardware/power.nix +++ b/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 = "performance"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; 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 = 100; + CPU_MAX_PERF_ON_BAT = 80; }; }; diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 8bbc078..f54d629 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -190,22 +190,16 @@ ;; For camelCase (global-subword-mode 1) -;; Mini-frames ;; cool but kinda suboptimal atm -;(add-load-path! "~/.emacs.d/mini-frame") -;(require 'mini-frame) -;(setq mini-frame-ignore-commands '(evil-ex-search-forward helpful-variable helpful-callable)) -;(setq mini-frame-show-parameters -; '((left . 216) -; (top . 240) -; (width . 0.78) -; (height . 20) -; (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) +;; Mini-frames +(setq mini-frame-show-parameters + '((left . 0.5) + (top . 10) + (width . 0.6) + (height . 15)) +) +(setq mini-frame-resize nil) +(setq mini-frame-standalone t) +(mini-frame-mode -1) ;; don't enable this for now since it's kinda slow on my system ;;;------ Registers ------;;; @@ -425,11 +419,7 @@ same directory as the org-buffer and insert a link to this file." '(file)) (list (openwith-make-extension-regexp '("flp")) - "flstudio" - '(file)) - (list (openwith-make-extension-regexp - '("mid")) - "rosegarden" + "~/.local/bin/flstudio" '(file)) )) (openwith-mode 1))) @@ -548,8 +538,6 @@ 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 () @@ -800,20 +788,13 @@ 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) diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index 2376924..6327dca 100644 --- a/user/app/doom-emacs/doom.nix +++ b/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, mini-frame, ... }: + org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; @@ -107,10 +107,6 @@ 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; -*- diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 116aa9b..d9b1858 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -253,22 +253,16 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu ;; For camelCase (global-subword-mode 1) -;; Mini-frames ;; cool but kinda suboptimal atm -;(add-load-path! "~/.emacs.d/mini-frame") -;(require 'mini-frame) -;(setq mini-frame-ignore-commands '(evil-ex-search-forward helpful-variable helpful-callable)) -;(setq mini-frame-show-parameters -; '((left . 216) -; (top . 240) -; (width . 0.78) -; (height . 20) -; (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) +;; Mini-frames +(setq mini-frame-show-parameters + '((left . 0.5) + (top . 10) + (width . 0.6) + (height . 15)) +) +(setq mini-frame-resize nil) +(setq mini-frame-standalone t) +(mini-frame-mode -1) ;; don't enable this for now since it's kinda slow on my system #+END_SRC ** Registers @@ -502,11 +496,7 @@ same directory as the org-buffer and insert a link to this file." '(file)) (list (openwith-make-extension-regexp '("flp")) - "flstudio" - '(file)) - (list (openwith-make-extension-regexp - '("mid")) - "rosegarden" + "~/.local/bin/flstudio" '(file)) )) (openwith-mode 1))) @@ -665,8 +655,6 @@ 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 @@ -933,20 +921,13 @@ 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) @@ -1960,12 +1941,13 @@ 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, mini-frame, ... }: + org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; @@ -2073,10 +2055,6 @@ 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; -*- diff --git a/user/app/doom-emacs/packages.el b/user/app/doom-emacs/packages.el index c590dfb..7961f59 100644 --- a/user/app/doom-emacs/packages.el +++ b/user/app/doom-emacs/packages.el @@ -30,3 +30,4 @@ (package! org-ql) (package! persist) (package! sudo-edit) +(package! mini-frame)