chore: Use nixfmt reformat all nix source code

This commit is contained in:
ulic-youthlic 2026-07-04 23:11:21 +08:00
parent 1cdf00cefe
commit 11337b8f9e
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
184 changed files with 2349 additions and 1943 deletions

View file

@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
cfg = config.david.programs.alacritty;
in {
in
{
options = {
david.programs.alacritty = {
enable = lib.mkEnableOption "alacritty";
@ -17,13 +19,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,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.david.programs.chromium;
in {
in
{
options = {
david.programs.chromium = {
enable = lib.mkEnableOption "chromium";

View file

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

View file

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

View file

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

View file

@ -2,36 +2,39 @@
config,
lib,
...
}: {
}:
{
options = {
david.programs.ghostty = {
enable = lib.mkEnableOption "ghostty";
};
};
config = let
cfg = config.david.programs.ghostty;
in (lib.mkIf cfg.enable {
stylix.targets.ghostty.enable = false;
programs.ghostty = lib.mkMerge [
{
enable = true;
settings = {
font-family = [
"MonoLisa"
"Source Han Sans SC"
];
font-size = lib.mkForce 17;
theme = "Atom One Dark";
background-opacity = 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 {
stylix.targets.ghostty.enable = false;
programs.ghostty = lib.mkMerge [
{
enable = true;
settings = {
font-family = [
"MonoLisa"
"Source Han Sans SC"
];
font-size = lib.mkForce 17;
theme = "Atom One Dark";
background-opacity = 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,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
cfg = config.david.programs.helix;
in {
in
{
options = {
david.programs.helix = {
enable = lib.mkEnableOption "helix";

View file

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

View file

@ -3,9 +3,11 @@
config,
pkgs,
...
}: 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

@ -3,39 +3,43 @@
lib,
inputs,
pkgs,
osConfig ? (throw "Trying to access osConfig, the home-manager module is not being used in the nixos module"),
osConfig ? (
throw "Trying to access osConfig, the home-manager module is not being used in the nixos module"
),
options,
...
}: let
}:
let
cfg = config.david.programs.niri;
in {
in
{
imports = [
./config.nix
];
options = {
david.programs.niri = {
enable =
(lib.mkEnableOption "niri")
// {
default = osConfig.youthlic.gui.enabled == "niri";
};
enable = (lib.mkEnableOption "niri") // {
default = osConfig.youthlic.gui.enabled == "niri";
};
config = lib.mkOption {
type = inputs.niri-flake.lib.kdl.types.kdl-document;
};
configHelper = lib.mkOption {
type = lib.types.anything;
default = {
validated-config-for = configuration:
pkgs.runCommand "config.kdl" {
inherit configuration;
passAsFile = ["configuration"];
buildInputs = [config.programs.niri.package];
}
#bash
''
niri validate -c $configurationPath
cp $configurationPath $out
'';
validated-config-for =
configuration:
pkgs.runCommand "config.kdl"
{
inherit configuration;
passAsFile = [ "configuration" ];
buildInputs = [ config.programs.niri.package ];
}
#bash
''
niri validate -c $configurationPath
cp $configurationPath $out
'';
};
};
wluma.extraSettings = lib.mkOption {
@ -52,19 +56,21 @@ in {
swayimg
seahorse
];
xdg.configFile = let
qtctConf = ''
[Appearance]
standard_dialogs=xdgdesktopportal
'';
in {
"qt5ct/qt5ct.conf" = {
text = qtctConf;
xdg.configFile =
let
qtctConf = ''
[Appearance]
standard_dialogs=xdgdesktopportal
'';
in
{
"qt5ct/qt5ct.conf" = {
text = qtctConf;
};
"qt6ct/qt6ct.conf" = {
text = qtctConf;
};
};
"qt6ct/qt6ct.conf" = {
text = qtctConf;
};
};
david.programs = {
# fuzzel.enable = true;
# waybar = {
@ -83,11 +89,11 @@ in {
};
programs = {
niri = {
config =
cfg.config
++ [
(inputs.niri-flake.lib.kdl.leaf "include" [(toString config.david.programs.noctalia.niriExtraConfig)])
];
config = cfg.config ++ [
(inputs.niri-flake.lib.kdl.leaf "include" [
(toString config.david.programs.noctalia.niriExtraConfig)
])
];
};
};
})

View file

@ -4,42 +4,101 @@
inputs,
pkgs,
...
}: let
}:
let
cfg = config.david.programs.noctalia;
inherit (inputs.niri-flake.lib.kdl) node leaf flag plain;
inherit (inputs.niri-flake.lib.kdl)
node
leaf
flag
plain
;
spawn = leaf "spawn";
noctalia = args: (spawn (["noctalia-shell" "ipc" "call"] ++ args));
noctalia =
args:
(spawn (
[
"noctalia-shell"
"ipc"
"call"
]
++ args
));
layer-rule = plain "layer-rule";
match = leaf "match";
in {
in
{
options = {
david.programs.noctalia = {
enable = lib.mkEnableOption "noctalia";
niriExtraConfig = lib.mkOption {
type = inputs.niri-flake.lib.kdl.types.kdl-document;
default = [
(leaf "spawn-at-startup" [(lib.getExe config.programs.noctalia-shell.package)])
(leaf "spawn-at-startup" [ (lib.getExe config.programs.noctalia-shell.package) ])
(plain "binds" [
(plain "Mod+V" [(noctalia ["launcher" "clipboard"])])
(plain "Mod+Shift+P" [(noctalia ["lockScreen" "lock"])])
(plain "Mod+Space" [(noctalia ["launcher" "toggle"])])
(node "XF86AudioRaiseVolume" [{allow-when-locked = true;}]
[(noctalia ["volume" "increase"])])
(node "XF86AudioLowerVolume" [{allow-when-locked = true;}]
[(noctalia ["volume" "decrease"])])
(node "XF86AudioMute" [{allow-when-locked = true;}]
[(noctalia ["volume" "muteOutput"])])
(node "XF86AudioMicMute" [{allow-when-locked = true;}]
[(noctalia ["volume" "muteInput"])])
(plain "Mod+V" [
(noctalia [
"launcher"
"clipboard"
])
])
(plain "Mod+Shift+P" [
(noctalia [
"lockScreen"
"lock"
])
])
(plain "Mod+Space" [
(noctalia [
"launcher"
"toggle"
])
])
(node "XF86AudioRaiseVolume"
[ { allow-when-locked = true; } ]
[
(noctalia [
"volume"
"increase"
])
]
)
(node "XF86AudioLowerVolume"
[ { allow-when-locked = true; } ]
[
(noctalia [
"volume"
"decrease"
])
]
)
(node "XF86AudioMute"
[ { allow-when-locked = true; } ]
[
(noctalia [
"volume"
"muteOutput"
])
]
)
(node "XF86AudioMicMute"
[ { allow-when-locked = true; } ]
[
(noctalia [
"volume"
"muteInput"
])
]
)
])
(layer-rule [
(match [{namespace = "^noctalia-wallpaper-.*$";}])
(leaf "place-within-backdrop" [true])
(match [ { namespace = "^noctalia-wallpaper-.*$"; } ])
(leaf "place-within-backdrop" [ true ])
])
(layer-rule [
(match [{namespace = "^noctalia-notifications-.*$";}])
(leaf "block-out-from" ["screen-capture"])
(match [ { namespace = "^noctalia-notifications-.*$"; } ])
(leaf "block-out-from" [ "screen-capture" ])
])
(plain "layout" [
(plain "focus-ring" [
@ -54,41 +113,49 @@ in {
])
])
];
apply = configuration: config.david.programs.niri.configHelper.validated-config-for (inputs.niri-flake.lib.kdl.serialize.nodes configuration);
apply =
configuration:
config.david.programs.niri.configHelper.validated-config-for (
inputs.niri-flake.lib.kdl.serialize.nodes configuration
);
};
};
};
config = lib.mkIf cfg.enable {
stylix.targets.noctalia-shell.enable = false;
home.packages = [pkgs.app2unit pkgs.gpu-screen-recorder];
home.packages = [
pkgs.app2unit
pkgs.gpu-screen-recorder
];
programs.noctalia-shell = {
enable = true;
plugins = builtins.fromJSON (builtins.readFile ./plugins.json);
pluginSettings = let
enabledPlugins = with lib;
flip pipe [
(filterAttrs (_name: settings: settings.enabled or false))
builtins.attrNames
]
config.programs.noctalia-shell.plugins.states;
staticSettings = lib.genAttrs enabledPlugins (name: let
pluginSettingPath = ./plugin + "/${name}.json";
pluginSettings =
let
enabledPlugins =
with lib;
flip pipe [
(filterAttrs (_name: settings: settings.enabled or false))
builtins.attrNames
] config.programs.noctalia-shell.plugins.states;
staticSettings = lib.genAttrs enabledPlugins (
name:
let
pluginSettingPath = ./plugin + "/${name}.json";
in
if lib.pathIsRegularFile pluginSettingPath then
builtins.fromJSON (builtins.readFile pluginSettingPath)
else
{ }
);
in
if lib.pathIsRegularFile pluginSettingPath
then builtins.fromJSON (builtins.readFile pluginSettingPath)
else {});
in
lib.recursiveUpdate
staticSettings {
lib.recursiveUpdate staticSettings {
screen-recorder.directory = "${config.xdg.userDirs.videos}/records";
};
settings =
lib.recursiveUpdate
(builtins.fromJSON (builtins.readFile ./settings.json))
{
general.avatarImage = "${config.home.homeDirectory}/.face";
wallpaper.directory = "${config.home.homeDirectory}/${config.david.wallpaper.path}";
};
settings = lib.recursiveUpdate (builtins.fromJSON (builtins.readFile ./settings.json)) {
general.avatarImage = "${config.home.homeDirectory}/.face";
wallpaper.directory = "${config.home.homeDirectory}/${config.david.wallpaper.path}";
};
};
};
}

View file

@ -3,9 +3,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.david.programs.openssh;
in {
in
{
options = {
david.programs.openssh = {
enable = lib.mkEnableOption "openssh";
@ -33,7 +35,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

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

View file

@ -4,10 +4,12 @@
inputs,
pkgs,
...
}: let
}:
let
cfg = config.david.programs.spotify;
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in {
in
{
options = {
david.programs.spotify = {
enable = lib.mkEnableOption "spotify";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -3,9 +3,11 @@
config,
options,
...
}: let
}:
let
cfg = config.david.programs.wluma;
in {
in
{
options = {
david.programs.wluma = {
enable = lib.mkEnableOption "wluma";
@ -33,23 +35,22 @@ 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,9 +3,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.david.programs.zed-editor;
in {
in
{
options = {
david.programs.zed-editor = {
enable = lib.mkEnableOption "zed-editor";
@ -61,7 +63,7 @@ in {
ty = {
binary = {
path = lib.getExe pkgs.ty;
arguments = ["server"];
arguments = [ "server" ];
};
};
};

View file

@ -3,9 +3,11 @@
config,
pkgs,
...
}: let
}:
let
cfg = config.david.programs.zen-browser;
in {
in
{
options = {
david.programs.zen-browser = {
enable = lib.mkEnableOption "zen-browser";
@ -41,7 +43,7 @@ in {
];
}
];
definedAliases = ["@gp"];
definedAliases = [ "@gp" ];
};
"Nix Packages" = {
urls = [
@ -60,7 +62,7 @@ in {
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = ["@np"];
definedAliases = [ "@np" ];
};
"Nix Options" = {
urls = [
@ -78,7 +80,7 @@ in {
];
}
];
definedAliases = ["@no"];
definedAliases = [ "@no" ];
};
"Home Manager Options" = {
urls = [
@ -96,7 +98,7 @@ in {
];
}
];
definedAliases = ["@hm"];
definedAliases = [ "@hm" ];
};
"Nix Flakes" = {
urls = [
@ -114,7 +116,7 @@ in {
];
}
];
definedAliases = ["@nf"];
definedAliases = [ "@nf" ];
};
"NixOS Wiki" = {
urls = [
@ -128,7 +130,7 @@ in {
];
}
];
definedAliases = ["@nw"];
definedAliases = [ "@nw" ];
};
"Rust Stdandard Lib" = {
urls = [
@ -142,7 +144,7 @@ in {
];
}
];
definedAliases = ["@rs"];
definedAliases = [ "@rs" ];
};
"GitHub" = {
urls = [
@ -160,7 +162,7 @@ in {
];
}
];
definedAliases = ["@gh"];
definedAliases = [ "@gh" ];
};
"Rust Reference" = {
urls = [
@ -174,7 +176,7 @@ in {
];
}
];
definedAliases = ["@rr"];
definedAliases = [ "@rr" ];
};
"Rust Crates" = {
urls = [
@ -188,7 +190,7 @@ in {
];
}
];
definedAliases = ["@rc"];
definedAliases = [ "@rc" ];
};
"C++ Reference" = {
urls = [
@ -206,7 +208,7 @@ in {
];
}
];
definedAliases = ["@cr"];
definedAliases = [ "@cr" ];
};
"bing".metaData.hidden = true;
"google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
@ -215,12 +217,15 @@ in {
};
policies = {
DisableAppUpdate = true;
Preferences = let
mkLockedAttrs = builtins.mapAttrs (_: value: {
Value = value;
Status = "locked";
});
in
Preferences =
let
mkLockedAttrs = builtins.mapAttrs (
_: value: {
Value = value;
Status = "locked";
}
);
in
mkLockedAttrs {
"browser.tabs.closeTabByDblclick" = true;
};