upgrade helix
This commit is contained in:
parent
23d38f9002
commit
2e093b7d88
269
flake.lock
269
flake.lock
|
|
@ -24,18 +24,31 @@
|
|||
}
|
||||
},
|
||||
"crane": {
|
||||
"flake": false,
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": [
|
||||
"helix",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"helix",
|
||||
"rust-overlay"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681175776,
|
||||
"narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=",
|
||||
"lastModified": 1692750383,
|
||||
"narHash": "sha256-n5P5HOXuu23UB1h9PuayldnRRVQuXJLpoO+xqtMO3ws=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "445a3d222947632b5593112bb817850e8a9cf737",
|
||||
"rev": "ef5d11e3c2e5b3924eb0309dba2e1fea2d9062ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"ref": "v0.12.1",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -81,112 +94,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dream2nix": {
|
||||
"inputs": {
|
||||
"all-cabal-json": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"crane": "crane",
|
||||
"devshell": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"drv-parts": "drv-parts",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": [
|
||||
"helix",
|
||||
"nci",
|
||||
"parts"
|
||||
],
|
||||
"flake-utils-pre-commit": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"ghc-utils": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"gomod2nix": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"mach-nix": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"nix-pypi-fetcher": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgsV1": "nixpkgsV1",
|
||||
"poetry2nix": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"pre-commit-hooks": [
|
||||
"helix",
|
||||
"nci"
|
||||
],
|
||||
"pruned-racket-catalog": [
|
||||
"helix",
|
||||
"nci"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1683212002,
|
||||
"narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "dream2nix",
|
||||
"rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "dream2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"drv-parts": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"helix",
|
||||
"nci",
|
||||
"dream2nix",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-parts": [
|
||||
"helix",
|
||||
"nci",
|
||||
"dream2nix",
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nci",
|
||||
"dream2nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680698112,
|
||||
"narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=",
|
||||
"owner": "davhau",
|
||||
"repo": "drv-parts",
|
||||
"rev": "e8c2ec1157dc1edb002989669a0dbd935f430201",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "davhau",
|
||||
"repo": "drv-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"endless-sky": {
|
||||
"locked": {
|
||||
"lastModified": 1677885745,
|
||||
|
|
@ -281,11 +188,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"lastModified": 1692799911,
|
||||
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -312,24 +219,24 @@
|
|||
},
|
||||
"helix": {
|
||||
"inputs": {
|
||||
"nci": "nci",
|
||||
"crane": "crane",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs-stable"
|
||||
],
|
||||
"parts": "parts_2",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684393286,
|
||||
"narHash": "sha256-Ws9uWtZLvTwL5HNonFr4YwyPoTU8QlCvhs6IJ92aLDw=",
|
||||
"lastModified": 1692817399,
|
||||
"narHash": "sha256-gbLru0aup6iI0JnDGMQd1jsb8H6IJUNr/Xln3/ouAZc=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "7f5940be80eaa3aec7903903072b7108f41dd97b",
|
||||
"rev": "c9694f680f97823ac9b893239a78bf45bfee0403",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "helix-editor",
|
||||
"ref": "23.05",
|
||||
"ref": "master",
|
||||
"repo": "helix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -355,50 +262,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mk-naked-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1681286841,
|
||||
"narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
|
||||
"owner": "yusdacra",
|
||||
"repo": "mk-naked-shell",
|
||||
"rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "yusdacra",
|
||||
"repo": "mk-naked-shell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nci": {
|
||||
"inputs": {
|
||||
"dream2nix": "dream2nix",
|
||||
"mk-naked-shell": "mk-naked-shell",
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"parts": "parts",
|
||||
"rust-overlay": [
|
||||
"helix",
|
||||
"rust-overlay"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1683699050,
|
||||
"narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=",
|
||||
"owner": "yusdacra",
|
||||
"repo": "nix-cargo-integration",
|
||||
"rev": "ed27173cd1b223f598343ea3c15aacb1d140feac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "yusdacra",
|
||||
"repo": "nix-cargo-integration",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nil": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
|
|
@ -440,24 +303,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1682879489,
|
||||
"narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1693045407,
|
||||
|
|
@ -522,21 +367,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgsV1": {
|
||||
"locked": {
|
||||
"lastModified": 1678500271,
|
||||
"narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-22.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1693043931,
|
||||
|
|
@ -553,46 +383,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"helix",
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1683560683,
|
||||
"narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "006c75898cf814ef9497252b022e91c946ba8e17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1683560683,
|
||||
"narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "006c75898cf814ef9497252b022e91c946ba8e17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"alejandra": "alejandra",
|
||||
|
|
@ -632,7 +422,10 @@
|
|||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": [
|
||||
"helix",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"helix",
|
||||
"nixpkgs"
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@
|
|||
type = "github";
|
||||
owner = "helix-editor";
|
||||
repo = "helix";
|
||||
ref = "23.05";
|
||||
ref = "master";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
sops = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
system,
|
||||
|
|
@ -8,31 +6,39 @@
|
|||
}: let
|
||||
alejandra = lib.getExe inputs.alejandra.packages.${system}.default;
|
||||
nil = lib.getExe inputs.nil.packages.${system}.default;
|
||||
helixPackage = inputs.helix.packages.${system}.default;
|
||||
helix = lib.getExe helixPackage;
|
||||
in {
|
||||
home.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
EDITOR = lib.mkForce helix;
|
||||
VISUAL = lib.mkForce helix;
|
||||
};
|
||||
programs.zsh.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
EDITOR = lib.mkForce helix;
|
||||
VISUAL = lib.mkForce helix;
|
||||
};
|
||||
systemd.user.sessionVariables = {
|
||||
EDITOR = "vim";
|
||||
VISUAL = "vim";
|
||||
EDITOR = lib.mkForce helix;
|
||||
VISUAL = lib.mkForce helix;
|
||||
};
|
||||
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
package = helixPackage;
|
||||
languages = {
|
||||
nix = {
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
language-server = {command = nil;};
|
||||
formatter = {
|
||||
command = alejandra;
|
||||
args = ["-q"];
|
||||
};
|
||||
language = [
|
||||
{
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
language-servers = ["nil"];
|
||||
formatter = {
|
||||
command = alejandra;
|
||||
args = ["-q"];
|
||||
};
|
||||
}
|
||||
];
|
||||
language-server.nil = {
|
||||
command = nil;
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
|
|
@ -46,95 +52,5 @@ in {
|
|||
soft-wrap.enable = true;
|
||||
};
|
||||
};
|
||||
themes = {
|
||||
solarized_peninsula = {
|
||||
palette = {
|
||||
base03 = "#002b36";
|
||||
base025 = "#03303b";
|
||||
base02 = "#073642";
|
||||
base0175 = "#16404b";
|
||||
base015 = "#2c4f59";
|
||||
base01 = "#586e75";
|
||||
base00 = "#657b83";
|
||||
base0 = "#839496";
|
||||
base1 = "#93a1a1";
|
||||
base2 = "#eee8d5";
|
||||
base3 = "#fdf6e3";
|
||||
yellow = "#b58900";
|
||||
orange = "#cb4b16";
|
||||
red = "#dc322f";
|
||||
magenta = "#d33682";
|
||||
violet = "#6c71c4";
|
||||
blue = "#268bd2";
|
||||
cyan = "#2aa198";
|
||||
green = "#859900";
|
||||
transparent = "none";
|
||||
gray = "#665c54";
|
||||
dark-gray = "#3c3836";
|
||||
white = "#fbf1c7";
|
||||
black = "#282828";
|
||||
};
|
||||
"ui.menu" = "transparent";
|
||||
"ui.menu.selected" = {modifiers = ["reversed"];};
|
||||
"ui.linenr" = {
|
||||
fg = "gray";
|
||||
bg = "dark-gray";
|
||||
};
|
||||
"ui.popup" = {modifiers = ["reversed"];};
|
||||
"ui.linenr.selected" = {
|
||||
fg = "white";
|
||||
bg = "black";
|
||||
modifiers = ["bold"];
|
||||
};
|
||||
"ui.selection" = {
|
||||
fg = "black";
|
||||
bg = "blue";
|
||||
};
|
||||
"ui.selection.primary" = {modifiers = ["reversed"];};
|
||||
"comment" = {fg = "gray";};
|
||||
"ui.statusline" = {
|
||||
fg = "white";
|
||||
bg = "dark-gray";
|
||||
};
|
||||
"ui.statusline.inactive" = {
|
||||
fg = "dark-gray";
|
||||
bg = "white";
|
||||
};
|
||||
"ui.help" = {
|
||||
fg = "dark-gray";
|
||||
bg = "white";
|
||||
};
|
||||
"ui.cursor" = {modifiers = ["reversed"];};
|
||||
"variable" = "red";
|
||||
"variable.builtin" = "orange";
|
||||
"constant.numeric" = "orange";
|
||||
"constant" = "orange";
|
||||
"attributes" = "yellow";
|
||||
"type" = "yellow";
|
||||
"ui.cursor.match" = {
|
||||
fg = "yellow";
|
||||
modifiers = ["underlined"];
|
||||
};
|
||||
"string" = "green";
|
||||
"variable.other.member" = "red";
|
||||
"constant.character.escape" = "cyan";
|
||||
"function" = "blue";
|
||||
"constructor" = "blue";
|
||||
"special" = "blue";
|
||||
"keyword" = "magenta";
|
||||
"label" = "magenta";
|
||||
"namespace" = "blue";
|
||||
"diff.plus" = "green";
|
||||
"diff.delta" = "yellow";
|
||||
"diff.minus" = "red";
|
||||
"diagnostic" = {modifiers = ["underlined"];};
|
||||
"ui.gutter" = {bg = "black";};
|
||||
"info" = "blue";
|
||||
"hint" = "dark-gray";
|
||||
"debug" = "dark-gray";
|
||||
"warning" = "yellow";
|
||||
"error" = "red";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue