feat: Change nix formatter to alejandra

This commit is contained in:
ulic-youthlic 2025-11-09 06:25:03 +08:00
parent 0b8b647f05
commit b4c3dfec42
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
229 changed files with 2528 additions and 2884 deletions

View file

@ -4,35 +4,32 @@
unixName,
config,
...
}:
{
}: {
imports = lib.youthlic.loadImports ./.;
youthlic = {
xdg-dirs.enable = true;
programs =
let
email = config.accounts.email.accounts.ulic-youthlic;
inherit (email) address name;
signKey = email.gpg.key;
in
{
gpg.enable = true;
git = {
inherit name signKey;
email = address;
encrypt-credential = true;
};
fish.enable = true;
bash.enable = true;
jujutsu = {
enable = true;
inherit name signKey;
email = address;
};
starship.enable = true;
sops.enable = true;
atuin.enable = true;
programs = let
email = config.accounts.email.accounts.ulic-youthlic;
inherit (email) address name;
signKey = email.gpg.key;
in {
gpg.enable = true;
git = {
inherit name signKey;
email = address;
encrypt-credential = true;
};
fish.enable = true;
bash.enable = true;
jujutsu = {
enable = true;
inherit name signKey;
email = address;
};
starship.enable = true;
sops.enable = true;
atuin.enable = true;
};
};
david = {

View file

@ -2,17 +2,13 @@
config,
inputs,
...
}:
let
}: let
inherit (inputs.niri-flake.lib.kdl) node leaf flag;
in
{
in {
david.programs.niri = {
waybar.settings =
let
cfg = config.david.programs.niri.waybar;
in
[ (cfg.template // (cfg.helper.mkBacklight "intel_backlight") // { output = "eDP-1"; }) ];
waybar.settings = let
cfg = config.david.programs.niri.waybar;
in [(cfg.template // (cfg.helper.mkBacklight "intel_backlight") // {output = "eDP-1";})];
wluma.extraSettings = {
output = {
backlight = [
@ -24,26 +20,25 @@ in
];
};
};
extraConfig =
let
output = node "output";
in
[
(output
[ "eDP-1" ]
[
(leaf "mode" [ "1920x1200@60.018" ])
(leaf "scale" [ 1.0 ])
(flag "focus-at-startup")
(leaf "position" [
{
x = 0;
y = 0;
}
])
(leaf "transform" [ "normal" ])
]
)
];
extraConfig = let
output = node "output";
in [
(
output
["eDP-1"]
[
(leaf "mode" ["1920x1200@60.018"])
(leaf "scale" [1.0])
(flag "focus-at-startup")
(leaf "position" [
{
x = 0;
y = 0;
}
])
(leaf "transform" ["normal"])
]
)
];
};
}

View file

@ -4,43 +4,40 @@
config,
unixName,
...
}:
{
}: {
imports = lib.youthlic.loadImports ./.;
youthlic = {
xdg-dirs.enable = true;
programs =
let
email = config.accounts.email.accounts.ulic-youthlic;
inherit (email) name address;
signKey = email.gpg.key;
in
{
rustypaste-cli.enable = true;
gpg.enable = true;
jujutsu = {
enable = true;
inherit name signKey;
email = address;
};
git = {
inherit name signKey;
email = address;
encrypt-credential = true;
};
fish.enable = true;
bash.enable = true;
starship.enable = true;
sops.enable = true;
kvm.enable = true;
atuin.enable = true;
ion.enable = true;
spotifyd.enable = true;
awscli = {
enable = true;
url = "http://localhost:8491";
};
programs = let
email = config.accounts.email.accounts.ulic-youthlic;
inherit (email) name address;
signKey = email.gpg.key;
in {
rustypaste-cli.enable = true;
gpg.enable = true;
jujutsu = {
enable = true;
inherit name signKey;
email = address;
};
git = {
inherit name signKey;
email = address;
encrypt-credential = true;
};
fish.enable = true;
bash.enable = true;
starship.enable = true;
sops.enable = true;
kvm.enable = true;
atuin.enable = true;
ion.enable = true;
spotifyd.enable = true;
awscli = {
enable = true;
url = "http://localhost:8491";
};
};
};
david = {

View file

@ -1,17 +1,17 @@
{ config, lib, ... }:
let
cfg = config.david.programs.niri;
in
{
config,
lib,
...
}: let
cfg = config.david.programs.niri;
in {
david.programs.niri = lib.mkIf cfg.enable {
waybar.settings =
let
cfg = config.david.programs.niri.waybar;
in
[
(cfg.template // (cfg.helper.mkBacklight "ddcci13") // { output = "DP-1"; })
(cfg.template // (cfg.helper.mkBacklight "nvidia_0") // { output = "eDP-2"; })
];
waybar.settings = let
cfg = config.david.programs.niri.waybar;
in [
(cfg.template // (cfg.helper.mkBacklight "ddcci13") // {output = "DP-1";})
(cfg.template // (cfg.helper.mkBacklight "nvidia_0") // {output = "eDP-2";})
];
wluma.extraSettings = {
output = {
backlight = [
@ -34,6 +34,6 @@ in
}
];
};
extraConfig = [ ];
extraConfig = [];
};
}

View file

@ -2,8 +2,7 @@
lib,
pkgs,
...
}:
{
}: {
imports = lib.youthlic.loadImports ./.;
config = {
youthlic.programs = {

View file

@ -2,11 +2,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.accounts.email;
in
{
in {
options = {
david.accounts.email = {
enable = lib.mkEnableOption "emails";

View file

@ -3,11 +3,9 @@
config,
pkgs,
...
}:
let
}: let
cfg = config.david.programs.alacritty;
in
{
in {
options = {
david.programs.alacritty = {
enable = lib.mkEnableOption "alacritty";
@ -20,13 +18,13 @@ in
settings =
(
with lib;
pipe ./alacritty.toml [
builtins.readFile
builtins.fromTOML
]
pipe ./alacritty.toml [
builtins.readFile
builtins.fromTOML
]
)
// {
colors = lib.mkForce { };
colors = lib.mkForce {};
font.size = lib.mkForce 16;
window.opacity = lib.mkForce 0.8;
general.import = [

View file

@ -2,11 +2,9 @@
lib,
config,
...
}:
let
}: let
cfg = config.david.programs.chromium;
in
{
in {
options = {
david.programs.chromium = {
enable = lib.mkEnableOption "chromium";

View file

@ -3,11 +3,9 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.david.programs.espanso;
in
{
in {
options = {
david.programs.espanso = {
enable = lib.mkEnableOption "espanso";
@ -18,7 +16,7 @@ in
enable = true;
package = pkgs.espanso-wayland;
configs = {
default = { };
default = {};
};
matches = {
base = {

View file

@ -3,11 +3,9 @@
lib,
config,
...
}:
let
}: let
cfg = config.david.programs.firefox;
in
{
in {
options = {
david.programs.firefox = {
enable = lib.mkEnableOption "firefox";
@ -89,7 +87,7 @@ in
];
}
];
definedAliases = [ "@gp" ];
definedAliases = ["@gp"];
};
"Nix Packages" = {
urls = [
@ -108,7 +106,7 @@ in
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ];
definedAliases = ["@np"];
};
"Nix Options" = {
urls = [
@ -126,7 +124,7 @@ in
];
}
];
definedAliases = [ "@no" ];
definedAliases = ["@no"];
};
"Home Manager Options" = {
urls = [
@ -144,7 +142,7 @@ in
];
}
];
definedAliases = [ "@hm" ];
definedAliases = ["@hm"];
};
"Nix Flakes" = {
urls = [
@ -162,7 +160,7 @@ in
];
}
];
definedAliases = [ "@nf" ];
definedAliases = ["@nf"];
};
"NixOS Wiki" = {
urls = [
@ -176,7 +174,7 @@ in
];
}
];
definedAliases = [ "@nw" ];
definedAliases = ["@nw"];
};
"Rust Stdandard Lib" = {
urls = [
@ -190,7 +188,7 @@ in
];
}
];
definedAliases = [ "@rs" ];
definedAliases = ["@rs"];
};
"GitHub" = {
urls = [
@ -208,7 +206,7 @@ in
];
}
];
definedAliases = [ "@gh" ];
definedAliases = ["@gh"];
};
"Rust Reference" = {
urls = [
@ -222,7 +220,7 @@ in
];
}
];
definedAliases = [ "@rr" ];
definedAliases = ["@rr"];
};
"Rust Crates" = {
urls = [
@ -236,7 +234,7 @@ in
];
}
];
definedAliases = [ "@rc" ];
definedAliases = ["@rc"];
};
"C++ Reference" = {
urls = [
@ -254,7 +252,7 @@ in
];
}
];
definedAliases = [ "@cr" ];
definedAliases = ["@cr"];
};
"bing".metaData.hidden = true;
"google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias

View file

@ -2,11 +2,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.programs.foot;
in
{
in {
options = {
david.programs.foot = {
enable = lib.mkEnableOption "foot";

View file

@ -2,11 +2,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.programs.fuzzel;
in
{
in {
options = {
david.programs.fuzzel = {
enable = lib.mkEnableOption "fuzzel";

View file

@ -3,42 +3,39 @@
config,
lib,
...
}:
{
}: {
options = {
david.programs.ghostty = {
enable = lib.mkEnableOption "ghostty";
};
};
config =
let
cfg = config.david.programs.ghostty;
in
(lib.mkIf cfg.enable {
programs.ghostty = lib.mkMerge [
{
enable = true;
package = pkgs.ghostty;
settings = {
# font-family = "Maple Mono NF CN";
font-feature = [
"calt"
"zero"
"cv03"
"ss08"
];
font-size = lib.mkForce 17;
theme = lib.mkForce "Atom One Dark";
background-opacity = lib.mkForce 0.8;
confirm-close-surface = "false";
};
}
(lib.mkIf config.youthlic.programs.fish.enable {
enableFishIntegration = true;
})
(lib.mkIf config.youthlic.programs.bash.enable {
enableBashIntegration = true;
})
];
});
config = let
cfg = config.david.programs.ghostty;
in (lib.mkIf cfg.enable {
programs.ghostty = lib.mkMerge [
{
enable = true;
package = pkgs.ghostty;
settings = {
# font-family = "Maple Mono NF CN";
font-feature = [
"calt"
"zero"
"cv03"
"ss08"
];
font-size = lib.mkForce 17;
theme = lib.mkForce "Atom One Dark";
background-opacity = lib.mkForce 0.8;
confirm-close-surface = "false";
};
}
(lib.mkIf config.youthlic.programs.fish.enable {
enableFishIntegration = true;
})
(lib.mkIf config.youthlic.programs.bash.enable {
enableBashIntegration = true;
})
];
});
}

View file

@ -3,11 +3,9 @@
config,
pkgs,
...
}:
let
}: let
cfg = config.david.programs.helix;
in
{
in {
options = {
david.programs.helix = {
enable = lib.mkEnableOption "helix";

View file

@ -2,11 +2,9 @@
lib,
config,
...
}:
let
}: let
cfg = config.david.programs.kanshi;
in
{
in {
options = {
david.programs.kanshi = {
enable = lib.mkEnableOption "kanshi";

View file

@ -2,11 +2,9 @@
lib,
config,
...
}:
let
}: let
cfg = config.david.programs.mpv;
in
{
in {
options = {
david.programs.mpv = {
enable = lib.mkEnableOption "mpv";

File diff suppressed because it is too large Load diff

View file

@ -6,17 +6,17 @@
osConfig ? null,
options,
...
}@args:
let
} @ args: let
cfg = config.david.programs.niri;
niri = osConfig.programs.niri.package;
in
{
in {
options = {
david.programs.niri = {
enable = (lib.mkEnableOption "niri") // {
default = osConfig.youthlic.gui.enabled == "niri";
};
enable =
(lib.mkEnableOption "niri")
// {
default = osConfig.youthlic.gui.enabled == "niri";
};
extraConfig = lib.mkOption {
type = inputs.niri-flake.lib.kdl.types.kdl-document;
};
@ -51,35 +51,34 @@ in
swayimg
seahorse
])
++ [ niri ];
++ [niri];
qt = {
enable = true;
};
xdg.portal = {
configPackages = [ niri ];
configPackages = [niri];
enable = true;
extraPortals = lib.mkIf (
!niri.cargoBuildNoDefaultFeatures || builtins.elem "xdp-gnome-screencast" niri.cargoBuildFeatures
) [ pkgs.xdg-desktop-portal-gnome ];
) [pkgs.xdg-desktop-portal-gnome];
};
xdg.configFile =
let
qtctConf = ''
xdg.configFile = let
qtctConf =
''
[Appearance]
standard_dialogs=xdgdesktopportal
''
+ lib.optionalString (config.qt.style ? name) ''
style=${config.qt.style.name}
'';
in
{
"qt5ct/qt5ct.conf" = lib.mkForce {
text = qtctConf;
};
"qt6ct/qt6ct.conf" = lib.mkForce {
text = qtctConf;
};
in {
"qt5ct/qt5ct.conf" = lib.mkForce {
text = qtctConf;
};
"qt6ct/qt6ct.conf" = lib.mkForce {
text = qtctConf;
};
};
david.programs = {
fuzzel.enable = true;
waybar = {
@ -97,7 +96,7 @@ in
};
programs.niri = {
config =
(lib.toList (import ./config.nix (args // { inherit pkgs; }))) ++ (lib.toList cfg.extraConfig);
(lib.toList (import ./config.nix (args // {inherit pkgs;}))) ++ (lib.toList cfg.extraConfig);
package = niri;
};
})

View file

@ -3,11 +3,9 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.david.programs.nvchad;
in
{
in {
options = {
david.programs.nvchad = {
enable = lib.mkEnableOption "nvchad";

View file

@ -3,11 +3,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.programs.openssh;
in
{
in {
options = {
david.programs.openssh = {
enable = lib.mkEnableOption "openssh";
@ -49,7 +47,7 @@ in
};
})
(lib.mkIf (cfg.enable && config.youthlic.programs.sops.enable) {
programs.ssh.includes = [ config.sops.secrets.ssh-config.path ];
programs.ssh.includes = [config.sops.secrets.ssh-config.path];
sops.secrets = {
"ssh-private-key/tytonidae" = {
mode = "0600";

View file

@ -4,17 +4,15 @@
lib,
inputs,
...
}:
let
}: let
inherit (inputs) nixpkgs emacs-overlay spacemacs;
inherit (pkgs) system;
cfg = config.david.programs.spacemacs;
pkgs' = import nixpkgs {
localSystem = { inherit system; };
overlays = [ emacs-overlay.overlays.default ];
localSystem = {inherit system;};
overlays = [emacs-overlay.overlays.default];
};
in
{
in {
options = {
david.programs.spacemacs = {
enable = lib.mkEnableOption "spacemacs";
@ -30,8 +28,7 @@ in
};
programs.emacs = {
enable = true;
package =
with pkgs';
package = with pkgs';
(emacsPackagesFor emacs-pgtk).emacsWithPackages (_epkgs: [
git
gnutar

View file

@ -3,11 +3,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.programs.swaylock;
in
{
in {
options = {
david.programs.swaylock = {
enable = lib.mkEnableOption "swaylock";

View file

@ -2,11 +2,9 @@
lib,
config,
...
}:
let
}: let
cfg = config.david.programs.swaync;
in
{
in {
options = {
david.programs.swaync = {
enable = lib.mkEnableOption "swaync";
@ -20,7 +18,7 @@ in
};
})
(lib.mkIf (!cfg.systemd.enable) {
systemd.user.services.swaync = lib.mkForce { };
systemd.user.services.swaync = lib.mkForce {};
})
];
}

View file

@ -2,11 +2,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.programs.thunderbird;
in
{
in {
options = {
david.programs.thunderbird = {
enable = lib.mkEnableOption "thunderbird";

View file

@ -4,11 +4,9 @@
lib,
options,
...
}:
let
}: let
cfg = config.david.programs.waybar;
in
{
in {
options = {
david.programs.waybar = {
enable = lib.mkEnableOption "waybar";
@ -25,7 +23,7 @@ in
"niri/workspaces"
"wlr/taskbar"
];
modules-center = [ "clock" ];
modules-center = ["clock"];
modules-right = [
"tray"
"idle_inhibitor"
@ -39,7 +37,7 @@ in
on-click = "activate";
};
"niri/worksapces" = { };
"niri/worksapces" = {};
"niri/taskbar" = {
icon-size = 15;
on-click = "activate";

View file

@ -3,11 +3,9 @@
config,
pkgs,
...
}:
let
}: let
cfg = config.david.programs.waypaper;
in
{
in {
options = {
david.programs.waypaper = {
enable = lib.mkEnableOption "waypaper";
@ -29,7 +27,7 @@ in
OnCalendar = "*:0/10";
};
Install = {
WantedBy = [ "timers.target" ];
WantedBy = ["timers.target"];
};
};
services."waypaper" = {

View file

@ -3,11 +3,9 @@
config,
options,
...
}:
let
}: let
cfg = config.david.programs.wluma;
in
{
in {
options = {
david.programs.wluma = {
enable = lib.mkEnableOption "wluma";
@ -35,22 +33,23 @@ in
config = lib.mkIf cfg.enable {
services.wluma = {
enable = true;
settings = {
als = {
webcam = {
video = 0;
thresholds = {
"0" = "night";
"15" = "dark";
"30" = "dim";
"45" = "normal";
"60" = "bright";
"75" = "outdoors";
settings =
{
als = {
webcam = {
video = 0;
thresholds = {
"0" = "night";
"15" = "dark";
"30" = "dim";
"45" = "normal";
"60" = "bright";
"75" = "outdoors";
};
};
};
};
}
// cfg.extraSettings;
}
// cfg.extraSettings;
systemd = {
enable = true;
};

View file

@ -3,11 +3,9 @@
config,
lib,
...
}:
let
}: let
cfg = config.david.programs.zed-editor;
in
{
in {
options = {
david.programs.zed-editor = {
enable = lib.mkEnableOption "zed-editor";
@ -64,7 +62,7 @@ in
ty = {
binary = {
path = lib.getExe pkgs.ty;
arguments = [ "server" ];
arguments = ["server"];
};
};
};

View file

@ -3,11 +3,9 @@
config,
pkgs,
...
}:
let
}: let
cfg = config.david.wallpaper;
in
{
in {
options = {
david.wallpaper = {
enable = lib.mkEnableOption "wallpaper";