updated rust-overlay

config/dashboard.nix

@@ -10,30 +10,37 @@
         {
           type = "text";
           val = [
-            "      █████ █     ██"
+            "███╗   ██╗██╗██╗  ██╗ ██████╗ ██╗   ██╗██╗███╗   ███╗"
-            "   ██████  ██    ████ █                                 █"
+            "████╗  ██║██║╚██╗██╔╝██╔═══██╗██║   ██║██║████╗ ████║"
-            "  ██   █  █ ██    ████                    ██           ███"
+            "██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║   ██║██║██╔████╔██║"
-            " █    █  █  ██    █ █                     ██            █"
+            "██║╚██╗██║██║ ██╔██╗ ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║"
-            "     █  █    ██   █                ████    ██    ███"
+            "██║ ╚████║██║██╔╝ ██╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║"
-            "    ██ ██    ██   █       ███     █ ███  █  ██    ███ ███    ███ ████ ████"
+            "╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝"
-            "    ██ ██     ██  █      █ ███   █   ████   ██     ███ ███    ███ ████ ███  █"
-            "    ██ ██     ██  █     █   ███ ██    ██    ██      ██  ██     ██  ████ ████"
-            "    ██ ██      ██ █    ██    █████    ██    ██      ██  ██     ██   ██   ██"
-            "    ██ ██      ██ █    ████████ ██    ██    ██      ██  ██     ██   ██   ██"
-            "    █  ██       ███    ███████  ██    ██    ██      ██  ██     ██   ██   ██"
-            "       █        ███    ██       ██    ██    ██      █   ██     ██   ██   ██"
-            "   ████          ██    ████    █ ██████      ███████    ██     ██   ██   ██"
-            "  █  █████              ███████   ████        █████     ███ █  ███  ███  ███"
-            " █     ██                █████                           ███    ███  ███  ███"
-            " █"
-            "  █"
-            "   ██"
           ];
           opts = {
             position = "center";
             hl = "Type";
           };
         }
+        {
+          type = "text";
+          val = [" "];
+        }
+        {
+          type = "padding";
+          val = 1;
+        }
+        {
+          type = "text";
+          val = [
+            "╔════════════════════════════╗"
+            "║ ...better than most IDEs!  ║"
+            "╚════════════════════════════╝"
+          ];
+          opts = {
+            position = "center";
+          };
+        }
         {
           type = "padding";
           val = 4;
@@ -65,7 +72,7 @@
             }
             {
               type = "padding";
-              val = 2;
+              val = 1;
             }
             {
               type = "button";
@@ -90,7 +97,7 @@
             }
             {
               type = "padding";
-              val = 2;
+              val = 1;
             }
             {
               type = "button";
@@ -116,7 +123,7 @@
             }
             {
               type = "padding";
-              val = 2;
+              val = 1;
             }
             {
               type = "button";
@@ -142,7 +149,7 @@
             }
             {
               type = "padding";
-              val = 2;
+              val = 1;
             }
             {
               type = "button";

config/iac/language.nix

@@ -6,15 +6,17 @@
         formatters_by_ft = {
           terraform = ["tofu_fmt"];
           tf = ["tofu_fmt"];
+          sh = ["beautysh"];
         };
       };
     };
     lsp.servers = {
-      ansiblels.enable = true;
+      ansiblels.enable = false; # they stopped updating it...
       dockerls.enable = true;
       helm_ls.enable = true;
       nginx_language_server.enable = true;
       terraformls.enable = true;
+      bashls.enable = true;
     };
   };
 

config/keys.nix

@@ -222,6 +222,32 @@
       options.desc = "Accept AugmentCode suggestion";
     }
 
