Compare commits

..

No commits in common. "b6c7dd1f612fe8cbe06624b4023c45b9163c1224" and "2df5c203d5d903064b18756375e6d7bb10aba420" have entirely different histories.

7 changed files with 11 additions and 99 deletions

View file

@ -30,6 +30,7 @@
pavucontrol pavucontrol
anki-bin anki-bin
tomato-c tomato-c
vscode-fhs
obsidian-wayland obsidian-wayland
virt-manager virt-manager
qbittorrent qbittorrent
@ -46,8 +47,6 @@
bottles bottles
prismlauncher prismlauncher
heroic heroic
r2modman
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
(callPackage ../../../pkgs/chatterino7 {}) (callPackage ../../../pkgs/chatterino7 {})
]; ];

View file

@ -1,9 +1,8 @@
_: { {...}: {
imports = [ imports = [
./languages.nix ./languages.nix
./themes/tokyonight.nix ./themes/tokyonight.nix
]; ];
programs.helix = { programs.helix = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;

View file

@ -3,13 +3,11 @@
lib, lib,
... ...
}: { }: {
home.packages = [(pkgs.callPackage ../../../../pkgs/scls {})];
programs.helix.languages = { programs.helix.languages = {
language = with pkgs; [ language = with pkgs; [
{ {
name = "nix"; name = "nix";
auto-format = true; auto-format = true;
language-servers = ["scls" "nil"];
formatter = { formatter = {
command = lib.getExe alejandra; command = lib.getExe alejandra;
args = ["-q"]; args = ["-q"];
@ -18,7 +16,9 @@
{ {
name = "rust"; name = "rust";
auto-format = true; auto-format = true;
language-servers = ["scls" "rust-analyzer"]; language-servers = [
"rust-analyzer"
];
formatter = { formatter = {
command = lib.getExe rustfmt; command = lib.getExe rustfmt;
args = ["--edition" "2021"]; args = ["--edition" "2021"];
@ -27,62 +27,12 @@
{ {
name = "lua"; name = "lua";
auto-format = true; auto-format = true;
language-servers = ["scls" "lua-language-server"];
formatter = { formatter = {
command = lib.getExe stylua; command = lib.getExe stylua;
}; };
} }
{
name = "python";
auto-format = true;
language-servers = ["scls" "ruff"];
formatter = with pkgs; {
command = lib.getExe ruff;
args = ["format" "-q"];
};
}
{
name = "javascript";
auto-format = true;
language-servers = [
"scls"
{
name = "typescript-language-server";
except-features = ["format"];
}
];
formatter = with pkgs; {
command = lib.getExe biome;
args = ["format"];
};
}
{
name = "toml";
auto-format = true;
language-servers = ["scls" "taplo"];
formatter = with pkgs; {
command = lib.getExe taplo;
args = ["fmt" "-"];
};
}
{
name = "json";
auto-format = true;
language-servers = ["scls" "biome"];
formatter = with pkgs; {
command = lib.getExe biome;
args = ["format"];
};
}
]; ];
language-server = with pkgs; { language-server = with pkgs; {
scls = {
command = "simple-completion-language-server";
config = {
feature_snippets = true;
feature_paths = true;
};
};
nil = { nil = {
command = lib.getExe nil; command = lib.getExe nil;
}; };
@ -94,17 +44,6 @@
command = "${typescript-language-server}/bin/typescript-language-server"; command = "${typescript-language-server}/bin/typescript-language-server";
args = ["--stdio"]; args = ["--stdio"];
}; };
lua = {
command = lib.getExe lua-language-server;
};
taplo = {
command = lib.getExe taplo;
args = ["lsp" "stdio"];
};
ruff = {
command = lib.getExe ruff;
args = ["server" "--preview"];
};
rust-analyzer.config = { rust-analyzer.config = {
checkOnSave.command = "clippy"; checkOnSave.command = "clippy";
inlayHints = { inlayHints = {

View file

@ -24,14 +24,14 @@
general = { general = {
gaps_in = 10; gaps_in = 10;
gaps_out = 20; gaps_out = 20;
border_size = 0; border_size = 4;
"col.active_border" = "rgb(7dcfff) rgb(c0caf5)"; "col.active_border" = "rgb(7dcfff) rgb(c0caf5)";
"col.inactive_border" = "rgb(24283b)"; "col.inactive_border" = "rgb(24283b)";
layout = "dwindle"; layout = "dwindle";
}; };
decoration = { decoration = {
rounding = 10; rounding = 12;
blur = { blur = {
enabled = true; enabled = true;
size = 6; size = 6;

View file

@ -1,6 +1,6 @@
_: { _: {
virtualisation.oci-containers.containers.wallos = { virtualisation.oci-containers.containers.wallos = {
image = "bellamy/wallos@sha256:16877ace60e407ca11a5db818de6c67e6ba2fd624c68255ed500f8e9af965f93"; #v 2.0.0 image = "bellamy/wallos@sha256:142d7f1202cc0d80a02e9ae48c1a53de7cf5f448758d853a1fe8f5af732459fd"; #v 1.27.1
ports = ["8282:80"]; ports = ["8282:80"];
volumes = [ volumes = [
"/home/notoh/docker/wallos/db:/var/www/html/db" "/home/notoh/docker/wallos/db:/var/www/html/db"

View file

@ -7,17 +7,17 @@
(final: prev: { (final: prev: {
spotify-player = prev.spotify-player.overrideAttrs (old: rec { spotify-player = prev.spotify-player.overrideAttrs (old: rec {
pname = "spotify-player"; pname = "spotify-player";
version = "0.18.2"; version = "0.18.1";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "aome510"; owner = "aome510";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-bLUPQgqSsE9tF5YiFj5B+Ylyy96DhWFNjwqXbQ9H8uc="; hash = "sha256-3nPESnBWaxWjWMvRG7gbXt8FzuPlx2soOonCKom+tzA=";
}; };
cargoDeps = old.cargoDeps.overrideAttrs (lib.const { cargoDeps = old.cargoDeps.overrideAttrs (lib.const {
name = "spotify-player.tar.gz"; name = "spotify-player.tar.gz";
inherit src; inherit src;
outputHash = "sha256-sBhQuU0HpyXOEUtKPZxoNxSp1d5nxuifcYCW7cCOgJI="; outputHash = "sha256-fzFWSPRPWYSiBzbW7OWODahckuzFahdt09V5WKC3Pmo=";
}); });
}); });
}) })

View file

@ -1,25 +0,0 @@
{
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage {
pname = "simple-completion-language-server";
version = "0.1.0";
src = fetchFromGitHub {
owner = "estin";
repo = "simple-completion-language-server";
rev = "3edd6209fffd204d689fb3b0afb0e51ad90f0af2";
hash = "sha256-iccwhZhwYLxjhCLj8kRLqlL1F9TjZ57BogqlbKgCsKM=";
};
cargoHash = "sha256-nxLnlBfqcA64npPccuE00JxCLGi4eU9nWyU0PSVdKpE=";
doCheck = false;
meta = {
description = "Language server to enable word completion and snippets for Helix editor";
homepage = "https://github.com/estin/simple-completion-language-server";
mainProgram = "simple-completion-language-server";
};
}