1776604546

modules/home/desktop/dms/mimeapps.nix

@@ -9,7 +9,6 @@
     celluloid # mpv gui in libadwaita
     file-roller # archive manager
     gnome-text-editor
-    helvum # pipewire patchbay in rust
     # junction # app chooser
     loupe # image viewer and editor in rust
     nautilus # file manager

modules/home/desktop/dms/packages.nix

@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     # gui libadwaita utilities
-    helvum # pipewire patchbay in rust
+    # helvum # pipewire patchbay in rust
     pwvucontrol # pipewire gui in rust
     wdisplays # wlroots display configurator
     wl-clipboard

modules/homePrograms/helix.nix

@@ -9,14 +9,6 @@ in {
   programs.helix.enable = true;
   programs.helix = {
     # defaultEditor = true;
-    package = pkgs.helix.overrideAttrs (previousAttrs: {
-      patches =
-        (previousAttrs.patches or [])
-        ++ [
-          ./loader.patch
-          ./term.patch
-        ];
-    });
 
     settings = {
       editor = {
@@ -120,7 +112,7 @@ in {
           name = "typst";
           auto-format = true;
           formatter.command = getExe pkgs.typstyle;
-          formatter.args = ["-l" "100"];
+          formatter.args = ["-l" "120"];
           language-servers = ["tinymist"];
         }
         {

modules/homePrograms/loader.patch

@@ -1,10 +0,0 @@
---- a/helix-loader/src/config.rs
-+++ b/helix-loader/src/config.rs
-@@ -11,7 +11,6 @@ pub fn default_lang_config() -> toml::Value {
- pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
-     let config = [
-         crate::config_dir(),
--        crate::find_workspace().0.join(".helix"),
-     ]
-     .into_iter()
-     .map(|path| path.join("languages.toml"))

modules/homePrograms/term.patch

@@ -1,17 +0,0 @@
---- a/helix-term/src/config.rs
-+++ b/helix-term/src/config.rs
-@@ -58,12 +58,11 @@ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- impl Config {
-     pub fn load(
-         global: Result<String, ConfigLoadError>,
--        local: Result<String, ConfigLoadError>,
-+        _local: Result<String, ConfigLoadError>,
-     ) -> Result<Config, ConfigLoadError> {
-         let global_config: Result<ConfigRaw, ConfigLoadError> =
-             global.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig));
--        let local_config: Result<ConfigRaw, ConfigLoadError> =
--            local.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig));
-+        let local_config: Result<ConfigRaw, ConfigLoadError> = Err(ConfigLoadError::default());
-         let res = match (global_config, local_config) {
-             (Ok(global), Ok(local)) => {
-                 let mut keys = keymap::default();

modules/homePrograms/zed-editor.nix

@@ -47,12 +47,12 @@ in {
         "Typst" = {
           language_servers = ["tinymist"];
           format_on_save = "on";
-          # formatter = {
-          #   external = {
-          #     command = getExe pkgs.typstyle;
-          #     arguments = ["-i" "{buffer_path}"];
-          #   };
-          # };
+          formatter = {
+            external = {
+              command = getExe pkgs.typstyle;
+              arguments = ["-l" "120"];
+            };
+          };
         };
         "Python" = {
           format_on_save = "on";
@@ -63,7 +63,7 @@ in {
               };
             }
           ];
-          language_servers = ["ruff"];
+          language_servers = ["ruff" "pylsp"];
         };
       };
       lsp = {
@@ -100,9 +100,15 @@ in {
         #     path = getExe pkgs.rust-analyzer;
         #   };
         # };
+        pylsp = {
+          binary = {
+            # arguments = ["server"];
+            path = getExe pkgs.python313Packages.python-lsp-server;
+          };
+        };
         ruff = {
           binary = {
-            arguments = [];
+            arguments = ["server"];
             path = getExe pkgs.ruff;
           };
         };
@@ -133,6 +139,7 @@ in {
         };
         yaml-language-server = {
           binary = {
+            arguments = ["--stdio"];
             path = getExe pkgs.yaml-language-server;
           };
         };

modules/users/user/flatpak.nix

@@ -51,7 +51,7 @@
       ++ [
         # media
         # "ca.edestcroix.Recordbox" # music player
-        "com.github.neithern.g4music" # music player
+        # "com.github.neithern.g4music" # music player
         # "io.bassi.Amberol" # music player
         "app.grayjay.Grayjay" # youtube client
         # "org.atheme.audacious" # music player
@@ -79,8 +79,8 @@
         # "io.github.amit9838.mousam" # weather
         "io.github.finefindus.Hieroglyphic" # find latex symbols (in rust)
         # "io.github.lainsce.Khronos" # log time for tasks
-        "io.gitlab.news_flash.NewsFlash" # rss reader
-        "md.obsidian.Obsidian"
+        # "io.gitlab.news_flash.NewsFlash" # rss reader
+        # "md.obsidian.Obsidian"
         "io.anytype.anytype"
         "me.iepure.devtoolbox" # some cool utils
         "org.nicotine_plus.Nicotine" # soulseek
@@ -115,7 +115,7 @@
           ELECTRON_OZONE_PLATFORM_HINT = "wayland";
         };
       };
-      "app.grayjay.Grayjay".Context.sockets = ["x11" "!wayland" "!fallback-x11"]; # because CEF
+      "app.grayjay.Grayjay".Context.sockets = ["x11" "wayland" "!fallback-x11"]; # because CEF
       "ca.edestcroix.Recordbox".Context.filesystems = ["xdg-music"];
       "md.obsidian.Obsidian".Context.filesystems = ["~/Obsidian" "~/.ssh"]; # .ssh for git plugin
       "com.valvesoftware.Steam" = {

modules/users/user/programs.nix

@@ -220,7 +220,8 @@ in {
       # gui libadwaita apps
       celluloid # mpv gui in libadwaita
       # gnome-text-editor
-      helvum # pipewire patchbay in rust
+      # helvum # pipewire patchbay in rust
+      crosspipe # replacing helvum
       # junction # app chooser
       # mission-center # task manager in rust (partly)
       # (mkIf bluetooth.enable overskride) # bluetooth gui in rust