fix(greylag): switch to wayland-native emacs
As niri doesn't have xwayland, emacs must use a build that can run on
native wayland. In future, this should probably be automatically chosen
when you have xwayland disabled (or wayland enabled) but currently it is
easy enough to do a per-user change
Change-Id: I822309668cd5144225dcf82491d98fd1317d4667
diff --git a/flake.lock b/flake.lock
index 5ec076e..25b5442 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,7 +31,7 @@
"niri-flake",
"crate2nix"
],
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_2",
"pre-commit-hooks": [
"niri-flake",
"crate2nix"
@@ -88,7 +88,7 @@
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"nix-test-runner": "nix-test-runner",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
@@ -107,7 +107,7 @@
},
"crate2nix_stable": {
"inputs": {
- "flake-utils": "flake-utils_2"
+ "flake-utils": "flake-utils_3"
},
"locked": {
"lastModified": 1702842982,
@@ -126,7 +126,7 @@
},
"devshell": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_4",
"nixpkgs": [
"niri-flake",
"crate2nix",
@@ -147,6 +147,26 @@
"type": "github"
}
},
+ "emacs-overlay": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs",
+ "nixpkgs-stable": "nixpkgs-stable"
+ },
+ "locked": {
+ "lastModified": 1716628043,
+ "narHash": "sha256-qNHUr5ybHKAvTXSI8LFlqpFii8vEmyGAhxedkwOGZr4=",
+ "owner": "nix-community",
+ "repo": "emacs-overlay",
+ "rev": "d043446aeed157740a40998dc87c692cd5e2e228",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "emacs-overlay",
+ "type": "github"
+ }
+ },
"ewwsalmoomedits--eww-widgets": {
"flake": false,
"locked": {
@@ -290,7 +310,7 @@
},
"flake-utils-plus": {
"inputs": {
- "flake-utils": "flake-utils_5"
+ "flake-utils": "flake-utils_6"
},
"locked": {
"lastModified": 1715533576,
@@ -312,6 +332,24 @@
"systems": "systems_2"
},
"locked": {
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_3": {
+ "inputs": {
+ "systems": "systems_3"
+ },
+ "locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
@@ -325,9 +363,9 @@
"type": "github"
}
},
- "flake-utils_3": {
+ "flake-utils_4": {
"inputs": {
- "systems": "systems_3"
+ "systems": "systems_4"
},
"locked": {
"lastModified": 1701680307,
@@ -343,9 +381,9 @@
"type": "github"
}
},
- "flake-utils_4": {
+ "flake-utils_5": {
"inputs": {
- "systems": "systems_4"
+ "systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
@@ -361,9 +399,9 @@
"type": "github"
}
},
- "flake-utils_5": {
+ "flake-utils_6": {
"inputs": {
- "systems": "systems_5"
+ "systems": "systems_6"
},
"locked": {
"lastModified": 1694529238,
@@ -456,7 +494,7 @@
},
"lix-module": {
"inputs": {
- "flake-utils": "flake-utils",
+ "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
@@ -580,11 +618,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1700612854,
- "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+ "lastModified": 1716330097,
+ "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+ "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
@@ -608,6 +646,22 @@
},
"nixpkgs-stable": {
"locked": {
+ "lastModified": 1716361217,
+ "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-23.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-stable_2": {
+ "locked": {
"lastModified": 1716061101,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
"owner": "NixOS",
@@ -624,6 +678,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1700612854,
+ "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1712026416,
"narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=",
"owner": "NixOS",
@@ -636,7 +706,7 @@
"type": "indirect"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1716509168,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
@@ -652,7 +722,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1716062047,
"narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=",
@@ -690,7 +760,7 @@
"crate2nix",
"flake-compat"
],
- "flake-utils": "flake-utils_4",
+ "flake-utils": "flake-utils_5",
"gitignore": "gitignore",
"nixpkgs": [
"niri-flake",
@@ -722,6 +792,7 @@
"anyrun": "anyrun",
"collabora-gtimelog": "collabora-gtimelog",
"collabora-icon": "collabora-icon",
+ "emacs-overlay": "emacs-overlay",
"ewwsalmoomedits--eww-widgets": "ewwsalmoomedits--eww-widgets",
"firefox-sidebery-gnome": "firefox-sidebery-gnome",
"home-manager": "home-manager",
@@ -730,7 +801,7 @@
"niri-flake": "niri-flake",
"nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"nur": "nur",
"snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix",
@@ -762,8 +833,8 @@
},
"sops-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_4",
- "nixpkgs-stable": "nixpkgs-stable"
+ "nixpkgs": "nixpkgs_5",
+ "nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1716400300,
@@ -854,6 +925,21 @@
"type": "github"
}
},
+ "systems_6": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"templates": {
"locked": {
"lastModified": 1708553502,