From f7d6af06b8dc15114b63f6fa0229a0f0db0fa1e3 Mon Sep 17 00:00:00 2001 From: Isabella Bastaja Date: Mon, 15 Jun 2026 07:28:47 +0200 Subject: switch to using wrapped helix --- flake.lock | 34 +++++------ share/cfg/default.nix | 1 - share/cfg/helix.nix | 144 ----------------------------------------------- share/home/dev-stuff.nix | 2 +- 4 files changed, 18 insertions(+), 163 deletions(-) delete mode 100644 share/cfg/helix.nix diff --git a/flake.lock b/flake.lock index d6c45e2..7167baf 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1774197122, - "narHash": "sha256-eidCp9jr4doBF6v2hPwqZkt8fUtW14w7fqHFVtstR94=", + "lastModified": 1781496761, + "narHash": "sha256-wVQH4PIg9EnNzqk1X75318/DGcgC9H9AIDT5GKRS9hw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4f7b5653f8845eee7c41c9a029d7bc22aaca4e67", + "rev": "c1c502303cd188dc700661adefcc9ec257f434dc", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -276,16 +276,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1773964973, - "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", + "lastModified": 1781216227, + "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", + "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -450,11 +450,11 @@ "wrapper-manager": "wrapper-manager" }, "locked": { - "lastModified": 1774623359, - "narHash": "sha256-0mfkO7oGDKgDfzOzL0j8aD4KVeQ93yTj/s/peu81X38=", + "lastModified": 1781501210, + "narHash": "sha256-sNmdujoIW5+FPNfLnMTBY6+IvbC4LL4RUiOUSB1AP8I=", "ref": "refs/heads/main", - "rev": "8cac6bc950b815ee483ca9cfaa2ab9f6002d110f", - "revCount": 24, + "rev": "e6e4d53bf0fbf54d9e1413163913d3152bf1e82b", + "revCount": 26, "type": "git", "url": "https://git.sorre.xyz/isabella/xpkgs" }, diff --git a/share/cfg/default.nix b/share/cfg/default.nix index 08b4300..569052a 100644 --- a/share/cfg/default.nix +++ b/share/cfg/default.nix @@ -6,7 +6,6 @@ ./waybar.nix ./git.nix ./mpv.nix - ./helix.nix ./gallery-dl.nix ./shellenv.nix ./fish.nix diff --git a/share/cfg/helix.nix b/share/cfg/helix.nix deleted file mode 100644 index 31d3cbd..0000000 --- a/share/cfg/helix.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ - pkgs, - ... -}: -{ - programs.helix = { - defaultEditor = true; - extraPackages = with pkgs; [ - nil - nixfmt - emmet-ls - ]; - - settings = { - theme = "tokyonight"; - editor = { - line-number = "relative"; - indent-guides = { - render = true; - character = "┆"; - skip-levels = 1; - }; - cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; - whitespace.render = { - space = "all"; - tab = "all"; - newline = "none"; - }; - whitespace.characters = { - space = "·"; - nbsp = "⍽"; - tab = "→"; - newline = "⏎"; - tabpad = "·"; # Tabs will look like "→···" (depending on tab width) - }; - cursorline = true; - lsp.display-messages = true; - }; - keys.normal."space" = { - "f" = "file_picker_in_current_directory"; - "F" = "file_picker"; - }; - }; - - languages = { - language-server.emmet-ls = { - command = "emmet-ls"; - args = [ "--stdio" ]; - }; - language-server.astro-ls = { - command = "astro-ls"; - args = [ "--stdio" ]; - config = { - typescript.tsdk = "${pkgs.typescript}/lib/node_modules/typescript/lib"; - environment = "node"; - }; - }; - - language = [ - { - name = "html"; - language-servers = [ - "vscode-html-language-server" - "emmet-ls" - ]; - } - { - name = "php"; - language-servers = [ - "emmet-ls" - ]; - } - { - name = "astro"; - scope = "source.astro"; - injection-regex = "astro"; - file-types = [ "astro" ]; - roots = [ - "package.json" - "astro.config.mjs" - ]; - language-servers = [ - "astro-ls" - "emmet-ls" - ]; - auto-format = true; - } - { - name = "nix"; - auto-format = true; - formatter = { - command = "nixfmt"; - args = [ "-" ]; - }; - } - { - name = "cpp"; - auto-format = true; - formatter.command = "clang-format"; - } - { - name = "cmake"; - auto-format = true; - formatter = { - command = "cmake-format"; - args = [ "-" ]; - }; - } - { - name = "svelte"; - language-servers = [ - "svelteserver" - "emmet-ls" - ]; - } - { - name = "vue"; - language-servers = [ - "vue-language-server" - "emmet-ls" - ]; - } - ]; - }; # end of languages - - ignores = [ - "*.lock" - "!.gitignore" - "!.cargo" - - # Common binary file formats - "*.exe" - "*.bin" - "*.png" - "*.jpeg" - "*.jpg" - "*.webp" - ]; - }; # end of programs.helix -} diff --git a/share/home/dev-stuff.nix b/share/home/dev-stuff.nix index a662531..40b6bfe 100644 --- a/share/home/dev-stuff.nix +++ b/share/home/dev-stuff.nix @@ -99,11 +99,11 @@ in programs.helix = { enable = true; defaultEditor = true; + package = pkgs.sorre.helix; }; programs.direnv = { enable = true; nix-direnv.enable = true; }; - } -- cgit v1.3.1