diff --git a/modules/nixvim/autocommands/default.nix b/modules/nixvim/autocommands/default.nix
index 0ee13c7..adcd078 100644
--- a/modules/nixvim/autocommands/default.nix
+++ b/modules/nixvim/autocommands/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./yank_highlight.nix
-    #./remember_cursor_position.nix
     ./set_conceal_level.nix
     ./filetype_options.nix
   ];
diff --git a/modules/nixvim/autocommands/remember_cursor_position.nix b/modules/nixvim/autocommands/remember_cursor_position.nix
deleted file mode 100644
index 2ed48ae..0000000
--- a/modules/nixvim/autocommands/remember_cursor_position.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-let
-  group = "RememberCursorPosition";
-in {
-  autoGroups = {
-    ${group} = {
-      clear = true;
-    };
-  };
-  autoCmd = [
-    {
-      inherit group;
-      event = "BufRead";
-      callback = {
-        __raw = ''
-          function(opts)
-            buffer = opts.buf,
-            vim.api.nvim_create_autocmd("BufWinEnter", {
-              callback = function()
-                local ft = vim.bo[opts.buf].filetype
-                local last_known_line = vim.api.nvim_buf_get_mark(opts.buf, '"')[1]
-                if
-                  not (ft:match("commit") and ft:match("rebase"))
-                  and last_known_line > 1
-                  and last_known_line <= vim.api.nvim_buf_line_count(opts.buf)
-                then
-                  vim.api.nvim_feedkeys([[g`"]], "nx", false)
-                end
-              end,
-            })
-          end
-        '';
-      };
-    }
-  ];
-}
diff --git a/modules/nixvim/options.nix b/modules/nixvim/options.nix
index c42bb01..64dce57 100644
--- a/modules/nixvim/options.nix
+++ b/modules/nixvim/options.nix
@@ -78,6 +78,7 @@ in {
       alejandra
       vscode-extensions.ms-vscode.cpptools
       nixpkgs-fmt
+      asm-lsp
     ];
     extraPlugins = with pkgs.vimPlugins; [
       {
@@ -188,6 +189,9 @@ in {
       dap.listeners.before.event_exited.dapui_config = function()
           dapui.close()
       end
+
+
+      require('lspconfig').asm_lsp.setup({})
     '';
   };
 }
diff --git a/modules/nixvim/plugins/lsp/cmp.nix b/modules/nixvim/plugins/cmp.nix
similarity index 99%
rename from modules/nixvim/plugins/lsp/cmp.nix
rename to modules/nixvim/plugins/cmp.nix
index 74bf031..bf55a08 100644
--- a/modules/nixvim/plugins/lsp/cmp.nix
+++ b/modules/nixvim/plugins/cmp.nix
@@ -10,7 +10,7 @@
         store_selection_keys = "<Tab>";
       };
       fromLua = [
-        { paths = ../../snippets; }
+        { paths = ../snippets; }
       ];
     };
     lspkind = {
diff --git a/modules/nixvim/plugins/codeium.nix b/modules/nixvim/plugins/codeium.nix
index 2e5c508..e383751 100644
--- a/modules/nixvim/plugins/codeium.nix
+++ b/modules/nixvim/plugins/codeium.nix
@@ -6,7 +6,5 @@
   cfg = config.programs.nixvim.ai;
 in
   lib.mkIf cfg.enable {
-    plugins.codeium-nvim = {
-      enable = true;
-    };
+    plugins.codeium-nvim.enable = true;
   }
diff --git a/modules/nixvim/plugins/default.nix b/modules/nixvim/plugins/default.nix
index fb88bdc..0468fc3 100644
--- a/modules/nixvim/plugins/default.nix
+++ b/modules/nixvim/plugins/default.nix
@@ -1,29 +1,34 @@
 {pkgs, ...}: {
   imports = [
-    ./gitsigns.nix
+    ./cmp.nix
+    ./codeium.nix
+    ./dap.nix
     ./harpoon.nix
     ./indent-blankline.nix
+    ./lsp
     ./lualine.nix
+    ./mini.nix
     ./neo-tree.nix
+    ./neorg.nix
     ./noice.nix
     ./none-ls.nix
     ./rainbow-delimiters.nix
     ./telescope.nix
     ./treesitter.nix
     ./trouble.nix
-    ./vim-tmux-navigator.nix
-    ./which-key.nix
-    ./mini.nix
-    ./todo-comments.nix
-    ./neorg.nix
-    ./fugitive.nix
-    ./dap.nix
-    ./lastplace.nix
-    ./codeium.nix
     ./undotree.nix
-    ./transparent.nix
-    ./lsp
   ];
+
+  plugins = {
+    fugitive.enable = true;
+    gitsigns.enable = true;
+    lastplace.enable = true;
+    tmux-navigator.enable = true;
+    todo-comments.enable = true;
+    transparent.enable = true;
+    which-key.enable = true;
+  };
+
   extraPlugins = with pkgs.vimPlugins;
     [
       vim-nftables
diff --git a/modules/nixvim/plugins/fugitive.nix b/modules/nixvim/plugins/fugitive.nix
deleted file mode 100644
index 8fc29d2..0000000
--- a/modules/nixvim/plugins/fugitive.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  plugins.fugitive.enable = true;
-}
diff --git a/modules/nixvim/plugins/gitsigns.nix b/modules/nixvim/plugins/gitsigns.nix
deleted file mode 100644
index af0b517..0000000
--- a/modules/nixvim/plugins/gitsigns.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  plugins.gitsigns.enable = true;
-}
diff --git a/modules/nixvim/plugins/lastplace.nix b/modules/nixvim/plugins/lastplace.nix
deleted file mode 100644
index 81cf582..0000000
--- a/modules/nixvim/plugins/lastplace.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  plugins.lastplace.enable = true;
-}
diff --git a/modules/nixvim/plugins/lsp/default.nix b/modules/nixvim/plugins/lsp/default.nix
index 1079197..8f2a857 100644
--- a/modules/nixvim/plugins/lsp/default.nix
+++ b/modules/nixvim/plugins/lsp/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./languages
-    ./cmp.nix
     ./lsp.nix
   ];
 }
diff --git a/modules/nixvim/plugins/lsp/languages/c.nix b/modules/nixvim/plugins/lsp/languages/c.nix
deleted file mode 100644
index d6cbec0..0000000
--- a/modules/nixvim/plugins/lsp/languages/c.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  plugins.lsp.servers.clangd = {
-    enable = true;
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/default.nix b/modules/nixvim/plugins/lsp/languages/default.nix
index 4995064..5cf3973 100644
--- a/modules/nixvim/plugins/lsp/languages/default.nix
+++ b/modules/nixvim/plugins/lsp/languages/default.nix
@@ -1,21 +1,26 @@
 {
   imports = [
-    ./rust.nix
-    ./lua.nix
-    ./nix.nix
-    ./go.nix
-    ./htmx.nix
-    ./typescript.nix
     ./emmet.nix
-    ./eslint.nix
+    ./go.nix
     ./html.nix
-    ./json.nix
-    ./python.nix
-    ./tailwindcss.nix
-    ./yaml.nix
-    ./c.nix
-    ./templ.nix
-    ./sql.nix
-    ./php.nix
+    ./nix.nix
+    ./rust.nix
   ];
+
+  plugins.lsp.servers = {
+    clangd.enable = true;
+    cmake.enable = true;
+    eslint.enable = true;
+    htmx.enable = true;
+    jsonls.enable = true;
+    lua-ls.enable = true;
+    phpactor.enable = true;
+    ruff-lsp.enable = true;
+    pyright.enable = true;
+    sqls.enable = true;
+    tailwindcss.enable = true;
+    templ.enable = true;
+    tsserver.enable = true;
+    yamlls.enable = true;
+  };
 }
diff --git a/modules/nixvim/plugins/lsp/languages/eslint.nix b/modules/nixvim/plugins/lsp/languages/eslint.nix
deleted file mode 100644
index 101b366..0000000
--- a/modules/nixvim/plugins/lsp/languages/eslint.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      eslint = {
-        enable = true;
-      };
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/htmx.nix b/modules/nixvim/plugins/lsp/languages/htmx.nix
deleted file mode 100644
index 721ddf5..0000000
--- a/modules/nixvim/plugins/lsp/languages/htmx.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      htmx.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/json.nix b/modules/nixvim/plugins/lsp/languages/json.nix
deleted file mode 100644
index 4ad7539..0000000
--- a/modules/nixvim/plugins/lsp/languages/json.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      jsonls.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/lua.nix b/modules/nixvim/plugins/lsp/languages/lua.nix
deleted file mode 100644
index 2fe6b90..0000000
--- a/modules/nixvim/plugins/lsp/languages/lua.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      lua-ls.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/php.nix b/modules/nixvim/plugins/lsp/languages/php.nix
deleted file mode 100644
index 76895dd..0000000
--- a/modules/nixvim/plugins/lsp/languages/php.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      #phpactor.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/python.nix b/modules/nixvim/plugins/lsp/languages/python.nix
deleted file mode 100644
index dfca5ca..0000000
--- a/modules/nixvim/plugins/lsp/languages/python.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      ruff-lsp.enable = true;
-      pyright.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/sql.nix b/modules/nixvim/plugins/lsp/languages/sql.nix
deleted file mode 100644
index 19b387c..0000000
--- a/modules/nixvim/plugins/lsp/languages/sql.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  plugins.lsp.servers.sqls = {
-    enable = true;
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/tailwindcss.nix b/modules/nixvim/plugins/lsp/languages/tailwindcss.nix
deleted file mode 100644
index 68ff329..0000000
--- a/modules/nixvim/plugins/lsp/languages/tailwindcss.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      tailwindcss.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/templ.nix b/modules/nixvim/plugins/lsp/languages/templ.nix
deleted file mode 100644
index ba5db88..0000000
--- a/modules/nixvim/plugins/lsp/languages/templ.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      templ.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/typescript.nix b/modules/nixvim/plugins/lsp/languages/typescript.nix
deleted file mode 100644
index db04c50..0000000
--- a/modules/nixvim/plugins/lsp/languages/typescript.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  plugins.lsp = {
-    servers = {
-      tsserver.enable = true;
-    };
-  };
-}
diff --git a/modules/nixvim/plugins/lsp/languages/yaml.nix b/modules/nixvim/plugins/lsp/languages/yaml.nix
deleted file mode 100644
index b5c1cf2..0000000
--- a/modules/nixvim/plugins/lsp/languages/yaml.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  plugins.lsp.servers = {
-    yamlls.enable = true;
-  };
-}
diff --git a/modules/nixvim/plugins/none-ls.nix b/modules/nixvim/plugins/none-ls.nix
index bc80b71..a4af433 100644
--- a/modules/nixvim/plugins/none-ls.nix
+++ b/modules/nixvim/plugins/none-ls.nix
@@ -13,6 +13,7 @@
       formatting = {
         phpcbf.enable = true;
         goimports.enable = true;
+        asmfmt.enable = true;
       };
     };
   };
diff --git a/modules/nixvim/plugins/todo-comments.nix b/modules/nixvim/plugins/todo-comments.nix
deleted file mode 100644
index 9e2893e..0000000
--- a/modules/nixvim/plugins/todo-comments.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  plugins.todo-comments.enable = true;
-  }
diff --git a/modules/nixvim/plugins/vim-tmux-navigator.nix b/modules/nixvim/plugins/vim-tmux-navigator.nix
deleted file mode 100644
index 6ad953c..0000000
--- a/modules/nixvim/plugins/vim-tmux-navigator.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    plugins.tmux-navigator.enable = true;
-    }
diff --git a/modules/nixvim/plugins/which-key.nix b/modules/nixvim/plugins/which-key.nix
deleted file mode 100644
index f34240b..0000000
--- a/modules/nixvim/plugins/which-key.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    plugins.which-key.enable = true;
-    }
diff --git a/modules/nixvim/snippets/go.lua b/modules/nixvim/snippets/go.lua
index 001bc64..949c228 100644
--- a/modules/nixvim/snippets/go.lua
+++ b/modules/nixvim/snippets/go.lua
@@ -1,8 +1,7 @@
 local ls = require("luasnip")
 
-    -- for "all" filetypes create snippet for "func"
-    ls.add_snippets( "all", {
-      ls.parser.parse_snippet(
-        'iferr',
-        'if err != nil {\n\t${1}\n}'),
-    })
+ls.add_snippets( "go", {
+  ls.parser.parse_snippet(
+    'iferr',
+    'if err != nil {\n\t${1}\n}'),
+})