fix: Format according to nixfmt-rfc-style

This commit is contained in:
Jalil David Salamé Messina 2024-04-05 11:55:35 +02:00
parent e3e96bbf40
commit ce37942672
Signed by: jalil
GPG key ID: F016B9E770737A0B
24 changed files with 606 additions and 302 deletions

View file

@ -1,18 +1,22 @@
{ stylix }: { config, pkgs, lib, ... }:
{ stylix }:
{
config,
pkgs,
lib,
...
}:
let
cfg = config.jconfig;
keysFromGithub = lib.attrsets.mapAttrs'
(username: sha256: {
name = "pubkeys/${username}";
value = {
mode = "0755";
source = builtins.fetchurl {
inherit sha256;
url = "https://github.com/${username}.keys";
};
keysFromGithub = lib.attrsets.mapAttrs' (username: sha256: {
name = "pubkeys/${username}";
value = {
mode = "0755";
source = builtins.fetchurl {
inherit sha256;
url = "https://github.com/${username}.keys";
};
})
cfg.importSSHKeysFromGithub;
};
}) cfg.importSSHKeysFromGithub;
in
{
imports = [
@ -65,7 +69,9 @@ in
};
environment.etc = keysFromGithub;
services.openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (builtins.attrNames keysFromGithub);
services.openssh.authorizedKeysFiles = builtins.map (path: "/etc/${path}") (
builtins.attrNames keysFromGithub
);
# Default shell
programs.zsh.enable = true;
@ -82,6 +88,9 @@ in
# run between 0 and 45min after boot if run was missed
nix.gc.randomizedDelaySec = "45min";
nix.settings.auto-optimise-store = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
};
}

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.jconfig.gui;
enable = config.jconfig.enable && cfg.enable;
@ -17,7 +22,10 @@ in
enable = cfg.ydotool.autoStart;
wantedBy = [ "default.target" ];
description = "Generic command-line automation tool";
documentation = [ "man:ydotool(1)" "man:ydotoold(8)" ];
documentation = [
"man:ydotool(1)"
"man:ydotoold(8)"
];
serviceConfig = {
Type = "simple";
Restart = "always";

View file

@ -2,13 +2,25 @@
let
inherit (lib) types;
# Like mkEnableOption but defaults to true
mkDisableOption = option: (lib.mkEnableOption option) // { default = true; example = false; };
mkImageOption = { description, url, sha256 ? "" }: lib.mkOption {
inherit description;
type = types.path;
default = builtins.fetchurl { inherit url sha256; };
defaultText = lib.literalMD "![${description}](${url})";
};
mkDisableOption =
option:
(lib.mkEnableOption option)
// {
default = true;
example = false;
};
mkImageOption =
{
description,
url,
sha256 ? "",
}:
lib.mkOption {
inherit description;
type = types.path;
default = builtins.fetchurl { inherit url sha256; };
defaultText = lib.literalMD "![${description}](${url})";
};
gui.options = {
enable = lib.mkEnableOption "jalil's default gui configuration.";
@ -48,9 +60,7 @@ let
dev = lib.mkOption {
description = lib.mdDoc "Options for setting up a dev environment";
default = { };
type = types.submodule {
options.enable = lib.mkEnableOption "dev configuration";
};
type = types.submodule { options.enable = lib.mkEnableOption "dev configuration"; };
};
gui = lib.mkOption {
description = lib.mdDoc "Jalil's default configuration for a NixOS gui.";
@ -77,7 +87,9 @@ let
want to allow ssh logins.
'';
default = { };
example = { "jalil-salame" = "sha256:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; };
example = {
"jalil-salame" = "sha256:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
};
type = types.attrsOf types.str;
};
};

View file

@ -13,18 +13,30 @@ in
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
polarity = "dark";
fonts.monospace = [
{ name = "JetBrains Mono"; package = pkgs.jetbrains-mono; }
{
name = "JetBrains Mono";
package = pkgs.jetbrains-mono;
}
fallbackSymbols
];
fonts.sansSerif = [
{ name = "Noto Sans"; package = pkgs.noto-fonts; }
{
name = "Noto Sans";
package = pkgs.noto-fonts;
}
fallbackSymbols
];
fonts.serif = [
{ name = "Noto Serif"; package = pkgs.noto-fonts; }
{
name = "Noto Serif";
package = pkgs.noto-fonts;
}
fallbackSymbols
];
fonts.emoji = { package = pkgs.noto-fonts-emoji; name = "Noto Color Emoji"; };
fonts.emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
fonts.sizes.popups = 12;
targets.plymouth.logoAnimated = false;
targets.plymouth.logo = cfg.bootLogo;