From 648ede0839c3dc8020e8cb2476360858b0fee2c8 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 19 Jan 2025 16:35:37 +0100 Subject: [PATCH] feat(nvim): new js formatter --- dotfiles/nvim/lua/configs/conform.lua | 7 +++---- machines/luffy/configuration.nix | 2 +- machines/luffy/hardware-configuration.nix | 7 +++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dotfiles/nvim/lua/configs/conform.lua b/dotfiles/nvim/lua/configs/conform.lua index 2d2eb34..21c8f42 100644 --- a/dotfiles/nvim/lua/configs/conform.lua +++ b/dotfiles/nvim/lua/configs/conform.lua @@ -3,13 +3,12 @@ local options = { lua = { "stylua" }, css = { "prettier" }, html = { "prettier" }, - js = { "prettier" }, - javascript = { "prettier" }, - typescript = { "prettier" }, + js = { "eslint_d" }, + javascript = { "eslint_d" }, + typescript = { "eslint_d" }, php = { "php_cs_fixer" }, python = { "black" }, }, - format_on_save = { timeout_ms = 15000, lsp_fallback = true, diff --git a/machines/luffy/configuration.nix b/machines/luffy/configuration.nix index 3ad6ea0..c74f85b 100644 --- a/machines/luffy/configuration.nix +++ b/machines/luffy/configuration.nix @@ -46,7 +46,7 @@ }; # Set your time zone. - time.timeZone = "Europe/Moscow"; + time.timeZone = "Europe/Paris"; # Select internationalisation properties. i18n.defaultLocale = "fr_FR.UTF-8"; diff --git a/machines/luffy/hardware-configuration.nix b/machines/luffy/hardware-configuration.nix index acd7bf3..2f1d97c 100644 --- a/machines/luffy/hardware-configuration.nix +++ b/machines/luffy/hardware-configuration.nix @@ -96,8 +96,11 @@ # brcmfmac being loaded during hibernation would not let a successful resume # https://bugzilla.kernel.org/show_bug.cgi?id=101681#c116. # Also brcmfmac could randomly crash on resume from sleep. - powerUpCommands = lib.mkBefore "${pkgs.kmod}/bin/modprobe brcmfmac && ${pkgs.kmod}/bin/modprobe brcmfmac_wcc"; - powerDownCommands = lib.mkBefore "${pkgs.kmod}/bin/rmmod brcmfmac_wcc && ${pkgs.kmod}/bin/rmmod brcmfmac"; + powerUpCommands = lib.mkBefore "${pkgs.kmod}/bin/modprobe brcmfmac"; + powerDownCommands = lib.mkBefore '' + ${pkgs.kmod}/bin/rmmod -f -v brcmfmac_wcc 2>/dev/null || true + ${pkgs.kmod}/bin/rmmod brcmfmac + ''; }; # USB subsystem wakes up MBP right after suspend unless we disable it.