Compare commits

..

No commits in common. "9eccb97326948140909f6f32d7361cc72ccdcda5" and "0d180685e3ba31cab5d095fe32b27a827cbf7ce1" have entirely different histories.

7 changed files with 29 additions and 95 deletions

View file

@ -547,22 +547,6 @@
"type": "indirect" "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": { "nix-doom-emacs": {
"inputs": { "inputs": {
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
@ -904,7 +888,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
"mini-frame": "mini-frame",
"nix-doom-emacs": "nix-doom-emacs", "nix-doom-emacs": "nix-doom-emacs",
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View file

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

View file

@ -19,13 +19,13 @@
CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "schedutil"; 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_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0; CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100; CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0; CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 100; CPU_MAX_PERF_ON_BAT = 80;
}; };
}; };

View file

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

View file

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

View file

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

View file

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