update system

modules/home-manager/packages/default.nix

@@ -24,6 +24,7 @@
     vesktop
     discord
     element-desktop
+    thunderbird
     # cinny-desktop
 
     # office
@@ -44,8 +45,8 @@
     # development
     insomnia
     avalonia-ilspy
-    ghidra
-    ida-free
+    # ghidra
+    # ida-free
 
     # utils
     libqalculate

modules/home-manager/programs/nixvim/default.nix

@@ -78,7 +78,7 @@
 
   plugins = {
     leap.enable = true;
-    surround.enable = true;
+    vim-surround.enable = true;
     which-key.enable = true;
     schemastore.enable = true;
     # TODO: looks weird with neovide

modules/home-manager/programs/nixvim/presets/auto-format.nix

@@ -75,7 +75,7 @@ in
           end
         '';
 
-      lualine.sections.lualine_x = lib.mkOrder 600 [
+      lualine.settings.sections.lualine_x = lib.mkOrder 600 [
         "(vim.g.${cfg.varName} or vim.b.${cfg.varName}) and '󱌓' or nil"
       ];
     };

modules/home-manager/programs/nixvim/presets/auto-save.nix

@@ -101,7 +101,7 @@ in
         "function() PerformAutoSave() end";
       */
 
-      lualine.sections.lualine_x = lib.mkOrder 700 [
+      lualine.settings.sections.lualine_x = lib.mkOrder 700 [
         # lua
         "(vim.g.disable_autosave or vim.b.disable_autosave) and '󱙃' or nil"
       ];

modules/home-manager/programs/nixvim/presets/base/find.nix

@@ -9,6 +9,7 @@ in
 
   config = lib.mkIf cfg.enable {
     plugins = {
+      web-devicons.enable = true;
       telescope = {
         enable = true;
         keymaps = {

modules/home-manager/programs/nixvim/presets/base/status-line.nix

@@ -28,36 +28,40 @@ in
       ];
       lualine = {
         enable = true;
-        globalstatus = true;
-        sectionSeparators = {
-          left = ""; # "";
-          right = ""; # "";
-        };
-        componentSeparators = {
-          left = "┊";
-          right = "┊";
-        };
-        sections = {
-          lualine_a = [
-            {
-              name = "mode";
-              separator = {
-                right = ""; # "";
-                left = ""; # "";
-              };
-              icon = "";
-            }
-          ];
-          lualine_x = lib.mkAfter [ { name = "filetype"; } ];
-          lualine_z = [
-            {
-              name = "location";
-              separator = {
-                right = ""; # "";
-                left = ""; # "";
-              };
-            }
-          ];
+        settings = {
+          options = {
+            globalstatus = true;
+            section_separators = {
+              left = ""; # "";
+              right = ""; # "";
+            };
+            component_separators = {
+              left = "┊";
+              right = "┊";
+            };
+          };
+          sections = {
+            lualine_a = [
+              {
+                __unkeyed-1 = "mode";
+                separator = {
+                  right = ""; # "";
+                  left = ""; # "";
+                };
+                icon = "";
+              }
+            ];
+            lualine_x = lib.mkAfter [ { __unkeyed-1 = "filetype"; } ];
+            lualine_z = [
+              {
+                __unkeyed-1 = "location";
+                separator = {
+                  right = ""; # "";
+                  left = ""; # "";
+                };
+              }
+            ];
+          };
         };
       };
     };

modules/home-manager/programs/nixvim/presets/base/tree.nix

@@ -19,6 +19,7 @@ in
       }
     ];
     plugins = {
+      web-devicons.enable = true;
       neo-tree = {
         enable = true;
         filesystem = {

modules/home-manager/programs/nixvim/presets/default.nix

@@ -1,42 +1,39 @@
 { lib, ... }:
 {
   options.programs.nixvim = lib.mkOption {
-    type = lib.types.submodule (
-      { config, ... }:
-      {
-        imports = [
-          ./auto-save.nix
-          ./auto-format.nix
-          ./harpoon.nix
-          ./mergetool.nix
-          ./lazygit.nix
-          ./trouble.nix
-          ./undotree.nix
+    type = lib.types.submoduleWith {
+      modules = [
+        ./auto-save.nix
+        ./auto-format.nix
+        ./harpoon.nix
+        ./mergetool.nix
+        ./lazygit.nix
+        ./trouble.nix
+        ./undotree.nix
 
-          ./base/completion.nix
-          ./base/diagnostics.nix
-          ./base/find.nix
-          ./base/formatting.nix
-          ./base/status-line.nix
-          ./base/syntax.nix
-          ./base/tree.nix
+        ./base/completion.nix
+        ./base/diagnostics.nix
+        ./base/find.nix
+        ./base/formatting.nix
+        ./base/status-line.nix
+        ./base/syntax.nix
+        ./base/tree.nix
 
-          ./languages/angular.nix
-          ./languages/c.nix
-          ./languages/css.nix
-          ./languages/dart.nix
-          ./languages/js.nix
-          ./languages/lua.nix
-          ./languages/nix.nix
-          ./languages/python.nix
-          ./languages/rust.nix
-          ./languages/shell.nix
+        ./languages/angular.nix
+        ./languages/c.nix
+        ./languages/css.nix
+        ./languages/dart.nix
+        ./languages/js.nix
+        ./languages/lua.nix
+        ./languages/nix.nix
+        ./languages/python.nix
+        ./languages/rust.nix
+        ./languages/shell.nix
 
-          ./remaps/half-page-scroll.nix
-          ./remaps/no-accidental-macro.nix
-          ./remaps/paste-keep-buffer.nix
-        ];
-      }
-    );
+        ./remaps/half-page-scroll.nix
+        ./remaps/no-accidental-macro.nix
+        ./remaps/paste-keep-buffer.nix
+      ];
+    };
   };
 }

modules/home-manager/programs/nixvim/presets/languages/js.nix

@@ -42,7 +42,7 @@ in
         }
       ];
       lsp.servers = {
-        tsserver.enable = true;
+        ts-ls.enable = true;
         eslint.enable = lib.mkIf cfg.eslint true;
       };
     };

modules/home-manager/programs/nixvim/presets/trouble.nix

@@ -41,6 +41,7 @@ in
       }
     ];
     plugins = {
+      web-devicons.enable = true;
       trouble = {
         enable = true;
         settings.use_diagnostic_signs = true;

modules/home-manager/theme/md3-evo.nix

@@ -262,7 +262,7 @@ in
           nested = true;
         }
       ];
-      plugins.lualine.theme.__raw = # lua
+      plugins.lualine.settings.options.theme.__raw = # lua
         "function() return vim.g.lualine_theme end";
     };