fix: merge dolphin with systemPkgs when i3 enabled

This commit is contained in:
2025-01-27 10:23:07 -08:00
parent 9bde8c076a
commit d1926aff7d
3 changed files with 29 additions and 26 deletions

View File

@@ -1,27 +1,27 @@
return { return {
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = {
"williamboman/mason.nvim", "williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
"j-hui/fidget.nvim", "j-hui/fidget.nvim",
}, },
config = function() config = function()
require("mason").setup() require("mason").setup()
require("fidget").setup() require("fidget").setup()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = { ensure_installed = {
"ts_ls", "ts_ls",
"lua_ls", "lua_ls",
"rust_analyzer", "rust_analyzer",
"nil_ls", "nil_ls",
}, },
handlers = { handlers = {
function(server) function(server)
require("lspconfig")[server].setup({}) require("lspconfig")[server].setup({})
end, end,
}, },
}) })
end, end,
}, },
} }

View File

@@ -96,7 +96,6 @@
with pkgs; with pkgs;
config.commonPackages config.commonPackages
++ [ ++ [
dolphin
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

View File

@@ -20,6 +20,10 @@
}; };
services.libinput.touchpad.naturalScrolling = true; services.libinput.touchpad.naturalScrolling = true;
environment.systemPackages = with pkgs; [
dolphin
];
home-manager.users.luca = { home-manager.users.luca = {
programs = { programs = {
alacritty = { alacritty = {