From 190c9a39f26624eba5420c92827b51aea354aaa1 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 16 Oct 2024 21:11:36 -0400 Subject: [PATCH] Updated flake.lock and use master helix version --- dot_config/home-manager/flake.lock | 169 ++++++++++++++++--- dot_config/home-manager/flake.nix | 2 + dot_config/home-manager/home/common.nix | 13 +- dot_config/home-manager/overlays/default.nix | 11 +- 4 files changed, 156 insertions(+), 39 deletions(-) diff --git a/dot_config/home-manager/flake.lock b/dot_config/home-manager/flake.lock index 430ef93..8bf8f88 100644 --- a/dot_config/home-manager/flake.lock +++ b/dot_config/home-manager/flake.lock @@ -1,6 +1,45 @@ { "nodes": { + "crane": { + "inputs": { + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709610799, + "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "owner": "ipetkov", + "repo": "crane", + "rev": "81c393c776d5379c030607866afef6406ca1be57", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -31,6 +70,27 @@ "type": "github" } }, + "helix": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1729068734, + "narHash": "sha256-JOqmdtcdQohQL1qvTDrVJvd+nkydRm+Lyf3qVF5iQ5E=", + "owner": "helix-editor", + "repo": "helix", + "rev": "d1b8129491124ce6068e95ccc58a7fefb1c9db45", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -38,11 +98,11 @@ ] }, "locked": { - "lastModified": 1728726232, - "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -53,8 +113,8 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1713543440, @@ -71,6 +131,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -85,29 +177,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_3": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1728627514, - "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -120,11 +196,52 @@ "root": { "inputs": { "gnomeExtensions": "gnomeExtensions", + "helix": "helix", "home-manager": "home-manager", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "helix", + "flake-utils" + ], + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709604635, + "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "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" + } } }, "root": "root", diff --git a/dot_config/home-manager/flake.nix b/dot_config/home-manager/flake.nix index 9b22e19..9596530 100644 --- a/dot_config/home-manager/flake.nix +++ b/dot_config/home-manager/flake.nix @@ -10,6 +10,8 @@ }; nixgl.url = "github:nix-community/nixGL"; gnomeExtensions.url = "github:honnip/nixpkgs/update-gnome-extensions"; + + helix.url = "github:helix-editor/helix"; }; outputs = { diff --git a/dot_config/home-manager/home/common.nix b/dot_config/home-manager/home/common.nix index cf3bc56..e528254 100644 --- a/dot_config/home-manager/home/common.nix +++ b/dot_config/home-manager/home/common.nix @@ -1,5 +1,5 @@ { - # inputs, + inputs, outputs, # lib, # config, @@ -27,6 +27,8 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages + + inputs.helix.overlays.default ]; }; @@ -40,7 +42,7 @@ # dotfiles age - chezmoi + unstable.chezmoi # backup restic @@ -56,11 +58,11 @@ # Shell bash starship + btop ripgrep fh fd glow - masters.helix gitoxide lnav @@ -81,6 +83,11 @@ ltex-ls # Spell checker ]; + programs.helix = { + enable = true; + package = inputs.helix.packages.${pkgs.system}.default; + }; + programs.bat = { enable = true; config = { diff --git a/dot_config/home-manager/overlays/default.nix b/dot_config/home-manager/overlays/default.nix index 2184a59..1685c9f 100644 --- a/dot_config/home-manager/overlays/default.nix +++ b/dot_config/home-manager/overlays/default.nix @@ -7,16 +7,7 @@ config.allowUnfree = true; }; - masters = { - helix = prev.helix.overrideAttrs { - src = inputs.fetchzip { - url = "https://github.com/helix-editor/helix/releases/download/master/helix-master-source.tar.xz"; - hash = "sha256-R8foMx7YJ01ZS75275xPQ52Ns2EB3OPop10F4nicmoA="; - stripRoot = false; - }; - - cargoHash = "sha256-Y8zqdS8vl2koXmgFY0hZWWP1ZAO8JgwkoPTYPVpk"; - }; + mods = { }; };