diff --git a/flake.nix b/flake.nix index 95a8488..3864b50 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # conduwuit = { + # url = "github:girlbossceo/conduwuit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - conduwuit, + # conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/home-manager/shared/shell/helix/helix.nix b/home-manager/shared/shell/helix/helix.nix new file mode 100644 index 0000000..3b224db --- /dev/null +++ b/home-manager/shared/shell/helix/helix.nix @@ -0,0 +1,45 @@ +{ + fetchzip, + lib, + rustPlatform, + git, + installShellFiles, +}: +rustPlatform.buildRustPackage rec { + pname = "helix"; + version = "24.07"; + + # This release tarball includes source code for the tree-sitter grammars, + # which is not ordinarily part of the repository. + src = fetchzip { + url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; + hash = ""; + stripRoot = false; + }; + + cargoHash = ""; + + nativeBuildInputs = [git installShellFiles]; + + env.HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime"; + + postInstall = '' + # not needed at runtime + rm -r runtime/grammars/sources + + mkdir -p $out/lib + cp -r runtime $out/lib + installShellCompletion contrib/completion/hx.{bash,fish,zsh} + mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} + cp contrib/Helix.desktop $out/share/applications + cp contrib/helix.png $out/share/icons/hicolor/256x256/apps + ''; + + meta = with lib; { + description = "Post-modern modal text editor"; + homepage = "https://helix-editor.com"; + license = licenses.mpl20; + mainProgram = "hx"; + maintainers = with maintainers; [danth yusdacra zowoq]; + }; +} diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index b664165..2f89f27 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -41,14 +41,12 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" - "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; diff --git a/pkgs/simple-completion-language-server/result b/pkgs/simple-completion-language-server/result deleted file mode 120000 index 5a7c687..0000000 --- a/pkgs/simple-completion-language-server/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55 \ No newline at end of file