From 5fd9da259fbe8a56979c5a8e9b62dadbe91bc6b9 Mon Sep 17 00:00:00 2001 From: Mira Date: Mon, 15 Jul 2024 18:38:15 -0400 Subject: [PATCH] what have I done --- flake.lock | 264 ++++++++++++++++++++++++++++++++++++++- flake.nix | 30 ++++- leptin/configuration.nix | 16 ++- 3 files changed, 295 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2e55370..0983d48 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,193 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719226092, + "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1720861673, + "narHash": "sha256-gh34LtCLvXCd/Xyk33mgQU3QqNyJ7ZwJj59c4Qdad78=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "34b8101a10dfb4cb38832a17ef33281d59e2b2b3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1720816717, + "narHash": "sha256-C8bdG2wrI29afHI1705W37M7CPudz5117YafiBlW0Y4=", + "owner": "neovim", + "repo": "neovim", + "rev": "10256bb760fcab0dc25f7eb5b0b45966cb771939", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-darwin" ] }, "locked": { @@ -20,13 +204,13 @@ "type": "github" } }, - "nixpkgs": { + "nixos-unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -36,10 +220,78 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1720750130, + "narHash": "sha256-y2wc7CdK0vVSIbx7MdVoZzuMcUoLvZXm+pQf2RIr1OU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6794d064edc69918bb0fc0e0eda33ece324be17a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1720970785, + "narHash": "sha256-gRyLiF5ae1822DFjfOp+6+c/sexYz0BmsNGpxYnDUWM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fa4dd14e99394b6888a3913af42a04a9110e3bcc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-24.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1721016451, + "narHash": "sha256-Cypl9ORr5UjtBsbjXMTJRepTe362yNVrPrntUvHiTaw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a14c5d651cee9ed70f9cd9e83f323f1e531002db", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { + "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs" + "nixos-unstable": "nixos-unstable", + "nixpkgs": "nixpkgs_2", + "nixpkgs-darwin": "nixpkgs-darwin", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index ecb8ec8..11ab6d5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,22 +3,36 @@ description = "flake for mira::{auxin, leptin, gastrin}"; inputs = { - nixpkgs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixos-unstable = { url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.follows = "nixos-unstable"; }; + nixpkgs-unstable = { + url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; nix-darwin = { url = "github:LnL7/nix-darwin"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-darwin"; }; }; - outputs = inputs@{ + outputs = { self, - nixpkgs, + nixos-unstable, + nixpkgs-darwin, nix-darwin, - }: { + nixpkgs-unstable, + ... + }@inputs: + let overlays = [inputs.neovim-nightly-overlay.overlays.default]; + in + { nixosConfigurations = { - auxin = nixpkgs.lib.nixosSystem { + auxin = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./auxin/configuration.nix @@ -26,12 +40,16 @@ }; }; darwinConfigurations = { + leptin = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ ./leptin/configuration.nix + {nixpkgs.overlays = overlays;} ]; + specialArgs = { inherit nixpkgs-darwin; inherit nix-darwin; inherit inputs; inherit nixpkgs-unstable; }; }; }; }; } + diff --git a/leptin/configuration.nix b/leptin/configuration.nix index b4c8147..d2d25f7 100644 --- a/leptin/configuration.nix +++ b/leptin/configuration.nix @@ -1,10 +1,11 @@ { + inputs, config, lib, pkgs, ... -}: { - imports = []; +}: +{ nix = { package = pkgs.nixFlakes; @@ -17,6 +18,13 @@ networking = { hostName = "leptin"; }; + nixpkgs.config = { + packageOverrides = pkgs: with pkgs; { + unstable = import unstableChannel { + config = config.nixpkgs.config; + }; + }; + }; time.timeZone = "America/New_York"; environment.systemPackages = with pkgs; [ caddy @@ -28,7 +36,8 @@ difftastic btop alejandra - neovim + inputs.neovim-nightly-overlay.packages.${pkgs.system}.default + fastfetch hyperfine lazygit docker @@ -45,6 +54,7 @@ fzf mcfly wget + inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.nh ]; programs = { # nh = {