diff --git a/.config/nvim/plugin/lsp.lua b/.config/nvim/plugin/lsp.lua index 087193b5..7af2d20f 100644 --- a/.config/nvim/plugin/lsp.lua +++ b/.config/nvim/plugin/lsp.lua @@ -91,12 +91,14 @@ vim.lsp.set_log_level("off") -- It is not recommended to break lspconfig into different settings -- related: https://github.com/neovim/nvim-lspconfig/issues/970#issuecomment-860080502 for name, user_config in pairs(servers) do - local default_config = { - capabilities = mylsp.capabilities, - settings = user_config, - on_attach = function(client, bufno) mylsp.on_attach(client, bufno) end, - } - local merged_config = vim.tbl_deep_extend("force", default_config, user_config or {}) - vim.lsp.config(name, merged_config) + if next(user_config) ~= nil then + local default_config = { + capabilities = mylsp.capabilities, + settings = user_config, + on_attach = function(client, bufno) mylsp.on_attach(client, bufno) end, + } + local merged_config = vim.tbl_deep_extend("force", default_config, user_config) + vim.lsp.config(name, merged_config) + end vim.lsp.enable(name) end diff --git a/nix/configurations/vanadium/nixos/display.nix b/nix/configurations/vanadium/nixos/display.nix index 4b3a5eca..710a61ed 100644 --- a/nix/configurations/vanadium/nixos/display.nix +++ b/nix/configurations/vanadium/nixos/display.nix @@ -83,7 +83,7 @@ brightness, # [0..1] }: singleton "10_ddc_brightness" /* bash */ '' - ${lib.getExe pkgs.ddcutil} --model "${modelName}" setvcp 10 ${ + ${lib.getExe pkgs.ddcutil} --model ${modelName} setvcp 10 ${ toString (builtins.floor (brightness * 100)) } ''; @@ -94,7 +94,7 @@ contrast, # [0..1] }: singleton "10_ddc_contrast" /* bash */ '' - ${lib.getExe pkgs.ddcutil} --model "${modelName}" setvcp 12 ${ + ${lib.getExe pkgs.ddcutil} --model ${modelName} setvcp 12 ${ toString (builtins.floor (contrast * 100)) } ''; diff --git a/nix/configurations/vanadium/nixos/programs.nix b/nix/configurations/vanadium/nixos/programs.nix index 9a0f4318..b3e3ec6d 100644 --- a/nix/configurations/vanadium/nixos/programs.nix +++ b/nix/configurations/vanadium/nixos/programs.nix @@ -81,7 +81,6 @@ services.hoogle = { enable = true; - port = 3001; # leave 8080 for other stuff packages = haskellPackages: with haskellPackages; [ optparse-applicative diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index 169bf13b..3c348095 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -9,13 +9,26 @@ let infuse = lib.flip infuse-lib.v1.infuse; in +# Why shouldn't I go crazy with overlays? final: infuse { + cmus.__input.alsaSupport = _: false; + + fish.__input.usePython = _: false; + + tmux.__input.withSixel = _: false; + # I don't really use helix, but it's nice to have the W alias just in case helix.__output.patches.__append = [ ./patches/helix/W-as-write.patch ]; + # Too loud + alejandra.__output.patches.__append = [ + ./patches/alejandra/no-ads.patch + ]; + alejandra.__output.doCheck = _: false; + # TODO: # pinned branch of https://github.com/astrand/xclip/tree/xerror # use this until #43 gets resolved properly diff --git a/nix/configurations/vanadium/patches/alejandra/no-ads.patch b/nix/configurations/vanadium/patches/alejandra/no-ads.patch new file mode 100644 index 00000000..34978153 --- /dev/null +++ b/nix/configurations/vanadium/patches/alejandra/no-ads.patch @@ -0,0 +1,49 @@ +diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs +index 0ef0496..1791649 100644 +--- a/src/alejandra_cli/src/cli.rs ++++ b/src/alejandra_cli/src/cli.rs +@@ -9,7 +9,7 @@ use futures::future::RemoteHandle; + use futures::stream::FuturesUnordered; + use futures::task::SpawnExt; + +-use crate::ads::random_ad; ++// use crate::ads::random_ad; + use crate::verbosity::Verbosity; + + /// The Uncompromising Nix Code Formatter. +@@ -222,10 +222,10 @@ pub fn main() -> ! { + } + ); + +- if in_place { +- eprintln!(); +- eprint!("{}", random_ad()); +- } ++ // if in_place { ++ // eprintln!(); ++ // eprint!("{}", random_ad()); ++ // } + } + + std::process::exit(if in_place { 0 } else { 2 }); +@@ -236,8 +236,8 @@ pub fn main() -> ! { + eprintln!( + "Congratulations! Your code complies with the Alejandra style." + ); +- eprintln!(); +- eprint!("{}", random_ad()); ++ // eprintln!(); ++ // eprint!("{}", random_ad()); + } + + std::process::exit(0); +diff --git a/src/alejandra_cli/src/lib.rs b/src/alejandra_cli/src/lib.rs +index fd49ce8..157b3eb 100644 +--- a/src/alejandra_cli/src/lib.rs ++++ b/src/alejandra_cli/src/lib.rs +@@ -1,4 +1,4 @@ +-mod ads; ++// mod ads; + pub mod cli; + mod find; + mod verbosity;