From 9facd640ad538e81a9204f507263c83c0182af43 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Fri, 20 Feb 2026 20:38:18 +0100 Subject: [PATCH] chore: Update nixpkgs and resolve resulting issues --- flake.nix | 6 +++--- home/alex/cli.nix | 2 +- home/alex/programs/shell/default.nix | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 23f2062..7c3ec9f 100644 --- a/flake.nix +++ b/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-rfc-style; + tools.nixfmt = pkgs.nixfmt; hooks = { - nixfmt-rfc-style.enable = true; + nixfmt.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-rfc-style + nixfmt nil ]; }; diff --git a/home/alex/cli.nix b/home/alex/cli.nix index b4833b9..5d96eac 100644 --- a/home/alex/cli.nix +++ b/home/alex/cli.nix @@ -44,7 +44,7 @@ in # nix tools nix-index - nixfmt-rfc-style + nixfmt # misc fd # better find file # info about files diff --git a/home/alex/programs/shell/default.nix b/home/alex/programs/shell/default.nix index 48b25b9..87db7da 100644 --- a/home/alex/programs/shell/default.nix +++ b/home/alex/programs/shell/default.nix @@ -17,6 +17,7 @@ enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; + dotDir = "${config.xdg.configHome}/zsh"; initContent = '' [ $TERM = "dumb" ] && unsetopt zle && PS1='$ '