+    ## Arrow keys alt
+    {
+      mode = "i";
+      key = "<C-h>";
+      action = "<Left>";
+      options.desc = "";
+    }
+    {
+      mode = "i";
+      key = "<C-l>";
+      action = "<Right>";
+      options.desc = "";
+    }
+    {
+      mode = "i";
+      key = "<C-j>";
+      action = "<Down>";
+      options.desc = "";
+    }
+    {
+      mode = "i";
+      key = "<C-k>";
+      action = "<Up>";
+      options.desc = "";
+    }
+
     # Normal mode
     {
       mode = "n";

config/sets.nix

@@ -3,7 +3,7 @@
     auto-save.enable = true;
     bufferline = {
       # TODO: remove this once you are used to not having it
-      enable = false;
+      enable = true;
       settings = {
         options = {
           always_show_bufferline = false;
@@ -146,9 +146,20 @@
 
     treesitter = {
       enable = true;
-
       folding = false;
       settings.indent.enable = true;
+      settings = {
+        auto_install = true;
+        ensure_installed = [
+          "git_config"
+          "git_rebase"
+          "gitattributes"
+          "gitcommit"
+          "gitignore"
+          "bash"
+          "python"
+        ];
+      };
     };
 
     vim-surround.enable = true;

flake.lock

@@ -240,27 +240,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738797219,
+        "lastModified": 1744536153,
-        "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1da52dd49a127ad74486b135898da2cef8c62665",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1736320768,
-        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
         "type": "github"
       },
       "original": {
@@ -278,7 +262,9 @@
         "git-hooks": "git-hooks",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
@@ -329,14 +315,14 @@
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1739327257,
+        "lastModified": 1766544144,
-        "narHash": "sha256-rlGK8wxz/e50Z+PQRzuP+m03IrGkhcPGmgkBnkEZ9C8=",
+        "narHash": "sha256-5ppfEyZqX6FMluZHty7Dvw4xN10vLq1yQosp7dGG/28=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e01f2c035b7b8a428c119b183f4cbc55f2eef07c",
+        "rev": "5359a4fdc3fa9baa2edcf49758d404dfeeca7743",
         "type": "github"
       },
       "original": {

flake.nix

@@ -19,17 +19,53 @@
         "x86_64-darwin"
         "aarch64-darwin"
       ];
-      perSystem = {system, ...}: let
+      perSystem = {
+        self,
+        system,
+        ...
+      }: let
+        specialArgs = {
+          inherit inputs self;
+        };
         overlays = [(import rust-overlay)];
         nixvimLib = nixvim.lib.${system};
         nixvim' = nixvim.legacyPackages.${system};
+        pkgs = import inputs.nixpkgs {
+          inherit system overlays;
+          config.allowUnfree = true;
+        };
+        deps = with pkgs; [
+          sops
+          lazygit
+          nerd-fonts.jetbrains-mono
+          rust-bin.stable.latest.default # From rust-overlay
+          ansible-lint
+          beautysh
+        ];
+
+        fullNixvimModule = {
+          inherit pkgs;
+          module = {pkgs, ...}: {
+            imports = [
+              ./config
+              ./config/rust
+              ./config/csharp
+              ./config/golang
+              ./config/python
+              ./config/javascript
+              ./config/iac
+            ];
+            extraPackages = deps;
+          };
+          extraSpecialArgs = specialArgs; # Keep specialArgs for self-reference
+        };
         baseNixvimModule = {
           inherit pkgs;
           module = {pkgs, ...}: {
             imports = [./config];
-            extraPackages = with pkgs; [sops];
+            extraPackages = deps;
           };
-          extraSpecialArgs = {};
+          extraSpecialArgs = specialArgs;
         };
         rustNixvimModule = {
           inherit pkgs;
@@ -100,10 +136,8 @@
           };
           extraSpecialArgs = {};
         };
-        pkgs = import inputs.nixpkgs {
+
-          inherit system overlays;
+        fullNvim = nixvim'.makeNixvimWithModule fullNixvimModule;
-          config.allowUnfree = true;
-        };
         baseNvim = nixvim'.makeNixvimWithModule baseNixvimModule;
         rustNvim = nixvim'.makeNixvimWithModule rustNixvimModule;
         csharpNvim = nixvim'.makeNixvimWithModule csharpNixvimModule;
@@ -113,23 +147,16 @@
         iacNvim = nixvim'.makeNixvimWithModule iacNixvimModule;
       in {
         checks = {
-          # Run `nix flake check .` to verify that your config is not broken
           default = nixvimLib.check.mkTestDerivationFromNixvimModule baseNixvimModule;
         };
         packages = {
-          # Lets you run `nix run .` to start nixvim
           default = baseNvim;
-          # Lets you run `nix run .#rust` to start nixvim with Rust configuration
+          full = fullNvim;
           rust = rustNvim;
-          # Lets you run `nix run .#csharp` to start nixvim with C# configuration
           csharp = csharpNvim;
-          # Lets you run `nix run .#golang` to start nixvim with Go configuration
           golang = goNvim;
-          # Lets you run `nix run .#python` to start nixvim with Python configuration
           python = pythonNvim;
-          # Lets you run `nix run .#javascript` to start nixvim with JS/TS configuration
+          javascript = javascriptNvim; # This should be javascriptNvim not javascriptNixvimModule
-          javascript = javascriptNvim;
-          # Lets you run `nix run .#javascript` to start nixvim with IaC configuration
           iac = iacNvim;
         };
       };

test.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+asdfa
+
+
+ 
+a
+a
+a
+a
+a
+a
+aa
+aaaa
+