Compare commits

..

No commits in common. "9facd640ad538e81a9204f507263c83c0182af43" and "2a1db15b8cfd97e9b7f50641cba60ba46f1beb9a" have entirely different histories.

5 changed files with 8 additions and 10 deletions

View file

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

View file

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

View file

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

View file

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

View file

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