updated rust-overlay

removed ansiblels
renamed var
2026-06-25 02:07:29 -05:00 · 2025-12-24 13:15:02 -06:00 · 2025-11-24 14:17:43 -06:00 · 2025-08-07 14:28:35 -05:00 · 2025-08-07 11:42:24 -05:00 · 2025-07-05 11:51:32 -05:00
7 changed files with 139 additions and 65 deletions
@@ -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";
@@ -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;
    };
  };

@@ -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";
@@ -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;
@@ -240,27 +240,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1738797219,
-        "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1da52dd49a127ad74486b135898da2cef8c62665",
-        "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",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
        "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,
-        "narHash": "sha256-rlGK8wxz/e50Z+PQRzuP+m03IrGkhcPGmgkBnkEZ9C8=",
+        "lastModified": 1766544144,
+        "narHash": "sha256-5ppfEyZqX6FMluZHty7Dvw4xN10vLq1yQosp7dGG/28=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "e01f2c035b7b8a428c119b183f4cbc55f2eef07c",
+        "rev": "5359a4fdc3fa9baa2edcf49758d404dfeeca7743",
        "type": "github"
      },
      "original": {
@@ -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;
-          config.allowUnfree = true;
-        };
+
+        fullNvim = nixvim'.makeNixvimWithModule fullNixvimModule;
        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;
-          # Lets you run `nix run .#javascript` to start nixvim with IaC configuration
+          javascript = javascriptNvim; # This should be javascriptNvim not javascriptNixvimModule
          iac = iacNvim;
        };
      };
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+asdfa
+
+
+ 
+a
+a
+a
+a
+a
+a
+aa
+aaaa
+
Author	SHA1	Message	Date
kenji	0a6805518a	updated rust-overlay	2025-12-24 13:15:02 -06:00
kenji	0231245a5b	removed ansiblels	2025-11-24 14:17:43 -06:00
lsoriano-mcm	24fdf605ce	renamed var	2025-08-07 14:28:35 -05:00
lsoriano-mcm	b04c92cec6	added baseNvim, and use it as default	2025-08-07 11:42:24 -05:00
lsoriano-mcm	13cd454fb3	added beautysh	2025-07-05 11:51:32 -05:00
lsoriano-mcm	af883ec5eb	ensures installation of TS	2025-07-05 11:25:58 -05:00
lsoriano-mcm	16fa8eb258	FLAKE.NIX UPDATE	2025-07-05 10:31:13 -05:00
lsoriano-mcm	f7d90f69fa	added bash	2025-07-05 09:23:42 -05:00
lsoriano-mcm	41f3594f31	added jetbrains	2025-07-03 21:07:39 -05:00
lsoriano-mcm	111dd85fd8	converted to nixovim	2025-07-03 20:57:44 -05:00
lsoriano-mcm	9358425177	added lazygit	2025-07-03 20:53:10 -05:00
biscuit	be2e51f4dd	nixvim: cooler dashboard	2025-06-04 15:14:24 -05:00
biscuit	3efdfef476	nixvim: added arrows alt	2025-06-04 14:52:49 -05:00
biscuit	7e425761c9	enabled bufferline	2025-06-03 17:43:57 -05:00
biscuit	847d1291ca	upd	2025-06-03 12:52:03 -05:00
biscuit	83fc91530e	test	2025-06-03 12:45:49 -05:00
biscuit	6904a510db	changed dashboard	2025-06-03 11:49:37 -05:00