nixfmt update formatter changes

This commit is contained in:
Kevin Baensch 2024-12-31 16:34:44 +01:00
parent fe9ec52785
commit ebd66cbfb4
Signed by: derped
GPG key ID: C0F1D326C7626543
3 changed files with 21 additions and 14 deletions

View file

@ -76,16 +76,21 @@
inherit system; inherit system;
inherit fn; inherit fn;
}; };
modules = [ modules =
( [
{ config, ... }: (
{ { config, ... }:
config.nixpkgs.overlays = [ nixpkgs-wayland.overlay ]; {
} config.nixpkgs.overlays = [ nixpkgs-wayland.overlay ];
) }
(toString ./options/machine.nix) )
sops-nix.nixosModules.sops (toString ./options/machine.nix)
] ++ machineFiles ++ configFiles ++ pkgsFiles ++ serviceFiles; sops-nix.nixosModules.sops
]
++ machineFiles
++ configFiles
++ pkgsFiles
++ serviceFiles;
}; };
}; };
in in

View file

@ -21,9 +21,8 @@ lib.mkIf (lib.elem "nvim::cmp" config.machine.pkgs) {
local cmp = require('cmp') local cmp = require('cmp')
cmp.setup({ cmp.setup({
${ ${lib.optionalString (lib.elem "nvim::lsp" config.machine.pkgs) # lua
lib.optionalString (lib.elem "nvim::lsp" config.machine.pkgs) # lua ''sources = { { name = 'nvim_lsp' }, },''
''sources = { { name = 'nvim_lsp' }, },''
} }
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
['<C-Space>'] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),

View file

@ -42,7 +42,10 @@ in
regreet = { regreet = {
enable = true; enable = true;
# https://github.com/NixOS/nixpkgs/issues/226586 # https://github.com/NixOS/nixpkgs/issues/226586
cageArgs = [ "-m" "last" ]; cageArgs = [
"-m"
"last"
];
settings = { settings = {
background = { background = {
path = "/persist/data/wallpaper.jpg"; path = "/persist/data/wallpaper.jpg";