Update and use emacs-gcc

4 files changed, 37 insertions, 15 deletions

diff --git a/flake.lock b/flake.lock
index d22e4c1..3036076 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "locked": {
+        "lastModified": 1641149178,
+        "narHash": "sha256-Mt+oT5YZ6G9zHctDKV5pY+3vIdsMmAg0HMvz6rxsIc0=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "f3c435a5e5cfa3ce1b2f50ba37b9cacfec4139d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -23,11 +38,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1638440530,
-        "narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=",
+        "lastModified": 1640686209,
+        "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a",
+        "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
         "type": "github"
       },
       "original": {
@@ -39,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1638887115,
-        "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=",
+        "lastModified": 1641046839,
+        "narHash": "sha256-9XJgfDKU1hhC0E16FxDJe//Utrm79AQxesPhTltwjQ4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65",
+        "rev": "d1e59cfc49961e121583abe32e2f3db1550fbcff",
         "type": "github"
       },
       "original": {
@@ -55,11 +70,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1638986258,
-        "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=",
+        "lastModified": 1640959792,
+        "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
+        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
         "type": "github"
       },
       "original": {
@@ -94,6 +109,7 @@
     },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index ef928c8..b2c36f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,13 +4,14 @@
   inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   inputs.pms7003.url = "github:orbekk/pms7003/master";
   inputs.pms7003.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.emacs-overlay.url = "github:nix-community/emacs-overlay";
 
   # TODO: Remove nix overlay when pull request is resolved:
   # https://github.com/NixOS/nix/pull/4566
   # inputs.nix.url = "github:orbekk/nix/master";
   # inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, pms7003 }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, pms7003, emacs-overlay }:
     let
       pkgs-module = { config, ... }:
         let
@@ -29,7 +30,7 @@
         in {
           nixpkgs.pkgs = import nixpkgs {
             inherit (cfg) config localSystem crossSystem;
-            overlays = cfg.overlays ++ [ unstable-overlay extra-packages ];
+            overlays = cfg.overlays ++ [ unstable-overlay extra-packages emacs-overlay.overlay ];
           };
         };
 
diff --git a/modules/common.nix b/modules/common.nix
index 5c725ba..26f96f7 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -33,7 +33,8 @@
     coreutils
     direnv
     dnsutils
-    emacs
+    binutils
+    emacsPgtkGcc
     exa
     fd
     fzf
@@ -88,14 +89,19 @@
     maxJobs = lib.mkOverride 110 16;
     buildCores = lib.mkDefault 0; # auto configure
     gc.automatic = lib.mkDefault true;
-    trustedBinaryCaches = [ "https://cache.nixos.org" ];
-    binaryCaches = trustedBinaryCaches;
+    binaryCaches = [
+      "https://nix-community.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
     daemonCPUSchedPolicy = "idle";
     daemonIOSchedPriority = 10;
     package = pkgs.nixFlakes;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
+    autoOptimiseStore = true;
   };
 
   boot.cleanTmpDir = true;
diff --git a/modules/desktop.nix b/modules/desktop.nix
index a9b93ec..18bc6da 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -66,7 +66,6 @@ in {
       discord
       dmenu
       dzen2
-      emacs
       ffmpeg
       firefox-bin
       haskellPackages.xmobar