From 742281204ff62df7b4b481ccd575ecbf19a8335e Mon Sep 17 00:00:00 2001 From: larstvei Date: Sat, 20 Jul 2024 14:19:03 +0200 Subject: [PATCH] Update to using emacs-flake --- flake.lock | 191 ++++++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 2 +- nix/nix.conf | 4 +- 3 files changed, 176 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 38abd72..2fd1032 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1721270582, + "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec", "type": "github" }, "original": { @@ -20,18 +20,18 @@ "type": "github" } }, - "emacs-larstvei": { + "emacs-config": { "inputs": { "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1720279510, - "narHash": "sha256-DeHFv/dDrQ1wRFq3uYAXnfJTp3jQuKPwni8amnMZg8s=", + "lastModified": 1721434799, + "narHash": "sha256-BRP4bCKvgyJAoE/x2faWldh41t236YdwiOzcwBzQSe0=", "owner": "larstvei", "repo": "dot-emacs", - "rev": "a023683ce47d1289dd58129e1601dc3da3b75c45", + "rev": "f82b34ffb2c5d6aa2cdc5ebae38a4f24d217ff2d", "type": "github" }, "original": { @@ -40,6 +40,27 @@ "type": "github" } }, + "emacs-larstvei": { + "inputs": { + "emacs-config": "emacs-config", + "emacs-overlay": "emacs-overlay_2", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1721439609, + "narHash": "sha256-Xpq7IwxmXHsUqjvao+xj8mIZL1jSIjuuTeFT2a+DKmQ=", + "owner": "larstvei", + "repo": "emacs-flake", + "rev": "239e4d5581e67ca874916b72f8ff45248ea756ec", + "type": "github" + }, + "original": { + "owner": "larstvei", + "repo": "emacs-flake", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -60,6 +81,26 @@ "type": "github" } }, + "emacs-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1721437571, + "narHash": "sha256-w+FGfufCj2mugklWPycL8j4lM3gKrKgP3Fr4ez4GyGo=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "b31005958cab83f8ea0683bfde0fa2df74d310a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -96,6 +137,42 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "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_4": { + "inputs": { + "systems": "systems_4" + }, + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -103,11 +180,11 @@ ] }, "locked": { - "lastModified": 1720188602, - "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -124,11 +201,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1717741147, - "narHash": "sha256-VcGu0i6/2PVFHmyrnLivxEARX2bcPLxgkSFoUYjx3YY=", + "lastModified": 1721284730, + "narHash": "sha256-tlTUGQZLBq3r2DGrxr356lDznfSmPdN+akyz5C4AAwM=", "ref": "refs/heads/master", - "rev": "235b42610758355a664c153999c1ff03b4d918e6", - "revCount": 793, + "rev": "e5e839bcbedda23df0b8a3f8659edfa2c9bef8f8", + "revCount": 818, "submodules": true, "type": "git", "url": "https://github.com/kmonad/kmonad?dir=nix" @@ -172,6 +249,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1720181791, @@ -190,11 +283,43 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1721403608, + "narHash": "sha256-X5+QA5K3J2KA20YEaBJ+GKDj/XIb5PutHmphgYQUszA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad0111043c09f7d0f6b9f039882cbf350d4f7d49", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1721403608, + "narHash": "sha256-X5+QA5K3J2KA20YEaBJ+GKDj/XIb5PutHmphgYQUszA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad0111043c09f7d0f6b9f039882cbf350d4f7d49", "type": "github" }, "original": { @@ -210,7 +335,7 @@ "emacs-larstvei": "emacs-larstvei", "home-manager": "home-manager", "kmonad": "kmonad", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" } }, "systems": { @@ -242,6 +367,36 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a802eea..c40585b 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - emacs-larstvei.url = "github:larstvei/dot-emacs"; + emacs-larstvei.url = "github:larstvei/emacs-flake"; }; outputs = { self, nixpkgs, darwin, home-manager, kmonad, emacs-larstvei, ... }@inputs: { diff --git a/nix/nix.conf b/nix/nix.conf index a27d033..d956ea0 100644 --- a/nix/nix.conf +++ b/nix/nix.conf @@ -1,3 +1,3 @@ experimental-features = nix-command flakes -substituters = https://cache.nixos.org https://cache.nixos.org/ https://nix-community.cachix.org -trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= +substituters = https://cache.nixos.org https://cache.nixos.org/ https://nix-community.cachix.org https://larstvei.cachix.org +trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= larstvei.cachix.org-1:mJq98qeTBnm2xNNibn2BEwN1ggi6uQg+5hWASdG1Vys=