home: emacs on wayland

3 files changed, 65 insertions, 14 deletions

diff --git a/flake.lock b/flake.lock
index c091262..21bb3d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,6 +70,25 @@
         "type": "github"
       }
     },
+    "emacs-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1670295974,
+        "narHash": "sha256-+oQzBTxrWag9XnIndTUXvilI78fuIlhRQ+iNtBrlUF8=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "2f7fff8ee668c01803cab2f0847151fdf647134e",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "gitlab"
+      }
+    },
     "feeds": {
       "flake": false,
       "locked": {
@@ -117,6 +136,21 @@
     },
     "flake-utils": {
       "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
         "lastModified": 1634851050,
         "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
         "owner": "numtide",
@@ -207,16 +241,13 @@
       "locked": {
         "lastModified": 1670193339,
         "narHash": "sha256-oHTAhX4p6+uxcabq0rKL4EyKWPbDLGKec88ocPIU/2Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
+        "path": "/nix/store/wcdlf9yy8bgms9jlm1x9lb8vyv5w14h1-source",
         "rev": "e169cf5b3b1e6cc4a25ff15087c2621605f83409",
-        "type": "github"
+        "type": "path"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "release-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs-22_05": {
@@ -236,11 +267,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1670148586,
-        "narHash": "sha256-EcDfOiTHs0UBAtyGc0wxJJdhcMjrJEgWXjJutxZGA3E=",
+        "lastModified": 1670235252,
+        "narHash": "sha256-5YWCit/Brz4EDT/TIwXT/5wxRxb+cz1Nls7ZodQeKiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a2d2f70b82ada0eadbcb1df2bca32d841a3c1bf1",
+        "rev": "543070eafe8d5e86ebaa3095fd1e568db09b9b73",
         "type": "github"
       },
       "original": {
@@ -252,6 +283,22 @@
     },
     "nixpkgs_2": {
       "locked": {
+        "lastModified": 1670193339,
+        "narHash": "sha256-oHTAhX4p6+uxcabq0rKL4EyKWPbDLGKec88ocPIU/2Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e169cf5b3b1e6cc4a25ff15087c2621605f83409",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
         "lastModified": 1642635915,
         "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
         "owner": "NixOS",
@@ -268,7 +315,7 @@
     "peerix": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -308,12 +355,13 @@
         "almanac": "almanac",
         "blog": "blog",
         "deploy-rs": "deploy-rs",
+        "emacs-overlay": "emacs-overlay",
         "feeds": "feeds",
         "gtfsBooks": "gtfsBooks",
         "home-manager": "home-manager",
         "naersk": "naersk",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "peerix": "peerix",
         "playground": "playground",
@@ -362,7 +410,7 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-22_05": "nixpkgs-22_05",
         "utils": "utils_3"
       },
diff --git a/flake.nix b/flake.nix
index 6595b93..de5a4ba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+    emacs-overlay.url = "gitlab:nix-community/emacs-overlay";
 
     uplcg.url = "git+https://stuebinm.eu/git/uplcg?ref=main";
     uplcg.flake = false;
diff --git a/home/packages.nix b/home/packages.nix
index e6fc57f..0c8c383 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -12,7 +12,7 @@ let
 in
 {
   home.packages = with pkgs; [
-    (emacsWithPackages (epkgs: [ epkgs.exwm epkgs.pdf-tools epkgs.vterm ]))
+    inputs.emacs-overlay.packages.x86_64-linux.emacsPgtk
     emacs-all-the-icons-fonts
 
     # internet apps & clients
@@ -46,6 +46,8 @@ in
     spago purescript # nodePackages.purescript-language-server nodejs
     # rust
     cargo rustc rust-analyzer rustfmt
+    # go
+    go gopls godef gore gocode gotests gomodifytags
     # others
     gcc cachix julia_16-bin python39
     # nix things