Reshuffling stuff

2026-03-18 18:58:56 +00:00
parent b8383c4125
commit b10e44b294
3 changed files with 70 additions and 246 deletions
@@ -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