fix astronvim

2024-08-08 10:27:12 +02:00
parent 8c8aff3065
commit 98f207adf4
5 changed files with 70 additions and 47 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717527182,
-        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "845a5c4c073f74105022533907703441e0464bc3",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
        "type": "github"
      },
      "original": {
@@ -26,11 +26,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1715993859,
-        "narHash": "sha256-hBPn1xF4Wspf6kJ+SR9FHy9vRUFmtJEZjrTLIWjFib8=",
+        "lastModified": 1722809356,
+        "narHash": "sha256-xyNFsF+5cDjMlfbm7NMG33K+oej0T/Iosm3Nukp3+RU=",
        "owner": "musnix",
        "repo": "musnix",
-        "rev": "3ba4dba298a4720d51db6269f97038601f3fe2c1",
+        "rev": "a2f2e86026043977fdce30ac098a022a71b39392",
        "type": "github"
      },
      "original": {
@@ -41,11 +41,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1715266358,
-        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
+        "lastModified": 1722421184,
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
+        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
        "type": "github"
      },
      "original": {
@@ -57,27 +57,27 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1709428628,
-        "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1718086528,
-        "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
+        "lastModified": 1722869614,
+        "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
+        "rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
        "type": "github"
      },
      "original": {
@@ -104,11 +104,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1709711091,
-        "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=",
+        "lastModified": 1722897572,
+        "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc",
+        "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
        "type": "github"
      },
      "original": {
@@ -119,11 +119,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "lastModified": 1722813957,
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
        "type": "github"
      },
      "original": {
--- a/hosts/MaxNixosLaptop/configuration.nix
+++ b/hosts/MaxNixosLaptop/configuration.nix
@@ -45,7 +45,7 @@
  # $ nix search wget
  environment.systemPackages = with pkgs; [
    bambu-studio
-    neovim
+    unstable.neovim
    wget
    fprintd
    qemu
--- a/modules/home/shell/neovim.nix
+++ b/modules/home/shell/neovim.nix
@@ -13,11 +13,32 @@ in {
  config = lib.mkIf cfg.enable {
    programs.neovim = {
      enable = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withNodeJs = true;
      defaultEditor = true;
      plugins = with pkgs.vimPlugins; [
        lazy-nvim
      ];
+
      extraLuaConfig = ''
+        -- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
+        -- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
+        local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
+        if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
+          -- stylua: ignore
+          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+        end
+        vim.opt.rtp:prepend(lazypath)
+
+        -- validate that lazy is available
+        if not pcall(require, "lazy") then
+          -- stylua: ignore
+          vim.api.nvim_echo({ { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
+          vim.fn.getchar()
+          vim.cmd.quit()
+        end
+
        require "lazy_setup"
      '';
      extraPackages = with pkgs; [
@@ -32,6 +53,10 @@ in {
      ];
    };

-    home.file.".config/nvim/lua".source = ./nvim-lua;
+    # home.file.".config/nvim/lua".source = ./nvim-lua;
+    xdg.configFile."nvim/lua" = {
+      recursive = true;
+      source = ./nvim-lua;
+    };
  };
 }
--- a/modules/home/shell/nvim-lua/community.lua
+++ b/modules/home/shell/nvim-lua/community.lua
@@ -1,24 +1,22 @@
 return {
-  "AstroNvim/astrocommunity",
-  { import = "astrocommunity.pack.bash" },
-  { import = "astrocommunity.pack.cmake" },
-  { import = "astrocommunity.pack.cpp" },
-  { import = "astrocommunity.pack.docker" },
-  { import = "astrocommunity.pack.html-css" },
-  { import = "astrocommunity.pack.json" },
-  { import = "astrocommunity.pack.lua" },
-  { import = "astrocommunity.pack.markdown" },
-  { import = "astrocommunity.pack.nix" },
-  { import = "astrocommunity.pack.python" },
-  { import = "astrocommunity.pack.rust" },
-  { import = "astrocommunity.pack.toml" },
-  { import = "astrocommunity.pack.yaml" },
-  { import = "astrocommunity.git.git-blame-nvim" },
-  { import = "astrocommunity.markdown-and-latex.vimtex" },
-  { import = "astrocommunity.lsp.lsp-inlayhints-nvim" },
-  { import = "astrocommunity.lsp.lsp-lens-nvim" },
-  { import = "astrocommunity.lsp.lsp-signature-nvim" },
-  { import = "astrocommunity.lsp.nvim-lsp-file-operations" },
-  { import = "astrocommunity.bars-and-lines.vim-illuminate" },
+	"AstroNvim/astrocommunity",
+	{ import = "astrocommunity.pack.bash" },
+	{ import = "astrocommunity.pack.cmake" },
+	{ import = "astrocommunity.pack.cpp" },
+	{ import = "astrocommunity.pack.docker" },
+	{ import = "astrocommunity.pack.html-css" },
+	{ import = "astrocommunity.pack.json" },
+	{ import = "astrocommunity.pack.lua" },
+	{ import = "astrocommunity.pack.markdown" },
+	{ import = "astrocommunity.pack.nix" },
+	{ import = "astrocommunity.pack.python" },
+	{ import = "astrocommunity.pack.rust" },
+	{ import = "astrocommunity.pack.toml" },
+	{ import = "astrocommunity.pack.yaml" },
+	{ import = "astrocommunity.git.git-blame-nvim" },
+	{ import = "astrocommunity.markdown-and-latex.vimtex" },
+	{ import = "astrocommunity.lsp.lsp-lens-nvim" },
+	{ import = "astrocommunity.lsp.lsp-signature-nvim" },
+	{ import = "astrocommunity.lsp.nvim-lsp-file-operations" },
+	{ import = "astrocommunity.bars-and-lines.vim-illuminate" },
 }
-
--- a/modules/home/shell/nvim-lua/plugins/user.lua
+++ b/modules/home/shell/nvim-lua/plugins/user.lua
@@ -1,3 +1,4 @@
+---@type LazySpec
 return {
  {
    "p00f/clangd_extensions.nvim",
@@ -26,4 +27,3 @@ return {
    opts = { tools = { inlay_hints = { auto = true } } },
  },
 }
-