diff --git a/flake.lock b/flake.lock index d5a3710..063ae11 100644 --- a/flake.lock +++ b/flake.lock @@ -196,17 +196,19 @@ ] }, "locked": { - "lastModified": 1631926766, - "narHash": "sha256-aDukfKZ8+Ss8KsHPFlUlKc+fMDGWvvYxhDfzPYQ/Ti0=", - "owner": "helix-editor", - "repo": "helix", - "rev": "ae4d37de28abab23651aa6a239e6d9d90674f039", - "type": "github" + "lastModified": 1632450064, + "narHash": "sha256-aeI1iaCYd35MTgQcCELVFk05XXmhwpXP81mofVZgmjU=", + "ref": "master", + "rev": "df55eaae69d0388de26448e82f9ded483fca2f44", + "revCount": 1488, + "submodules": true, + "type": "git", + "url": "https://github.com/helix-editor/helix.git" }, "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/helix-editor/helix.git" } }, "home": { @@ -329,6 +331,7 @@ "inputs": { "devshell": "devshell_2", "nixpkgs": [ + "helix", "nixpkgs" ], "rustOverlay": "rustOverlay" @@ -450,11 +453,11 @@ ] }, "locked": { - "lastModified": 1631531304, - "narHash": "sha256-hlJ0FYaxUGpFqAuhB+Fde7ydxJQXV3NIwKQ8rW85gc8=", + "lastModified": 1632521018, + "narHash": "sha256-worJcyb+s+bUFCpMQx12W8ZLUlVqArWaN9ijxFzOiV8=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "ab9c26a903846fc6712b811bdb32a2539ed3a42d", + "rev": "f383249f3c6ea24164be5cddbe269626cd3d981e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a4079c7..a1a6990 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,9 @@ inputs.utils.follows = "flake-utils"; }; helix = { - url = "github:helix-editor/helix"; + url = "https://github.com/helix-editor/helix.git"; + type = "git"; + submodules = true; inputs.nixpkgs.follows = "nixpkgs"; }; nixosPersistence.url = "github:nix-community/impermanence"; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 27821b2..d13376f 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -21,8 +21,7 @@ channels: final: prev: { gh chromium-unwrapped chromium - sublime4 - helix; + sublime4; libnotify-latest = channels.latest.libnotify; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index b3cc26e..a2ba992 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -694,10 +694,6 @@ in "variable" = { fg = "#${colorScheme.bright.blue}", modifiers = ['italic'] } "variable.builtin" = { fg = "#${colorScheme.bright.blue}", modifiers = ['italic'] } "variable.parameter" = { fg = "#${colorScheme.bright.red}", modifiers = ['italic'] } - "info" = { fg = "#${colorScheme.normal.blue}", modifiers = ['bold'] } - "hint" = { fg = "#${colorScheme.bright.green}", modifiers = ['bold'] } - "warning" = { fg = "#${colorScheme.normal.yellow}", modifiers = ['bold'] } - "error" = { fg = "#${colorScheme.bright.red}", modifiers = ['bold'] } "ui.menu.selected" = { fg = "#${bgColor}", bg = "#${acColor}" } "ui.background" = { fg = "#${fgColor}", bg = "#${bgColor}" } "ui.help" = { bg = "#${colorScheme.normal.black}" } @@ -710,8 +706,12 @@ in "ui.text" = { fg = "#${fgColor}", bg = "#${bgColor}" } "ui.text.focus" = { fg = "#${fgColor}", bg = "#${bgColor}", modifiers = ['bold'] } "ui.window" = { bg = "#${bgColor}" } - "ui.cursor" = { modifiers = ["reversed"] } - "ui.cursor.select" = { modifiers = ["reversed"] } + "ui.cursor.primary" = { fg = "#${fgColor}", modifiers = ["reversed"] } + + "info" = { fg = "#${colorScheme.normal.blue}", modifiers = ['bold'] } + "hint" = { fg = "#${colorScheme.bright.green}", modifiers = ['bold'] } + "warning" = { fg = "#${colorScheme.normal.yellow}", modifiers = ['bold'] } + "error" = { fg = "#${colorScheme.bright.red}", modifiers = ['bold'] } ''; "helix/config.toml".text = '' theme = "mytheme"