From b10e44b29489ecb41626d141f9eed17eedd4daa6 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Wed, 18 Mar 2026 18:58:56 +0000 Subject: [PATCH] Reshuffling stuff --- Droidnix/README.org | 139 +++++++++--------- .../modules/apps/emacs/early-init.el | 92 ------------ .../generated/modules/apps/emacs/emacs.nix | 85 ----------- 3 files changed, 70 insertions(+), 246 deletions(-) delete mode 100644 Droidnix/generated/modules/apps/emacs/early-init.el delete mode 100644 Droidnix/generated/modules/apps/emacs/emacs.nix diff --git a/Droidnix/README.org b/Droidnix/README.org index c161ecf1a..2b22eef1b 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -1263,90 +1263,91 @@ This sets up the emacs terminal #+BEGIN_SRC nix :tangle generated/modules/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html { lib, ... }: -flake.nixosModules.emacs = { config, pkgs, lib, ... }: - { - # Optie om de module aan/uit te zetten - options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config"; + flake.nixosModules.emacs = { config, pkgs, lib, ... }: - config = lib.mkIf (config.mySystem.system.emacs.enable or false) { - # System packages (optioneel) - environment.systemPackages = with pkgs; [ - # Voeg systeem-brede packages toe als je wilt - ]; + { + # Optie om de module aan/uit te zetten + options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config"; - # Home Manager configuratie - home-manager.users.henrov = { - programs.emacs = { - enable = true; - package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; + config = lib.mkIf (config.mySystem.system.emacs.enable or false) { + # System packages (optioneel) + environment.systemPackages = with pkgs; [ + # Voeg systeem-brede packages toe als je wilt + ]; - extraPackages = epkgs: with epkgs; [ - # Tree-sitter and language support - manualPackages.treesit-grammars.with-all-grammars - rust-mode - rustic - nix-mode - hcl-mode + # Home Manager configuratie + home-manager.users.henrov = { + programs.emacs = { + enable = true; + package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; - # UI/UX and navigation - nerd-icons - doom-modeline - diminish - eldoc - eldoc-box - pulsar - which-key - avy - consult - vertico - marginalia - crux - shell-pop + extraPackages = epkgs: with epkgs; [ + # Tree-sitter and language support + manualPackages.treesit-grammars.with-all-grammars + rust-mode + rustic + nix-mode + hcl-mode - # Completion and snippets - nerd-icons-corfu - corfu - cape - orderless - yasnippet - yasnippet-snippets + # UI/UX and navigation + nerd-icons + doom-modeline + diminish + eldoc + eldoc-box + pulsar + which-key + avy + consult + vertico + marginalia + crux + shell-pop - # Utilities and tools - rg - exec-path-from-shell - eat - f - gptel - nixpkgs-fmt - envrc + # Completion and snippets + nerd-icons-corfu + corfu + cape + orderless + yasnippet + yasnippet-snippets - # Theming - catppuccin-theme + # Utilities and tools + rg + exec-path-from-shell + eat + f + gptel + nixpkgs-fmt + envrc - # Git - magit + # Theming + catppuccin-theme - # Editing and workflow - expreg - vundo - puni + # Git + magit - # Error and side panel support - sideline - sideline-flymake - sideline-eglot - ]; - }; + # Editing and workflow + expreg + vundo + puni - home.sessionVariables = { - EDITOR = "emacs"; - XDG_SCREENSHOTS_DIR = "~/screenshots"; + # Error and side panel support + sideline + sideline-flymake + sideline-eglot + ]; + }; + + home.sessionVariables = { + EDITOR = "emacs"; + XDG_SCREENSHOTS_DIR = "~/screenshots"; + }; }; }; }; -} -#+END_SRC +}#+END_SRC ** =generated/modules/apps/emacs/early-init.el= This helps set up the emacs terminal diff --git a/Droidnix/generated/modules/apps/emacs/early-init.el b/Droidnix/generated/modules/apps/emacs/early-init.el deleted file mode 100644 index d6f8111be..000000000 --- a/Droidnix/generated/modules/apps/emacs/early-init.el +++ /dev/null @@ -1,92 +0,0 @@ -;;; package --- early init -*- lexical-binding: t -*- - ;;; Commentary: - ;;; Prevents white flash and better Emacs defaults - ;;; Code: - (set-language-environment "UTF-8") - (setq-default -default-frame-alist -'((background-color . "#1e1e2e") - (bottom-divider-width . 1) ; Thin horizontal window divider - (foreground-color . "#bac2de") ; Default foreground color - (fullscreen . maximized) ; Maximize the window by default - (horizontal-scroll-bars . nil) ; No horizontal scroll-bars - (left-fringe . 8) ; Thin left fringe - (menu-bar-lines . 0) ; No menu bar - (right-divider-width . 1) ; Thin vertical window divider - (right-fringe . 8) ; Thin right fringe - (tool-bar-lines . 0) ; No tool bar - (undecorated . t) ; Remove extraneous X decorations - (vertical-scroll-bars . nil)) ; No vertical scroll-bars -user-full-name "Henrov henrov" ; ME! -;; memory configuration -;; Higher garbage collection threshold, prevents frequent gc locks, reset later -gc-cons-threshold most-positive-fixnum -;; Ignore warnings for (obsolete) elisp compilations -byte-compile-warnings '(not obsolete) -;; And other log types completely -warning-suppress-log-types '((comp) (bytecomp)) -;; Large files are okay in the new millenium. -large-file-warning-threshold 100000000 -;; dont show garbage collection messages at startup, will reset later -garbage-collection-messages nil -;; native compilation -package-native-compile t -native-comp-warning-on-missing-source nil -native-comp-async-report-warnings-errors 'silent -;; Read more based on system pipe capacity -read-process-output-max (max (* 10240 10240) read-process-output-max) -;; scroll configuration -scroll-margin 0 ; Lets scroll to the end of the margin -scroll-conservatively 100000 ; Never recenter the window -scroll-preserve-screen-position 1 ; Scrolling back and forth -;; frame config -;; Improve emacs startup time by not resizing to adjust for custom settings -frame-inhibit-implied-resize t -;; Dont resize based on character height / width but to exact pixels -frame-resize-pixelwise t -;; backups & files -backup-directory-alist '(("." . "~/.backups/")) ; Don't clutter -backup-by-copying t ; Don't clobber symlinks -create-lockfiles nil ; Don't have temp files -delete-old-versions t ; Cleanup automatically -kept-new-versions 6 ; Update every few times -kept-old-versions 2 ; And cleanup even more -version-control t ; Version them backups -delete-by-moving-to-trash t ; Dont delete, send to trash instead -;; startup -inhibit-startup-screen t ; I have already done the tutorial. Twice -inhibit-startup-message t ; I know I am ready -inhibit-startup-echo-area-message t ; Yep, still know it -initial-scratch-message nil ; I know it is the scratch buffer! -initial-buffer-choice nil -inhibit-startup-buffer-menu t -inhibit-x-resources t -initial-major-mode 'fundamental-mode -pgtk-wait-for-event-timeout 0.001 ; faster child frames -ad-redefinition-action 'accept ; dont care about legacy things being redefined -inhibit-compacting-font-caches t -;; tabs -tab-width 4 ; Always tab 4 spaces. -indent-tabs-mode nil ; Never use actual tabs. -;; rendering -cursor-in-non-selected-windows nil ; dont render cursors other windows -;; packages -use-package-always-defer t -load-prefer-newer t -default-input-method nil -use-dialog-box nil -use-file-dialog nil -use-package-expand-minimally t -package-enable-at-startup nil -use-package-enable-imenu-support t -auto-mode-case-fold nil ; No second pass of case-insensitive search over auto-mode-alist. -package-archives '(("melpa" . "https://melpa.org/packages/") - ("gnu" . "https://elpa.gnu.org/packages/") - ("nongnu" . "https://elpa.nongnu.org/nongnu/") - ("melpa-stable" . "https://stable.melpa.org/packages/")) -package-archive-priorities '(("gnu" . 99) - ("nongnu" . 80) - ("melpa" . 70) - ("melpa-stable" . 50)) -) -;;; early-init.el ends here diff --git a/Droidnix/generated/modules/apps/emacs/emacs.nix b/Droidnix/generated/modules/apps/emacs/emacs.nix deleted file mode 100644 index 79873878f..000000000 --- a/Droidnix/generated/modules/apps/emacs/emacs.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib, ... }: - -flake.nixosModules.emacs = { config, pkgs, lib, ... }: - -{ - # Optie om de module aan/uit te zetten - options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config"; - - config = lib.mkIf (config.mySystem.system.emacs.enable or false) { - # System packages (optioneel) - environment.systemPackages = with pkgs; [ - # Voeg systeem-brede packages toe als je wilt - ]; - - # Home Manager configuratie - home-manager.users.henrov = { - programs.emacs = { - enable = true; - package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; - - extraPackages = epkgs: with epkgs; [ - # Tree-sitter and language support - manualPackages.treesit-grammars.with-all-grammars - rust-mode - rustic - nix-mode - hcl-mode - - # UI/UX and navigation - nerd-icons - doom-modeline - diminish - eldoc - eldoc-box - pulsar - which-key - avy - consult - vertico - marginalia - crux - shell-pop - - # Completion and snippets - nerd-icons-corfu - corfu - cape - orderless - yasnippet - yasnippet-snippets - - # Utilities and tools - rg - exec-path-from-shell - eat - f - gptel - nixpkgs-fmt - envrc - - # Theming - catppuccin-theme - - # Git - magit - - # Editing and workflow - expreg - vundo - puni - - # Error and side panel support - sideline - sideline-flymake - sideline-eglot - ]; - }; - - home.sessionVariables = { - EDITOR = "emacs"; - XDG_SCREENSHOTS_DIR = "~/screenshots"; - }; - }; - }; -}