flake.nix

@@ -57,9 +57,9 @@
           pre-commit-check = pre-commit-hooks.lib.${system}.run {
             src = ./.;
             tools.fourmolu = pkgs.haskellPackages.fourmolu;
-            tools.nixfmt = pkgs.nixfmt;
+            tools.nixfmt = pkgs.nixfmt-rfc-style;
             hooks = {
-              nixfmt.enable = true;
+              nixfmt-rfc-style.enable = true;
               fourmolu.enable = true;
               hpack.enable = true;
               hlint.enable = true;
@@ -143,7 +143,7 @@
           inherit (self.checks.${system}.pre-commit-check) shellHook;
 
           packages = with pkgs; [
-            nixfmt
+            nixfmt-rfc-style
             nil
           ];
         };

home/alex/cli.nix

@@ -44,7 +44,7 @@ in
 
     # nix tools
     nix-index
-    nixfmt
+    nixfmt-rfc-style
     # misc
     fd # better find
     file # info about files

home/alex/home.nix

@@ -111,7 +111,7 @@
     enableSshSupport = true;
     sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
     extraConfig = ''
-      pinentry-program ${pkgs.pinentry-qt}/bin/pinentry
+      pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
     '';
   };
 

home/alex/programs/shell/default.nix

@@ -17,7 +17,6 @@
     enableCompletion = true;
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
-    dotDir = "${config.xdg.configHome}/zsh";
 
     initContent = ''
       [ $TERM = "dumb" ] && unsetopt zle && PS1='$ '

hosts/dregil/configuration.nix

@@ -48,10 +48,9 @@ in
 
   i18n = {
     extraLocaleSettings = {
-      LC_TIME = "sv_SE.UTF-8"; # iso foramt
+      TIME_STYLE = "iso";
     };
     extraLocales = "all";
-    defaultLocale = "en_US.UTF-8";
   };
 
   console = {
@@ -66,7 +65,7 @@ in
       [
         corefonts
         noto-fonts
-        noto-fonts-color-emoji
+        noto-fonts-emoji
         fira-code
         fira-code-symbols
       ]
@@ -94,7 +93,7 @@ in
     ripgrep
     git
     nvidia-offload
-    pinentry-qt
+    pinentry
   ];
 
   # adjust channels to nixpkgs used on this system via this flake