tsuki: remove vscode

home/profiles/tsuki/default.nix

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

home/programs/editors/helix/default.nix

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

home/programs/editors/helix/languages.nix

@@ -3,11 +3,13 @@
   lib,
   ...
 }: {
+  home.packages = [(pkgs.callPackage ../../../../pkgs/scls {})];
   programs.helix.languages = {
     language = with pkgs; [
       {
         name = "nix";
         auto-format = true;
+        language-servers = ["scls" "nil"];
         formatter = {
           command = lib.getExe alejandra;
           args = ["-q"];
@@ -16,9 +18,7 @@
       {
         name = "rust";
         auto-format = true;
-        language-servers = [
+        language-servers = ["scls" "rust-analyzer"];
-          "rust-analyzer"
-        ];
         formatter = {
           command = lib.getExe rustfmt;
           args = ["--edition" "2021"];
@@ -27,12 +27,62 @@
       {
         name = "lua";
         auto-format = true;
+        language-servers = ["scls" "lua-language-server"];
         formatter = {
           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; {
+      scls = {
+        command = "simple-completion-language-server";
+        config = {
+          feature_snippets = true;
+          feature_paths = true;
+        };
+      };
       nil = {
         command = lib.getExe nil;
       };
@@ -44,6 +94,17 @@
         command = "${typescript-language-server}/bin/typescript-language-server";
         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 = {
         checkOnSave.command = "clippy";
         inlayHints = {

home/wayland/hyprland/config/general.nix

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

hosts/yuki/services/wallos.nix

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

pkgs/overlays.nix

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

pkgs/scls/default.nix

@@ -0,0 +1,25 @@
+{
+  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";
+  };
+}