From aa6f69881ddb7bde714197ddf3f9f9b6377bf3c6 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Tue, 4 Jun 2024 19:09:05 +0200 Subject: [PATCH] Fix topgrade and nixfmt after nix update --- homes/x86_64-linux/julian@aspi/default.nix | 2 +- modules/home/emacs/default.nix | 2 +- modules/home/topgrade/default.nix | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix index cbe57eb..1a2663a 100644 --- a/homes/x86_64-linux/julian@aspi/default.nix +++ b/homes/x86_64-linux/julian@aspi/default.nix @@ -39,7 +39,7 @@ config, ... }: { home.packages = with pkgs; [ # Code formatters for use with doom emacs - nixfmt # nix + nixfmt-rfc-style # nix dockfmt # docker google-java-format # java diff --git a/modules/home/emacs/default.nix b/modules/home/emacs/default.nix index 764c155..23df8c7 100644 --- a/modules/home/emacs/default.nix +++ b/modules/home/emacs/default.nix @@ -46,7 +46,7 @@ in { sqlite # Code formatters for use with doom emacs - nixfmt # nix + nixfmt-rfc-style # nix dockfmt # docker google-java-format # java black # python diff --git a/modules/home/topgrade/default.nix b/modules/home/topgrade/default.nix index e65acb4..c553169 100644 --- a/modules/home/topgrade/default.nix +++ b/modules/home/topgrade/default.nix @@ -37,9 +37,7 @@ in { git = { # Additional git repositories to pull - repos = [ "~/.dotfiles" ]; - - pull_only_repos = [ "~/dev/*" ]; + repos = [ "~/.dotfiles" "~/dev/*" ]; }; }; };