haak/dotfiles
1
0
Fork 0
Code Issues Pull requests Wiki Activity Actions

fallout from nix-channel updates

Browse source
This commit is contained in:
Haak Saxberg 2024-06-28 01:56:41 -07:00
parent d263a20db3
commit 9e73352f7a
4 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nix/home/desktop.nix
View file

@ -1,15 +1,6 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
obsidian = lib.throwIf (lib.versionOlder "1.5.16" pkgs.obsidian.version) "Obsidian no longer requires EOL Electron" (
pkgs.obsidian.override {
electron = pkgs.electron_25.overrideAttrs (_: {
preFixup = "patchelf --add-needed ${pkgs.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912
meta.knownVulnerabilities = [ ]; # NixOS/nixpkgs#273611
});
}
);
defaultPkgs = with pkgs; [ defaultPkgs = with pkgs; [
calibre calibre
dmenu dmenu

6
nix/home/programs/helix/default.nix
View file

@ -4,8 +4,8 @@
enable = true; enable = true;
languages = { languages = {
language-server = { language-server = {
rnix-lsp = { nixd = {
command = "${pkgs.rnix-lsp}/bin/rnix-lsp"; command = "${pkgs.nixd}/bin/rnix-lsp";
}; };
typescript-language-server = { typescript-language-server = {
@ -20,7 +20,7 @@
name = "nix"; name = "nix";
auto-format = true; auto-format = true;
language-servers = [ language-servers = [
{ name = "rnix-lsp"; } { name = "nixd"; }
]; ];
} }
{ {

4
nix/home/programs/nvim/default.nix
View file

@ -148,7 +148,7 @@ with builtins;
# since both of these are used for actually configuring the system, # since both of these are used for actually configuring the system,
# we'll probably always want them around. # we'll probably always want them around.
lua_ls = pkgs.sumneko-lua-language-server; lua_ls = pkgs.sumneko-lua-language-server;
rnix_lsp = pkgs.rnix-lsp; nixd = pkgs.nixd;
} }
) } ) }
EOF EOF
@ -192,7 +192,7 @@ with builtins;
plugin = nvim-cmp; plugin = nvim-cmp;
config = '' config = ''
lua << EOF lua << EOF
${ readFile (./nvim-cmp.lua) } ${ readFile ./nvim-cmp.lua }
EOF EOF
''; '';
} }

4
nix/home/programs/nvim/nvim-lspconfig.lua
View file

@ -160,8 +160,8 @@ nvim_lsp.tsserver.setup {
nvim_lsp.elixirls.setup { nvim_lsp.elixirls.setup {
cmd = { "elixir-ls" }, cmd = { "elixir-ls" },
} }
nvim_lsp.rnix.setup { nvim_lsp.nixd.setup {
cmd = { "@rnix_lsp@/bin/rnix-lsp" }, cmd = { "@nixd@/bin/nixd" },
} }
nvim_lsp.rust_analyzer.setup {} nvim_lsp.rust_analyzer.setup {}