From 39377c5beb33aeb916b177189c2152b1f6bdd2ec Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sun, 28 Jan 2024 23:46:33 -0500 Subject: [PATCH] Single flake construction --- .../darwin-configuration.nix | 0 nix/base-system/flake.lock | 38 + nix/base-system/flake.nix | 46 +- nix/darwin/flake.lock | 804 ------------------ nix/darwin/flake.nix | 28 - 5 files changed, 69 insertions(+), 847 deletions(-) rename nix/{darwin => base-system}/darwin-configuration.nix (100%) delete mode 100644 nix/darwin/flake.lock delete mode 100644 nix/darwin/flake.nix diff --git a/nix/darwin/darwin-configuration.nix b/nix/base-system/darwin-configuration.nix similarity index 100% rename from nix/darwin/darwin-configuration.nix rename to nix/base-system/darwin-configuration.nix diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock index 894de69..2e75d86 100644 --- a/nix/base-system/flake.lock +++ b/nix/base-system/flake.lock @@ -58,6 +58,26 @@ "type": "github" } }, + "darwin_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs-darwin" + ] + }, + "locked": { + "lastModified": 1706497381, + "narHash": "sha256-VzzLBvm4ejehe42yKlCUjG3op3NLXq78MKS8u/W3NLQ=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "00538eecf2d1a8f98a53a71c9c84f913003ec5e8", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "durnitisp-flake": { "inputs": { "flake-compat": "flake-compat", @@ -395,6 +415,22 @@ "type": "github" } }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1706470768, + "narHash": "sha256-ddAEniObz4JBJvzxXHodApaAxkbfb748L5rMgVSR6Rs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "58e2ab081f2c8b31d4a7329614f8ec370e3858e5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1678724065, @@ -523,11 +559,13 @@ "inputs": { "agenix-flake": "agenix-flake", "d2-vim-src": "d2-vim-src", + "darwin": "darwin_2", "durnitisp-flake": "durnitisp-flake", "harpoon-src": "harpoon-src", "jj-flake": "jj-flake", "nil-flake": "nil-flake", "nixpkgs": "nixpkgs_5", + "nixpkgs-darwin": "nixpkgs-darwin", "nurl-flake": "nurl-flake", "roslyn-lsp": "roslyn-lsp", "runwhen-flake": "runwhen-flake", diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index 7da420d..c139ff2 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -1,6 +1,13 @@ { inputs = { + # Default to sane nixpkgs versions nixpkgs.url = "github:nixos/nixpkgs/23.11"; + nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin"; + darwin = { + url = "github:lnl7/nix-darwin"; + # ensure that darwinSystem uses our nixpkgs version + inputs.nixpkgs.follows = "nixpkgs-darwin"; + }; sile-flake.url = "github:sile-typesetter/sile"; durnitisp-flake.url = "github:zaphar/durnitisp"; runwhen-flake.url = "github:zaphar/runwhen"; @@ -33,7 +40,9 @@ flake = false; }; }; + outputs = { + darwin, sile-flake, runwhen-flake, durnitisp-flake, @@ -46,15 +55,13 @@ d2-vim-src, treesitter-context, roslyn-lsp, - nixpkgs, ... # We don't use the self or nixpkgs args here so we just glob it. - }: { + }: + rec { vimModule = system: let - nixPkgs = import nixpkgs { inherit system; }; nil-pkg = nil-flake.packages."${system}".default; in - { config, ...}: let - pkgs = nixPkgs; + { config, pkgs, ...}: let possession-nvim = pkgs.callPackage ./possession-nvim.nix { inherit (pkgs.vimUtils) buildVimPlugin; inherit (pkgs) fetchFromGitHub; @@ -182,15 +189,13 @@ EOF"; }; systemModule = system: let runwhen = runwhen-flake.defaultPackage."${system}"; - nixPkgs = import nixpkgs { inherit system; }; durnitisp = durnitisp-flake.defaultPackage."${system}"; rust-overlay = rust-overlay-flake.overlays.default; sile = sile-flake.defaultPackage.${system}; jj = jj-flake.packages."${system}".jujutsu; age = agenix-flake.packages."${system}".default; nurl = nurl-flake.packages."${system}".default; - in { config, pkgs, ... }@args: let - pkgs = nixPkgs; + in { config, pkgs, ... }: let d2-lang = pkgs.callPackage ./d2.nix {}; in { @@ -205,6 +210,9 @@ EOF"; rust-overlay ]; + # TODO(jwall): This is needed for terraform + nixpkgs.config.allowUnfree = true; + environment.etc."nvim.lua" = { source = ./init.lua; }; @@ -224,9 +232,8 @@ EOF"; }; }; environment.systemPackages = (with pkgs; [ - args.pkgs.isabelle - args.pkgs.terraform # TODO(jeremy): Replace with opentofu when that is an option. - tmux-sessionizer + #isabelle # TODO(jwall): See if there is a way to pin this to a working build + terraform # TODO(jeremy): Replace with opentofu when that is an option. consul consul-template nomad @@ -275,9 +282,9 @@ EOF"; dotnet-sdk_7 netcoredbg powershell - #args.pkgs.ocaml - #args.pkgs.opam - #args.pkgs.ocamlformat + ocaml + #opam # TODO(jwall): See if there is a way to pin this to a working version. + ocamlformat # TODO(jwall): I include these initially for nvim telescope ripgrep fd @@ -285,7 +292,7 @@ EOF"; llvmPackages.bintools-unwrapped # TODO add sonic-pi here if it supports the arch ]) - ++ (with args.pkgs.ocamlPackages; [ + ++ (with pkgs.ocamlPackages; [ dune_3 odoc ocaml-lsp @@ -302,5 +309,14 @@ EOF"; ]; }; }; + + darwinConfigurations."jeremys-mbp" = darwin.lib.darwinSystem rec { + system = "aarch64-darwin"; + modules = [ + (systemModule system) + (vimModule system) + ./darwin-configuration.nix + ]; + }; }; } diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock deleted file mode 100644 index 891cd6e..0000000 --- a/nix/darwin/flake.lock +++ /dev/null @@ -1,804 +0,0 @@ -{ - "nodes": { - "agenix-flake": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1694793763, - "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", - "owner": "ryantm", - "repo": "agenix", - "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "base-system": { - "inputs": { - "agenix-flake": "agenix-flake", - "d2-vim-src": "d2-vim-src", - "durnitisp-flake": "durnitisp-flake", - "harpoon-src": "harpoon-src", - "jj-flake": "jj-flake", - "nil-flake": "nil-flake", - "nixpkgs": "nixpkgs_5", - "nurl-flake": "nurl-flake", - "roslyn-lsp": "roslyn-lsp", - "runwhen-flake": "runwhen-flake", - "rust-overlay-flake": "rust-overlay-flake", - "sile-flake": "sile-flake", - "treesitter-context": "treesitter-context" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-0oGq3sK7ihOgO60F4x7xsYeeLKfLSVjia4sgVCjxKhc=", - "path": "/nix/store/mfyhkqw0pjia0lr8mxv6n5sn3drj4qbz-source/nix/base-system", - "type": "path" - }, - "original": { - "path": "/nix/store/mfyhkqw0pjia0lr8mxv6n5sn3drj4qbz-source/nix/base-system", - "type": "path" - } - }, - "d2-vim-src": { - "flake": false, - "locked": { - "lastModified": 1675176182, - "narHash": "sha256-+mT4pEbtq7f9ZXhOop3Jnjr7ulxU32VtahffIwQqYF4=", - "owner": "terrastruct", - "repo": "d2-vim", - "rev": "981c87dccb63df2887cc41b96e84bf550f736c57", - "type": "github" - }, - "original": { - "owner": "terrastruct", - "repo": "d2-vim", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "base-system", - "agenix-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1692248770, - "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "durnitisp-flake": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "naersk": "naersk" - }, - "locked": { - "lastModified": 1678814232, - "narHash": "sha256-d0F2PueBTOPiBJyp4n2fVuywvqR7DiObWRdVVTbrYq4=", - "owner": "zaphar", - "repo": "durnitisp", - "rev": "5341153a8621ce287e5817ecc15bc7e269dda4d4", - "type": "github" - }, - "original": { - "owner": "zaphar", - "repo": "durnitisp", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "base-system", - "sile-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "harpoon-src": { - "flake": false, - "locked": { - "lastModified": 1703800925, - "narHash": "sha256-WD93Oq1WHrfkdOVbYDJiExr+MP1Uezl5WKA53jEdwmY=", - "owner": "ThePrimeagen", - "repo": "harpoon", - "rev": "6afc142443f8135329f8dd09b77e229f65001c0c", - "type": "github" - }, - "original": { - "owner": "ThePrimeagen", - "ref": "harpoon2", - "repo": "harpoon", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "base-system", - "agenix-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "jj-flake": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1694797768, - "narHash": "sha256-CA9AQ+lvgbCOfH++A0rHKguTBBn0EEcVRLMAmkDecQo=", - "owner": "martinvonz", - "repo": "jj", - "rev": "e288a152d052a531e0ccb25ae27ce07412d65447", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, - "libtexpdf-src": { - "flake": false, - "locked": { - "lastModified": 1662109873, - "narHash": "sha256-yThIb+D/m1xeJZESojRd3u4OugbWl7f2s8oJohspwZs=", - "owner": "sile-typesetter", - "repo": "libtexpdf", - "rev": "736a5e7530c13582ea704a061a358d0caa774916", - "type": "github" - }, - "original": { - "owner": "sile-typesetter", - "repo": "libtexpdf", - "type": "github" - } - }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1671096816, - "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", - "owner": "nix-community", - "repo": "naersk", - "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "naersk_2": { - "inputs": { - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1650101877, - "narHash": "sha256-IYxYc5Z1ZHQDTQbTWsOZ9HlZepsVjgV5oZwmbKzxSJs=", - "owner": "nix-community", - "repo": "naersk", - "rev": "8cc379478819e6a22ce7595a761fe1e17c8d7458", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "nil-flake": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1694177726, - "narHash": "sha256-eaYATUkElEbXGcehShhYfcGhrjfTMQEmJqxvO+/5ciw=", - "owner": "oxalica", - "repo": "nil", - "rev": "4775e34c30f6101a9bb4364a0c7e4aae4ae43f11", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1677676435, - "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1678724065, - "narHash": "sha256-MjeRjunqfGTBGU401nxIjs7PC9PZZ1FBCZp/bRB3C2M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b8afc8489dc96f29f69bec50fdc51e27883f89c1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1691683125, - "narHash": "sha256-FMU62G57HDbJwU+9V3q7I0mBaQYTYQdtPNlJt2t5/A4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4d2389b927696ef8da4ef76b03f2d306faf87929", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1690441914, - "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1701282334, - "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1689850295, - "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1650109093, - "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "faad370edcb37162401be50d45526f52bb16a713", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1682109806, - "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2362848adf8def2866fabbffc50462e929d7fffb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nurl-flake": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1701273941, - "narHash": "sha256-MwDKOU2JZRHObIJLFbge+XS3ov54dAlDGtzWPtq7/PE=", - "owner": "nix-community", - "repo": "nurl", - "rev": "caf9e815a036eec02eac877798ebc9b379adc810", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nurl", - "type": "github" - } - }, - "root": { - "inputs": { - "base-system": "base-system", - "darwin": "darwin_2" - } - }, - "roslyn-lsp": { - "flake": false, - "locked": { - "lastModified": 1704752101, - "narHash": "sha256-eWKAdrKfuBqSoOW70BSqcANrGQ+NwbmCL8C1jLXdNt8=", - "owner": "zaphar", - "repo": "roslyn.nvim", - "rev": "f1301be34ff786036867137228f3d9f65a3434af", - "type": "github" - }, - "original": { - "owner": "zaphar", - "ref": "non_nightly", - "repo": "roslyn.nvim", - "type": "github" - } - }, - "runwhen-flake": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", - "naersk": "naersk_2" - }, - "locked": { - "lastModified": 1695686584, - "narHash": "sha256-BQg2JwVRg0AUfgJwdCRpHcsA3OXfGVmIDs3P/G5AZ0M=", - "owner": "zaphar", - "repo": "runwhen", - "rev": "27cf79ffe4f381b9846c576a18c516382ef765ae", - "type": "github" - }, - "original": { - "owner": "zaphar", - "repo": "runwhen", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "base-system", - "jj-flake", - "flake-utils" - ], - "nixpkgs": [ - "base-system", - "jj-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1691719735, - "narHash": "sha256-GhPn5EIhGt7aFwgC6RELZJC7mUIol9O0k7Dsf2Hu0AM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ac9d8b2e9acc153145e6fa3c78f9ba458ae517bf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay-flake": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "base-system", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694743934, - "narHash": "sha256-4pn0x+OiOFWefBpgyufFVaAeG+LwfVUI/HMCma8xdHU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "6a26dd6da9b4f28d9b4c397bd22b5df4bec8f78a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "base-system", - "nil-flake", - "flake-utils" - ], - "nixpkgs": [ - "base-system", - "nil-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "sile-flake": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore", - "libtexpdf-src": "libtexpdf-src", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1694595810, - "narHash": "sha256-tqeteJwXs77NOoSw3jwQu4ImP8wH+omEwNq6MZycrDM=", - "owner": "sile-typesetter", - "repo": "sile", - "rev": "770d2b9f68297bb5e9ce75182bf6e57ae1cce3b9", - "type": "github" - }, - "original": { - "owner": "sile-typesetter", - "repo": "sile", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "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" - } - }, - "treesitter-context": { - "flake": false, - "locked": { - "lastModified": 1693236978, - "narHash": "sha256-B6BXeFEWxTFf46JrlatsxEQcC6+/hPIDBb5cIcJpLZg=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-context", - "rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-context", - "rev": "e6b743ccd4e780bc9cd85b707de67df72eea1a23", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix deleted file mode 100644 index 263d4cf..0000000 --- a/nix/darwin/flake.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - inputs = { - darwin.url = "github:lnl7/nix-darwin"; - base-system = { - url = "../base-system/"; - }; - }; - - outputs = { - darwin, - base-system, - ... - }: - let - forSystem = (system: - darwin.lib.darwinSystem rec { - inherit system; - modules = [ - (base-system.systemModule system) - (base-system.vimModule system) - ./darwin-configuration.nix - ]; - }); - in - { - darwinConfigurations."jeremys-mbp" = forSystem "aarch64-darwin"; - }; -}