From ebd66cbfb4ba190a997142f9a4b3e07ebc749ea7 Mon Sep 17 00:00:00 2001 From: derped Date: Tue, 31 Dec 2024 16:34:44 +0100 Subject: [PATCH] nixfmt update formatter changes --- flake.nix | 25 +++++++++++++++---------- pkgsets/nvim/cmp.nix | 5 ++--- services/desktop.nix | 5 ++++- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index c7a3ebe..2c675f4 100644 --- a/flake.nix +++ b/flake.nix @@ -76,16 +76,21 @@ inherit system; inherit fn; }; - modules = [ - ( - { config, ... }: - { - config.nixpkgs.overlays = [ nixpkgs-wayland.overlay ]; - } - ) - (toString ./options/machine.nix) - sops-nix.nixosModules.sops - ] ++ machineFiles ++ configFiles ++ pkgsFiles ++ serviceFiles; + modules = + [ + ( + { config, ... }: + { + config.nixpkgs.overlays = [ nixpkgs-wayland.overlay ]; + } + ) + (toString ./options/machine.nix) + sops-nix.nixosModules.sops + ] + ++ machineFiles + ++ configFiles + ++ pkgsFiles + ++ serviceFiles; }; }; in diff --git a/pkgsets/nvim/cmp.nix b/pkgsets/nvim/cmp.nix index b16e67a..003fc45 100644 --- a/pkgsets/nvim/cmp.nix +++ b/pkgsets/nvim/cmp.nix @@ -21,9 +21,8 @@ lib.mkIf (lib.elem "nvim::cmp" config.machine.pkgs) { local cmp = require('cmp') cmp.setup({ - ${ - lib.optionalString (lib.elem "nvim::lsp" config.machine.pkgs) # lua - ''sources = { { name = 'nvim_lsp' }, },'' + ${lib.optionalString (lib.elem "nvim::lsp" config.machine.pkgs) # lua + ''sources = { { name = 'nvim_lsp' }, },'' } mapping = cmp.mapping.preset.insert({ [''] = cmp.mapping.complete(), diff --git a/services/desktop.nix b/services/desktop.nix index d05f70d..798ec3f 100644 --- a/services/desktop.nix +++ b/services/desktop.nix @@ -42,7 +42,10 @@ in regreet = { enable = true; # https://github.com/NixOS/nixpkgs/issues/226586 - cageArgs = [ "-m" "last" ]; + cageArgs = [ + "-m" + "last" + ]; settings = { background = { path = "/persist/data/wallpaper.jpg";