update nix

stehessel · May 9, 2024 · 27be7b4 · 27be7b4
1 parent e2662ae
commit 27be7b4
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 51 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/editor/neovim/config/lua/lsp/r_ls.lua b/pkgs/editor/neovim/config/lua/lsp/r_ls.lua
@@ -0,0 +1,9 @@
+return {
+  setup = function(on_attach, capabilities, flags)
+    require("lspconfig").r_language_server.setup({
+      on_attach = on_attach,
+      capabilities = capabilities,
+      flags = flags,
+    })
+  end,
+}
diff --git a/pkgs/editor/neovim/config/lua/plugins/lsp.lua b/pkgs/editor/neovim/config/lua/plugins/lsp.lua
@@ -57,6 +57,7 @@ return {
         "marksman",
         "nixd",
         "pyright",
+        "r_ls",
         -- "sqls",
         "tailwindcss",
         "taplo",

diff --git a/pkgs/utility/broot/default.nix b/pkgs/utility/broot/default.nix
@@ -1,5 +1,5 @@
 _: {
   programs.broot = {
-    enable = true;
+    enable = false;
   };
 }
diff --git a/systems/darwin/default.nix b/systems/darwin/default.nix
@@ -82,18 +82,22 @@
       "nrlquaker/createzap"
     ];
     brews = [
+      "apache-arrow"
       "coreutils"
       "fribidi"
       "gcc"
+      "gdal"
       "go-task"
       "harfbuzz"
       "libgit2"
       "libtiff"
       "llvm"
+      "pkg-config"
       "prometheus"
       "r"
       "skhd"
       "yabai"
+      "z3"
     ];
     casks = [
       "adobe-acrobat-reader"
@@ -202,7 +206,7 @@
         Hour = 12;
       };
     };
-    package = pkgs.nixVersions.unstable;
+    package = pkgs.nixVersions.latest;
     settings = {
       auto-optimise-store = true;
       substituters = [

diff --git a/systems/nixos/nix/default.nix b/systems/nixos/nix/default.nix
@@ -13,7 +13,7 @@
       automatic = true;
       dates = "weekly";
     };
-    package = pkgs.nixVersions.unstable;
+    package = pkgs.nixVersions.latest;
     settings = {
       auto-optimise-store = true;
       substituters = [