aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2024-05-10 22:23:46 +0900
committersefidel <contact@sefidel.net>2024-05-10 22:26:06 +0900
commit4e247eba38878aae943a860720c516eb4ece8bc2 (patch)
treeb4290f8fca51495c5c1df4eff2d5337659f0fb9d
parent53e02e1acee9b081166c58d8bafd33bc9b80721b (diff)
downloadnixrc-4e247eba38878aae943a860720c516eb4ece8bc2.zip
feat(home/development): switch to nixpkgs helix
-rw-r--r--flake.lock101
-rw-r--r--flake.nix5
-rw-r--r--home/default.nix2
-rw-r--r--modules/binary-cache/caches/helix.nix12
4 files changed, 10 insertions, 110 deletions
diff --git a/flake.lock b/flake.lock
index f85c9a5..3dbaedd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,27 +66,6 @@
"type": "github"
}
},
- "crane_2": {
- "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-compat": {
"flake": false,
"locked": {
@@ -317,24 +296,6 @@
}
},
"flake-utils_3": {
- "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_4": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@@ -349,9 +310,9 @@
"type": "github"
}
},
- "flake-utils_5": {
+ "flake-utils_4": {
"inputs": {
- "systems": "systems_2"
+ "systems": "systems"
},
"locked": {
"lastModified": 1710146030,
@@ -367,9 +328,9 @@
"type": "github"
}
},
- "flake-utils_6": {
+ "flake-utils_5": {
"inputs": {
- "systems": "systems_3"
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
@@ -385,9 +346,9 @@
"type": "github"
}
},
- "flake-utils_7": {
+ "flake-utils_6": {
"inputs": {
- "systems": "systems_4"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
@@ -403,32 +364,6 @@
"type": "github"
}
},
- "helix": {
- "inputs": {
- "crane": "crane_2",
- "flake-utils": "flake-utils_3",
- "nixpkgs": [
- "unstable"
- ],
- "rust-overlay": [
- "rust"
- ]
- },
- "locked": {
- "lastModified": 1710347012,
- "narHash": "sha256-6ogeHiU9lpGfJ3drqMz2Gh359CVnb++hwl1UDewpeEQ=",
- "owner": "helix-editor",
- "repo": "helix",
- "rev": "0ff7ccbb2c1fd06584e150b366e0c46259a32aef",
- "type": "github"
- },
- "original": {
- "owner": "helix-editor",
- "repo": "helix",
- "rev": "0ff7ccbb2c1fd06584e150b366e0c46259a32aef",
- "type": "github"
- }
- },
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_3",
@@ -507,7 +442,7 @@
},
"lib-aggregate": {
"inputs": {
- "flake-utils": "flake-utils_6",
+ "flake-utils": "flake-utils_5",
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
@@ -542,7 +477,7 @@
},
"neovim-flake": {
"inputs": {
- "flake-utils": "flake-utils_5",
+ "flake-utils": "flake-utils_4",
"nixpkgs": [
"neovim-nightly",
"nixpkgs"
@@ -878,7 +813,7 @@
"hydra",
"nix"
],
- "flake-utils": "flake-utils_4",
+ "flake-utils": "flake-utils_3",
"gitignore": [
"hydra",
"nix"
@@ -913,7 +848,6 @@
"attic": "attic",
"colmena": "colmena",
"flake-compat": "flake-compat_3",
- "helix": "helix",
"home-manager": "home-manager",
"hydra": "hydra",
"impermanence": "impermanence",
@@ -931,7 +865,7 @@
},
"rust": {
"inputs": {
- "flake-utils": "flake-utils_7",
+ "flake-utils": "flake-utils_6",
"nixpkgs": [
"unstable"
]
@@ -1032,21 +966,6 @@
"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"
- }
- },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 42920e4..c6c7350 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,11 +33,6 @@
neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
neovim-nightly.inputs.nixpkgs.follows = "unstable";
- # TODO: https://github.com/helix-editor/helix/pull/9867
- helix.url = "github:helix-editor/helix/0ff7ccbb2c1fd06584e150b366e0c46259a32aef";
- helix.inputs.nixpkgs.follows = "unstable";
- helix.inputs.rust-overlay.follows = "rust";
-
rust.url = "github:oxalica/rust-overlay";
rust.inputs.nixpkgs.follows = "unstable";
diff --git a/home/default.nix b/home/default.nix
index f37beae..169b85b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,7 +9,6 @@
overlays = with inputs; [
rust.overlays.default
neovim-nightly.overlay
- helix.overlays.default
nur.overlay
nixpkgs-wayland.overlay
];
@@ -43,7 +42,6 @@
overlays = with inputs; [
rust.overlays.default
neovim-nightly.overlay
- helix.overlays.default
nur.overlay
nixpkgs-wayland.overlay
# TODO: fractional scaling is broken on 1.8+
diff --git a/modules/binary-cache/caches/helix.nix b/modules/binary-cache/caches/helix.nix
deleted file mode 100644
index 7783a96..0000000
--- a/modules/binary-cache/caches/helix.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-
-{
- nix.settings = {
- substituters = [
- "https://helix.cachix.org"
- ];
- trusted-public-keys = [
- "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
- ];
- };
-}