chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a wayland-native emacs

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-03-17 10:16:42 +01:00
parent e12fe5e8d0
commit dcff0e0ed1
No known key found for this signature in database
GPG key ID: 019E764B7184435A
4 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
flake.lock generated
View file

@ -1,5 +1,21 @@
{ {
"nodes": { "nodes": {
"emacs-overlay": {
"locked": {
"lastModified": 1615911877,
"narHash": "sha256-r068WLpoigoSIZJ4rRO3LxkjXdvOKZsPF/jEzzu54A4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "54967f1a51f2742c580c7ab1f3174e2e1afe874f",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1614513358, "lastModified": 1614513358,
@ -23,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1615753545, "lastModified": 1615943941,
"narHash": "sha256-FR6vHvQlmQFAA26wNguEGWwav40Xgy9U6vRpT6UneTg=", "narHash": "sha256-ocj+ngGSJ0SRHjp3UDH76TQA8XXUxemAQDDJp32k5Rw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07f6c6481e0cbbcaf3447f43e964baf99465c8e1", "rev": "920ea74afee92d321a4ff7dc714b165daaad78ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +54,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1615787985, "lastModified": 1615921413,
"narHash": "sha256-T19Svy8c82yxj2RZkxZJ95sqYznT01fmWFBB6W+t5Vk=", "narHash": "sha256-pr9UUS52tsKTr5FvOCrY6IErpgWmY7EML/lV6dvKtoU=",
"owner": "chvp", "owner": "chvp",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d804ec1692d96c3810710098849531d8ca81d4d", "rev": "e9f42f11e5c43893babbe832a1e835e0eefc5ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +70,11 @@
}, },
"nixpkgsFor0AD": { "nixpkgsFor0AD": {
"locked": { "locked": {
"lastModified": 1615810318, "lastModified": 1615972400,
"narHash": "sha256-U/7V1Tw+kolLbCymu3H6UvxiqZwvDjaGkCMmlpyKERw=", "narHash": "sha256-NGTJ23KbaX+2AwP5CeHx+lECib14KxnKkB/DbDBzUT0=",
"owner": "chvp", "owner": "chvp",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f14e8b59ceb1280a8b9ac982ed5e413ff6fbcb4", "rev": "ec2181692f9868ca1a7cf39ef443b3ef81b4cbaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +86,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1615795092, "lastModified": 1615967307,
"narHash": "sha256-I4GhjzycLkzIPWBx0GD5J2EUDQLijEvIYCZ9HuwfGPo=", "narHash": "sha256-B4IEO1XOY1ZDrB3leXPdjFgIFboaP5p8zPqR+focmNE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b353e4ce5723c24baf13b5c71d4b32901cd9ad7c", "rev": "777e1e28ed519a4b358f9196fc46c08845303763",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,6 +101,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

7
flake.nix
View file

@ -2,17 +2,18 @@
description = "Nixos configuration flake"; description = "Nixos configuration flake";
inputs = { inputs = {
emacs-overlay.url = "github:nix-community/emacs-overlay/master";
flake-utils.url = "github:numtide/flake-utils/master"; flake-utils.url = "github:numtide/flake-utils/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = "github:nix-community/NUR";
nixpkgs.url = "github:chvp/nixpkgs/master"; nixpkgs.url = "github:chvp/nixpkgs/master";
nixpkgsFor0AD.url = "github:chvp/nixpkgs/0ad0.24"; nixpkgsFor0AD.url = "github:chvp/nixpkgs/0ad0.24";
nur.url = "github:nix-community/NUR";
}; };
outputs = { self, nixpkgs, nixpkgsFor0AD, nur, home-manager, flake-utils }: outputs = { self, emacs-overlay, nixpkgs, nixpkgsFor0AD, nur, home-manager, flake-utils }:
let let
version-suffix = nixpkgs.rev or (builtins.toString nixpkgs.lastModified); version-suffix = nixpkgs.rev or (builtins.toString nixpkgs.lastModified);
pkgsFor = system: import nixpkgs { pkgsFor = system: import nixpkgs {
@ -33,7 +34,7 @@
nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ]; nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
}) })
({ pkgs, ... }: { ({ pkgs, ... }: {
nixpkgs.overlays = [ nur.overlay ]; nixpkgs.overlays = [ nur.overlay emacs-overlay.overlay ];
home-manager.sharedModules = [ pkgs.nur.repos.rycee.hmModules.emacs-init ]; home-manager.sharedModules = [ pkgs.nur.repos.rycee.hmModules.emacs-init ];
}) })
(./. + "/machines/${hostname}") (./. + "/machines/${hostname}")

1
modules/emacs.nix
View file

@ -12,6 +12,7 @@
home-manager.users.charlotte = { ... }: { home-manager.users.charlotte = { ... }: {
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = pkgs.emacsPgtkGcc;
init = { init = {
enable = true; enable = true;
prelude = '' prelude = ''

5
modules/nix.nix
View file

@ -76,7 +76,10 @@ in
dates = [ "hourly" ]; dates = [ "hourly" ];
}; };
trustedUsers = [ "@wheel" ]; trustedUsers = [ "@wheel" ];
extraOptions = (lib.optionalString config.chvp.nix.enableDirenv '' extraOptions = ''
substituters = https://cache.nixos.org https://nix-community.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
'' + (lib.optionalString config.chvp.nix.enableDirenv ''
keep-outputs = true keep-outputs = true
keep-derivations = true keep-derivations = true
'') + (lib.optionalString config.chvp.nix.enableFlakes '' '') + (lib.optionalString config.chvp.nix.enableFlakes ''