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

Okay, THIS is how you use an overlay

Browse source 
From configuration.nix. For my next trick (later), I'll do the exact
same thing from flake.nix
This commit is contained in:
Benson Chu 2024-07-21 11:27:05 -05:00
parent 5118300d20
commit e552b7fafa
4 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/base-packages.nix
View file

@ -16,7 +16,8 @@
cifs-utils
nfs-utils
unstable.emacs
# unstable.emacs
emacs-git
notmuch mu isync
keychain ledger gnupg
ledger2beancount beancount

4
common/configuration.nix
View file

@ -24,7 +24,9 @@ in
config.allowUnfree = true;
};
})
] ++ import ./overlays.nix inputs;
] ++ import ./overlays.nix inputs ++ [
inputs.emacs-overlay.overlays.default
];
nix.nixPath = [ # "/home/benson/.nix-defexpr/channels"
"nixpkgs=${inputs.nixpkgs}"

25
flake.lock
View file

@ -2,18 +2,20 @@
"nodes": {
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1703984610,
"narHash": "sha256-UMMRKB3qpm64rO3eVlDf2o7IHb68nRoWJE9LL9132A8=",
"lastModified": 1721552966,
"narHash": "sha256-zvzQgQEMxTaRpvtHlsNMjgdOiOvexfCE2hRaadSS6OY=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "fae6a53b30177995da0262a1b539898c48071f4b",
"rev": "ab15d82f94c8f6373fec1f363c5b6c631453950b",
"type": "github"
},
"original": {
@ -28,11 +30,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -96,16 +98,16 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1703467016,
"narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
"lastModified": 1721409541,
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@ -113,6 +115,7 @@
"root": {
"inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",

8
flake.nix
View file

@ -3,6 +3,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
update.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@ -13,15 +14,18 @@
emacs-overlay = {
url = "github:nix-community/emacs-overlay/master";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
};
outputs = { self, nixpkgs, update, unstable, home-manager, nixos-hardware, ... }@inputs:
outputs = { self, nixpkgs, update, unstable, home-manager, nixos-hardware, emacs-overlay, ... }@inputs:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = import ./common/overlays.nix inputs;
overlays =
[emacs-overlay.overlays.default] ++
(import ./common/overlays.nix inputs);
};
mkSystem = h: {
"${h}" = nixpkgs.lib.nixosSystem {