changes to nvim, added podman to user

config/hosts/aspects/doloro-desktop/home.nix

@@ -35,6 +35,7 @@
       modules.lavd
       modules.ai
       modules.omp
+      modules.podman
       <modules/ai/ollama-cuda>
     ];
     nixos =

config/modules/fish.nix

@@ -18,6 +18,9 @@
               set -g theme_display_user yes
               set -g fish_color_autosuggestion 6F6578
               alias nik 'nix'
+              if not set -q TMUX
+                set -gx COLORTERM truecolor
+              end
             '';
             # alias nos 'sudo echo; sudo nixos-rebuild switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json'
             # alias hms 'home-manager switch --flake .#${aspect-name} --log-format internal-json -v &| nom --json'

config/modules/nixvim/default.nix

@@ -36,7 +36,7 @@
             colorschemes.gruvbox-material.enable = true;
             extraPackages = with pkgs; [
               # formatters
-              nixfmt
+              alejandra
               rustfmt
               # misc
               ripgrep
@@ -60,7 +60,7 @@
                 enable = true;
                 settings = {
                   formatters_by_ft = {
-                    nix = [ "nixfmt" ];
+                    nix = [ "alejandra" ];
                     rust = [ "rustfmt" ];
                     "_" = [
                       "squeeze_blanks"
@@ -187,8 +187,8 @@
                     "<C-e>" = "cmp.mapping.close()";
                     "<C-f>" = "cmp.mapping.scroll_docs(4)";
                     "<CR>" = "cmp.mapping.confirm({ select = true })";
-                    "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
-                    "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+                    "<S-Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() else fallback() end end, {'i', 's'})";
+                    "<Tab>" = "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() else fallback() end end, {'i', 's'})";
                   };
                 };
               };
@@ -208,6 +208,9 @@
                 enable = true;
                 grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
                   bash
+                  css
+                  html
+                  javascript
                   json
                   lua
                   make
@@ -216,6 +219,8 @@
                   nix
                   regex
                   toml
+                  tsx
+                  typescript
                   vim
                   vimdoc
                   xml
@@ -224,6 +229,7 @@
                 ];
                 settings = {
                   highlight.enable = true;
+                  indent.enable = true;
                 };
               };
             };

config/modules/tmux.nix

@@ -11,10 +11,11 @@
             minimal-tmux-status
           ];
           extraConfig = ''
-                  set-option -g default-terminal "xterm-256color"
-            			set -a terminal-features "xterm-256color:RGB"
-                  set -g status-bg black
-                  set -g status-fg white
+                              set-option -g default-terminal "tmux-256color"
+                              set -as terminal-features ",xterm-256color:RGB"
+                              set -g status-bg black
+                              set -g status-fg white
+            									set -g mouse on
           '';
         };
       };