From 38b5fee4fd247b77775065ca5de85c32da517678 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 2 Oct 2023 16:06:56 -0500 Subject: [PATCH] Helix from nixpkgs unstable --- flake.lock | 150 ++--------------------------------------------- flake.nix | 1 - home.nix | 10 +--- home/user.nix | 1 - nixos.nix | 5 -- nixos/common.nix | 8 +-- 6 files changed, 8 insertions(+), 167 deletions(-) diff --git a/flake.lock b/flake.lock index 85c564d..9eaf1f9 100644 --- a/flake.lock +++ b/flake.lock @@ -19,36 +19,6 @@ "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" } }, - "crane": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ], - "rust-overlay": [ - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -68,22 +38,6 @@ "type": "github" } }, - "flake-compat": { - "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": { "inputs": { "systems": "systems" @@ -103,24 +57,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "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": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -135,27 +71,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1696255829, - "narHash": "sha256-5XId/8r09qEAyBI8lFq0qpVsEvtdDl6gHkBHmhp/sMA=", - "owner": "helix-editor", - "repo": "helix", - "rev": "7fbfec766c2ce2570ca4160744723813dbdc3019", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -225,22 +140,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1696275311, "narHash": "sha256-Z8aJvoUyMv/+0G7iqYIqecxRDFbz05RK2e3/irbWq9M=", @@ -255,7 +154,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1694760568, "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", @@ -275,41 +174,15 @@ "inputs": { "api-lyte-dev": "api-lyte-dev", "disko": "disko", - "helix": "helix", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "sops-nix": "sops-nix", "utils": "utils" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690424156, - "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -341,24 +214,9 @@ "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" - } - }, "utils": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1696272629, diff --git a/flake.nix b/flake.nix index e5dd96d..4784a70 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,6 @@ disko.url = "github:nix-community/disko/master"; sops-nix.url = "github:Mic92/sops-nix"; - helix.url = "github:helix-editor/helix"; # TODO: hyprland.url = "github:hyprwm/Hyprland"; }; diff --git a/home.nix b/home.nix index 975a41a..8867fb6 100644 --- a/home.nix +++ b/home.nix @@ -1,15 +1,9 @@ inputs: -let - overlay = system: final: prev: { - helix = prev.helix // inputs.helix.packages.${system}.helix; - }; - # TODO: be functional - have a mkHome function? -in { daniel = let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { inherit system; overlays = [ (overlay system) ]; }; + pkgs = import inputs.nixpkgs { inherit system; }; in inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; @@ -22,7 +16,7 @@ in daniel-work = let system = "aarch64-darwin"; - pkgs = import inputs.nixpkgs { inherit system; overlays = [ (overlay system) ]; }; + pkgs = import inputs.nixpkgs { inherit system; }; in inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; diff --git a/home/user.nix b/home/user.nix index 282dc04..b158c5b 100644 --- a/home/user.nix +++ b/home/user.nix @@ -151,7 +151,6 @@ in helix = { enable = true; - package = pkgs.helix; languages = { language-server = { lexical = { diff --git a/nixos.nix b/nixos.nix index 4cdd725..dd5218f 100644 --- a/nixos.nix +++ b/nixos.nix @@ -2,11 +2,6 @@ inputs @ { self, ... }: let daniel = system: { home-manager.users.daniel = { - nixpkgs.overlays = [ - (final: prev: { - helix = prev.helix // inputs.helix.packages.${system}.helix; - }) - ]; imports = [ ./home/user.nix ./home/linux.nix ]; }; }; diff --git a/nixos/common.nix b/nixos/common.nix index cedf178..0d85d6d 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,9 +1,6 @@ { config, lib, inputs, system, ... }: let - overlay = final: prev: { - helix = prev.helix // inputs.helix.packages.${system}.helix; - }; - pkgs = inputs.nixpkgs.legacyPackages.${system}.extend overlay; + pkgs = inputs.nixpkgs.legacyPackages.${system}; in { services.journald.extraConfig = "SystemMaxUse=1G"; @@ -31,6 +28,7 @@ in file gnumake gron + helix hexyl htop iputils @@ -57,8 +55,6 @@ in xh zellij zstd - ] ++ [ - inputs.helix.packages."x86_64-linux".helix ]; };