From 4d03d151f6e85799cd061aabab03e4dd0626711c Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 7 Jun 2023 14:59:34 -0400 Subject: [PATCH] reboot test once more --- homeConfig/modules/browsers/default.nix | 1 - homeConfig/modules/gui/config/sway.nix | 1 + .../neovim/config/lazyvim/lua/config/autocmds.lua | 6 ++++++ .../neovim/config/lazyvim/lua/config/options.lua | 5 ----- homeConfig/modules/neovim/config/servers.nix | 10 ++++------ 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/homeConfig/modules/browsers/default.nix b/homeConfig/modules/browsers/default.nix index 62bf74e..325e63a 100644 --- a/homeConfig/modules/browsers/default.nix +++ b/homeConfig/modules/browsers/default.nix @@ -11,7 +11,6 @@ in programs.chromium.enable = true; home.packages = with pkgs; [ - google-chrome (tor-browser-bundle-bin.override { useHardenedMalloc = false; # NixOS bug requires this }) diff --git a/homeConfig/modules/gui/config/sway.nix b/homeConfig/modules/gui/config/sway.nix index 88b73ea..101f99a 100644 --- a/homeConfig/modules/gui/config/sway.nix +++ b/homeConfig/modules/gui/config/sway.nix @@ -14,6 +14,7 @@ in # ]; extraSessionCommands = '' + exec alacritty -e sh -c 'neofetch; exec $SHELL' export _JAVA_AWT_WM_NONREPARENTING=1 ''; diff --git a/homeConfig/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/homeConfig/modules/neovim/config/lazyvim/lua/config/autocmds.lua index 242e75b..85e8ec3 100644 --- a/homeConfig/modules/neovim/config/lazyvim/lua/config/autocmds.lua +++ b/homeConfig/modules/neovim/config/lazyvim/lua/config/autocmds.lua @@ -1,6 +1,12 @@ -- Autocmds are automatically loaded on the VeryLazy event -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here + +vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.softtabstop = 2 +vim.opt.expandtab = true + local lsp = require("lsp-zero").preset({}) lsp.on_attach(function(client, bufnr) diff --git a/homeConfig/modules/neovim/config/lazyvim/lua/config/options.lua b/homeConfig/modules/neovim/config/lazyvim/lua/config/options.lua index 6c78af5..3ea1454 100644 --- a/homeConfig/modules/neovim/config/lazyvim/lua/config/options.lua +++ b/homeConfig/modules/neovim/config/lazyvim/lua/config/options.lua @@ -1,8 +1,3 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here - -vim.opt.tabstop = 2 -vim.opt.shiftwidth = 2 -vim.opt.softtabstop = 2 -vim.opt.expandtab = true diff --git a/homeConfig/modules/neovim/config/servers.nix b/homeConfig/modules/neovim/config/servers.nix index c80402f..3488b60 100644 --- a/homeConfig/modules/neovim/config/servers.nix +++ b/homeConfig/modules/neovim/config/servers.nix @@ -2,13 +2,11 @@ let lsp = with pkgs; [ - nil - nixfmt + nil nixfmt marksman - sumneko-lua-language-server - stylua - haskell-language-server - hlint + sumneko-lua-language-server stylua + haskell-language-server hlint + nodePackages."@tailwindcss/language-server" ]; lsp' = with pkgs.nodePackages; [