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/home.nix b/home/alex/home.nix index 3d8b050..cdae044 100644 --- a/home/alex/home.nix +++ b/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 ''; }; 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='$ ' diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index 3001398..f37eaf5 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -48,9 +48,10 @@ in i18n = { extraLocaleSettings = { - TIME_STYLE = "iso"; + LC_TIME = "sv_SE.UTF-8"; # iso foramt }; extraLocales = "all"; + defaultLocale = "en_US.UTF-8"; }; console = { @@ -65,7 +66,7 @@ in [ corefonts noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji fira-code fira-code-symbols ] @@ -93,7 +94,7 @@ in ripgrep git nvidia-offload - pinentry + pinentry-qt ]; # adjust channels to nixpkgs used on this system via this flake