mirror of
https://codeberg.org/leana8959/.files.git
synced 2026-02-04 07:59:40 +00:00
Compare commits
No commits in common. "ff0e26bd1faaccd8e6c2dac8df5cb6e2b01650b9" and "cc4d58aab9ab8107b278fb57233e31f1d35e1127" have entirely different histories.
ff0e26bd1f
...
cc4d58aab9
5 changed files with 73 additions and 10 deletions
|
|
@ -91,12 +91,14 @@ vim.lsp.set_log_level("off")
|
||||||
-- It is not recommended to break lspconfig into different settings
|
-- It is not recommended to break lspconfig into different settings
|
||||||
-- related: https://github.com/neovim/nvim-lspconfig/issues/970#issuecomment-860080502
|
-- related: https://github.com/neovim/nvim-lspconfig/issues/970#issuecomment-860080502
|
||||||
for name, user_config in pairs(servers) do
|
for name, user_config in pairs(servers) do
|
||||||
|
if next(user_config) ~= nil then
|
||||||
local default_config = {
|
local default_config = {
|
||||||
capabilities = mylsp.capabilities,
|
capabilities = mylsp.capabilities,
|
||||||
settings = user_config,
|
settings = user_config,
|
||||||
on_attach = function(client, bufno) mylsp.on_attach(client, bufno) end,
|
on_attach = function(client, bufno) mylsp.on_attach(client, bufno) end,
|
||||||
}
|
}
|
||||||
local merged_config = vim.tbl_deep_extend("force", default_config, user_config or {})
|
local merged_config = vim.tbl_deep_extend("force", default_config, user_config)
|
||||||
vim.lsp.config(name, merged_config)
|
vim.lsp.config(name, merged_config)
|
||||||
|
end
|
||||||
vim.lsp.enable(name)
|
vim.lsp.enable(name)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@
|
||||||
brightness, # [0..1]
|
brightness, # [0..1]
|
||||||
}:
|
}:
|
||||||
singleton "10_ddc_brightness" /* bash */ ''
|
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))
|
toString (builtins.floor (brightness * 100))
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
@ -94,7 +94,7 @@
|
||||||
contrast, # [0..1]
|
contrast, # [0..1]
|
||||||
}:
|
}:
|
||||||
singleton "10_ddc_contrast" /* bash */ ''
|
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))
|
toString (builtins.floor (contrast * 100))
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,6 @@
|
||||||
|
|
||||||
services.hoogle = {
|
services.hoogle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 3001; # leave 8080 for other stuff
|
|
||||||
packages =
|
packages =
|
||||||
haskellPackages: with haskellPackages; [
|
haskellPackages: with haskellPackages; [
|
||||||
optparse-applicative
|
optparse-applicative
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,26 @@ let
|
||||||
|
|
||||||
infuse = lib.flip infuse-lib.v1.infuse;
|
infuse = lib.flip infuse-lib.v1.infuse;
|
||||||
in
|
in
|
||||||
|
# Why shouldn't I go crazy with overlays?
|
||||||
final:
|
final:
|
||||||
infuse {
|
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
|
# I don't really use helix, but it's nice to have the W alias just in case
|
||||||
helix.__output.patches.__append = [
|
helix.__output.patches.__append = [
|
||||||
./patches/helix/W-as-write.patch
|
./patches/helix/W-as-write.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Too loud
|
||||||
|
alejandra.__output.patches.__append = [
|
||||||
|
./patches/alejandra/no-ads.patch
|
||||||
|
];
|
||||||
|
alejandra.__output.doCheck = _: false;
|
||||||
|
|
||||||
# TODO:
|
# TODO:
|
||||||
# pinned branch of https://github.com/astrand/xclip/tree/xerror
|
# pinned branch of https://github.com/astrand/xclip/tree/xerror
|
||||||
# use this until #43 gets resolved properly
|
# use this until #43 gets resolved properly
|
||||||
|
|
|
||||||
49
nix/configurations/vanadium/patches/alejandra/no-ads.patch
Normal file
49
nix/configurations/vanadium/patches/alejandra/no-ads.patch
Normal file
|
|
@ -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;
|
||||||
Loading…
Add table
Add a link
Reference in a new issue