emacs

5 files changed, 38 insertions, 8 deletions

diff --git a/flake.lock b/flake.lock
index 688e051..429e69f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -362,11 +362,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1743167577,
-        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
+        "lastModified": 1743420942,
+        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
+        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
         "type": "github"
       },
       "original": {
@@ -378,11 +378,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743231893,
-        "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=",
+        "lastModified": 1743367904,
+        "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6",
+        "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 53287e4..0d1fba0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,6 +118,7 @@
               ./modules/science.nix
               ./modules/tlp.nix
               ./modules/virtualization.nix
+              ./modules/emacs.nix
               ./modules/mail
               ./modules/wg
             ];
diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix
index 17f8f09..1a3216a 100644
--- a/hosts/toaster/default.nix
+++ b/hosts/toaster/default.nix
@@ -63,8 +63,6 @@
     shell = pkgs.fish;
   };
 
-  services.emacs.defaultEditor = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/emacs.nix b/modules/emacs.nix
new file mode 100644
index 0000000..705bebd
--- /dev/null
+++ b/modules/emacs.nix
@@ -0,0 +1,29 @@
+{ pkgs, inputs, lib, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    direnv
+  ];
+
+  # nixpkgs.overlays = [
+  #   inputs.emacs-overlay.overlay
+  # ];
+
+  services.emacs = {
+    install = true;
+    enable = false;
+    package = with pkgs; ((emacsPackagesFor (emacs-pgtk.overrideAttrs (old: {
+      passthru = old.passthru // {
+        treeSitter = true;
+      };
+    }))).emacsWithPackages (epkgs: with epkgs; [
+      # treesitter bits
+      treesit-grammars.with-all-grammars
+
+      vterm
+      pdf-tools
+    ]));
+    defaultEditor = lib.mkDefault true;
+  };
+
+}
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 33aeb50..251d8d3 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -8,12 +8,14 @@
   environment.systemPackages = with pkgs; [
     amberol
     celluloid
+    ddcutil
     gnome-console
     gnome-obfuscate
     gnome-boxes
     gnome-tweaks
     qbittorrent
     gnomeExtensions.caffeine
+    gnomeExtensions.brightness-control-using-ddcutil
     spotify
     ghostty
     fractal