fix helix lsps
This commit is contained in:
parent
032cd2917c
commit
b79e6a781b
|
@ -190,4 +190,8 @@
|
|||
|
||||
# vars
|
||||
environment.variables = { MOZ_USE_XINPUT2 = "DEFAULT=1"; };
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"python-2.7.18.6"
|
||||
];
|
||||
}
|
||||
|
|
14
flake.nix
14
flake.nix
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-23.05";
|
||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
# hyprland.url = "github:hyprwm/Hyprland";
|
||||
supercolor.url = "github:zoe-bat/supercolor";
|
||||
kaokao.url = "github:zoe-bat/kaokao";
|
||||
|
@ -13,22 +12,15 @@
|
|||
};
|
||||
};
|
||||
outputs = { self, nixpkgs
|
||||
# , hyprland
|
||||
, home-manager, supercolor, i3layouts-rofi, nixpkgs-unstable, kaokao, hx
|
||||
, home-manager, supercolor, i3layouts-rofi, kaokao, hx
|
||||
}@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
overlay-unstable = final: prev: {
|
||||
unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
in {
|
||||
nixosConfigurations.bat = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
|
||||
({ config, pkgs, ... }: { nixpkgs.overlays = [ ]; })
|
||||
./configuration.nix
|
||||
];
|
||||
specialArgs = inputs;
|
||||
|
|
|
@ -12,10 +12,19 @@
|
|||
lsp.display-messages = true;
|
||||
};
|
||||
};
|
||||
languages = [
|
||||
languages.language-server = {
|
||||
"html-language-server" = { command = "html-languageserver"; };
|
||||
"css-language-server" = { command = "vscode-css-language-server"; };
|
||||
"scss-language-server" = {
|
||||
command = "vscode-css-language-server";
|
||||
args = [ "--stdio" ];
|
||||
};
|
||||
"typst-language-server" = { command = "typst-lsp"; };
|
||||
};
|
||||
languages.language = [
|
||||
{
|
||||
name = "html";
|
||||
language-server = { command = "html-languageserver"; };
|
||||
language-servers = [ "html-language-server" ];
|
||||
formatter = {
|
||||
command = "prettier";
|
||||
args = [ "--parser" "html" ];
|
||||
|
@ -23,7 +32,7 @@
|
|||
}
|
||||
{
|
||||
name = "scss";
|
||||
language-server = { command = "vscode-css-language-server"; };
|
||||
language-servers = [ "css-language-server" ];
|
||||
formatter = {
|
||||
command = "prettier";
|
||||
args = [ "--parser" "scss" ];
|
||||
|
@ -31,10 +40,7 @@
|
|||
}
|
||||
{
|
||||
name = "css";
|
||||
language-server = {
|
||||
command = "vscode-css-language-server";
|
||||
args = [ "--stdio" ];
|
||||
};
|
||||
language-servers = [ "css-language-server" ];
|
||||
formatter = {
|
||||
command = "prettier";
|
||||
args = [ "--parser" "scss" ];
|
||||
|
@ -44,26 +50,12 @@
|
|||
name = "nix";
|
||||
formatter = { command = "nixfmt"; };
|
||||
}
|
||||
{
|
||||
name = "rust";
|
||||
language-server = {
|
||||
command =
|
||||
"/home/zoe/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rust-analyzer";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "svelte";
|
||||
formatter = {
|
||||
command = "prettier";
|
||||
args = [ "--plugin=prettier-plugin-svelte" ];
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "typst";
|
||||
scope = "text.typ";
|
||||
roots = [ "main.typ" ];
|
||||
file-types = [ "typ" ];
|
||||
language-server = { command = "typst-lsp"; };
|
||||
language-servers = [ "typst-language-server" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
|
||||
home-manager.users.zoe.programs.i3status-rust = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.i3status-rust;
|
||||
package = pkgs.i3status-rust;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -14,6 +14,6 @@
|
|||
fonts.fonts = with pkgs; [
|
||||
atkinson-hyperlegible
|
||||
noto-fonts
|
||||
(unstable.nerdfonts.override { fonts = [ "CascadiaCode" ]; })
|
||||
(nerdfonts.override { fonts = [ "CascadiaCode" ]; })
|
||||
];
|
||||
}
|
||||
|
|
24
user.nix
24
user.nix
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, users, config, inputs, supercolor, kaokao, i3layouts-rofi, ... }:
|
||||
{ pkgs, supercolor, kaokao, i3layouts-rofi, ... }:
|
||||
let
|
||||
my-python-packages = p:
|
||||
with p; [
|
||||
|
@ -13,7 +13,7 @@ let
|
|||
"f16416b4f2b039c4e90f816a121e3fe56064569791b6324f1d1ec9e9e7861d47";
|
||||
};
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [ pkgs.unstable.python311Packages.i3ipc ];
|
||||
propagatedBuildInputs = [ pkgs.python311Packages.i3ipc ];
|
||||
})
|
||||
];
|
||||
in {
|
||||
|
@ -63,10 +63,10 @@ in {
|
|||
# video
|
||||
syncplay
|
||||
mpv
|
||||
unstable.yt-dlp
|
||||
unstable.youtube-dl
|
||||
yt-dlp
|
||||
youtube-dl
|
||||
obs-studio
|
||||
unstable.ffmpeg_6-full
|
||||
ffmpeg_6-full
|
||||
kdenlive
|
||||
vulkan-tools
|
||||
|
||||
|
@ -118,8 +118,8 @@ in {
|
|||
dbeaver
|
||||
zoom-us
|
||||
haskellPackages.Monadoro
|
||||
unstable.typst
|
||||
unstable.typst-lsp
|
||||
typst
|
||||
typst-lsp
|
||||
libreoffice
|
||||
|
||||
# spelling
|
||||
|
@ -143,7 +143,7 @@ in {
|
|||
## js
|
||||
nodejs
|
||||
nodePackages.prettier
|
||||
unstable.nodePackages.typescript-language-server
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.live-server
|
||||
nodePackages_latest.vscode-langservers-extracted
|
||||
nodePackages_latest.svelte-language-server
|
||||
|
@ -156,19 +156,18 @@ in {
|
|||
cargo-outdated
|
||||
cargo-generate
|
||||
## python
|
||||
(unstable.python311.withPackages my-python-packages)
|
||||
manim
|
||||
(python311.withPackages my-python-packages)
|
||||
black
|
||||
## dotlang
|
||||
graphviz
|
||||
## 3d
|
||||
blender
|
||||
## godot
|
||||
unstable.godot_4
|
||||
godot_4
|
||||
## arduino
|
||||
arduino
|
||||
## tilemap editor
|
||||
unstable.ldtk
|
||||
ldtk
|
||||
## android
|
||||
android-tools
|
||||
|
||||
|
@ -198,6 +197,7 @@ in {
|
|||
bottom
|
||||
tmux
|
||||
zellij
|
||||
sshfs
|
||||
];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue