From 38233892e7d440720286d5219373b0bdbc1408a1 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 13 Jul 2026 00:09:35 +0200 Subject: [PATCH] chore; install emacs etc --- flake.lock | 231 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 131 insertions(+), 100 deletions(-) diff --git a/flake.lock b/flake.lock index 9ebe0e4..1875e2b 100644 --- a/flake.lock +++ b/flake.lock @@ -16,31 +16,10 @@ "type": "github" } }, - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1660592437, - "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "e7eac49074b70814b542fee987af2987dd0520b5", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "ref": "3.0.0", - "repo": "alejandra", - "type": "github" - } - }, "apple-silicon-support": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1783459840, @@ -69,7 +48,7 @@ "nam-shub-of-enki", "pre-commit-hooks" ], - "systems": "systems_4", + "systems": "systems_5", "treefmt-nix": [ "nixocaine", "nam-shub-of-enki", @@ -109,7 +88,7 @@ }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1768920986, @@ -126,25 +105,75 @@ "type": "github" } }, - "fenix": { + "doomdir": { + "flake": false, + "locked": { + "lastModified": 1783603851, + "narHash": "sha256-PXn0v4NR75U7/FpkaZ9GD6HPepVY5vVT48tMd1tMgdQ=", + "owner": "marienz", + "repo": "nix-doom-emacs-unstraightened", + "rev": "4c63e8a411f815bd2473e5ced94dc4b8bf31d240", + "type": "github" + }, + "original": { + "owner": "marienz", + "ref": "doomdir", + "repo": "nix-doom-emacs-unstraightened", + "type": "github" + } + }, + "doomemacs": { + "flake": false, + "locked": { + "lastModified": 1783792295, + "narHash": "sha256-y5qd13wlaLWEm/dDeeWRaXukZ+90KRGksdtNFFkz8D4=", + "owner": "doomemacs", + "repo": "core", + "rev": "0d1b06408720e7642bde537083ffb267a838256c", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "core", + "type": "github" + } + }, + "doomemacs-modules": { + "flake": false, + "locked": { + "lastModified": 1783655598, + "narHash": "sha256-BM0TGZjWqeHO+K1ENOENIziIMArMZ27SVhx+7mweOMU=", + "owner": "doomemacs", + "repo": "modules", + "rev": "c8f828c08230c015e0ed55e317487f57639cfaa6", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "modules", + "type": "github" + } + }, + "emacs-overlay": { "inputs": { "nixpkgs": [ - "alejandra", - "nixpkgs" + "nix-doom-emacs-unstraightened" ], - "rust-analyzer-src": "rust-analyzer-src" + "nixpkgs-stable": [ + "nix-doom-emacs-unstraightened" + ] }, "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "lastModified": 1783849966, + "narHash": "sha256-+AZA69hZ+XZH3D48ky4/pDcRKrlUZh65+GZd3tH8B/M=", "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "repo": "emacs-overlay", + "rev": "c80d0bf4911a5841ced1721cd35920037e1532a3", "type": "github" }, "original": { "owner": "nix-community", - "repo": "fenix", + "repo": "emacs-overlay", "type": "github" } }, @@ -278,7 +307,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -294,22 +323,6 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -388,7 +401,7 @@ "iamb": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -416,7 +429,7 @@ "nixocaine", "pre-commit-hooks" ], - "systems": "systems_3", + "systems": "systems_4", "treefmt-nix": [ "nixocaine", "treefmt-nix" @@ -520,6 +533,29 @@ "type": "github" } }, + "nix-doom-emacs-unstraightened": { + "inputs": { + "doomdir": "doomdir", + "doomemacs": "doomemacs", + "doomemacs-modules": "doomemacs-modules", + "emacs-overlay": "emacs-overlay", + "nixpkgs": "nixpkgs_5", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1783850568, + "narHash": "sha256-oaBhy4KNAz5Uh/FySab0gKA6oRHpK9o0bch6DhQvlIM=", + "owner": "marienz", + "repo": "nix-doom-emacs-unstraightened", + "rev": "2847a1c31640d2b642319ef6c313321a1de9dbb3", + "type": "github" + }, + "original": { + "owner": "marienz", + "repo": "nix-doom-emacs-unstraightened", + "type": "github" + } + }, "nix-homebrew": { "inputs": { "brew-src": "brew-src" @@ -563,7 +599,7 @@ "nam-shub-of-enki": "nam-shub-of-enki", "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_5", + "systems": "systems_6", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -598,16 +634,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657425264, - "narHash": "sha256-3aHvoI2e8vJKw3hvnHECaBpSsL5mxVsVtaLCnTdNcH8=", - "owner": "nixos", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "de5b3dd17034e6106e75746e81618e5bd408de8a", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -737,22 +773,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1768661221, "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", @@ -768,7 +788,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -784,7 +804,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -800,6 +820,19 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1783791668, + "narHash": "sha256-MMD52/T3QOqSB2V1UZgp4dw0pa4P89YEP5SbM2xuwa0=", + "rev": "716c7a2664ca8325617b8a7fbb609273f2c4cae7", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1032970.716c7a2664ca/nixexprs.tar.xz" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_6": { "locked": { "lastModified": 1763421233, @@ -982,7 +1015,6 @@ "root": { "inputs": { "ai-robots-txt": "ai-robots-txt", - "alejandra": "alejandra", "apple-silicon-support": "apple-silicon-support", "disko": "disko", "home-manager": "home-manager", @@ -990,6 +1022,7 @@ "homebrew-core": "homebrew-core", "iamb": "iamb", "nix-darwin": "nix-darwin", + "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-homebrew": "nix-homebrew", "nix-webapps": "nix-webapps", "nixocaine": "nixocaine", @@ -1003,27 +1036,10 @@ "spicetify-nix": "spicetify-nix" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1709863839, @@ -1078,7 +1094,7 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_15", - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1783303713, @@ -1134,8 +1150,9 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, "systems_4": { @@ -1167,6 +1184,20 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1181,7 +1212,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",