dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 7eab22cc892faffd5bd415e0bb8ac9d858950831 parent e1ec889188d38c9a863f7cdb9a77ad571a5da9f4 Author: maydayv7 <maydayv7@gmail.com> Date: Thu, 19 Oct 2023 16:33:46 +0530 feat!: Switch to NixOS Unstable + Use `stylix` for theming + `firefox` is enabled by default + Drop unused packages
Diffstat:
38 files changed, 625 insertions(+), 348 deletions(-)
diff --git a/README.md b/README.md @@ -4,7 +4,7 @@ <img alt="Desktop" src="files/images/logo/dark.png"> </picture> -   [](https://nixos.org) +   [](https://nixos.org) This [repository](https://github.com/maydayv7/dotfiles) contains the configuration and `dotfiles` for my continuously evolving multi-PC setup (using [Nix](https://nixos.org/)). All the devices I own, controlled by code. It also builds and deploys my website to [maydayv7.tk](https://maydayv7.tk). You can follow along with my [NixOS Desktop](https://maydayv7.tk/series/nixos-desktop/) Series @@ -119,8 +119,7 @@ github:maydayv7/dotfiles │ └───miscellaneous: Nixpkgs overlay ├───packages │ └───x86_64-linux -│ ├───dotfiles: package 'Dotfiles-v12.0' -│ ├───fonts: package 'fonts-7' +│ ├───dotfiles: package 'Dotfiles-v13.0' │ ├───nixos: package 'nixos' │ └───website: package 'website-stable' ├───templates @@ -139,7 +138,6 @@ github:maydayv7/dotfiles ┌── configuration.nix ├── flake.nix ├── flake.lock -├── .version ├── .templates ├── files ├── secrets @@ -171,7 +169,6 @@ github:maydayv7/dotfiles - `configuration.nix`: main system configuration file - `flake.nix`: repository version control using `inputs` -- `.version`: system state version - `.templates`: custom Flakes configuration templates - [`files`](./files/README.md): `dotfiles` and program configuration - [`secrets`](./secrets/README.md): authentication credentials management using [`sops-nix`](https://github.com/Mic92/sops-nix) @@ -422,6 +419,13 @@ You can navigate to the `README`'s present in the various directories to know mo <details> <summary><b>Changelog</b></summary> +### v13 + +- Follow NixOS Unstable +- Improve `nix-index` +- Move out proprietary files +- Refactor Secrets + ### 23.05 (v12) - Upgrade to NixOS v23.05 (Stoat)! diff --git a/configuration.nix b/configuration.nix @@ -51,12 +51,12 @@ in formatter = pkgs.treefmt; ## Package Configuration ## - legacyPackages = self.channels."${system}".stable; + legacyPackages = self.channels."${system}".unstable; # Channels channels = { stable = (build.channel stable [deploy.overlay] ./packages/patches)."${system}"; - unstable = (build.channel unstable [nur.overlay] [])."${system}"; + unstable = (build.channel unstable [deploy.overlay nur.overlay] [])."${system}"; wine = wine.packages."${system}"; gaming = gaming.packages."${system}"; apps = { diff --git a/devices/Futura.nix b/devices/Futura.nix @@ -16,7 +16,7 @@ }; gui.desktop = "xfce"; - apps.list = ["firefox" "office"]; + apps.list = ["office"]; # User Navya user = { diff --git a/devices/README.md b/devices/README.md @@ -9,7 +9,6 @@ These are the options that can be used in addition to the ones exposed by the `n - `description`: System Description (to add to `config.system.nixos.label`) - `timezone`: System Time Zone - Ex. `"Asia/Kolkata"` - `locale`: Default Locale - Ex. `"IN"` -- `channel`: System Package Repository to use (from `self.channels.${system}`) - `"stable" / "unstable"` - `kernel`: Linux Kernel to use (from `pkgs.linuxKernel.packages.linux_${kernel}`) - Ex. `zfs` - `kernelModules`: Additional Kernel Modules (to add to `config.boot.initrd.availableKernelModules`) - Ex. `[ "nvme" ]` - `imports`: Additional Configuration Files to import - Ex. `[ ./hardware-configuration.nix ]` diff --git a/devices/Vortex/default.nix b/devices/Vortex/default.nix @@ -2,7 +2,6 @@ system = "x86_64-linux"; name = "Vortex"; description = "PC - Dell Inspiron 15 5000"; - channel = "stable"; timezone = "Asia/Kolkata"; locale = "IN"; @@ -24,7 +23,7 @@ gui.desktop = "gnome"; shell.utilities = true; - apps.list = ["discord" "firefox" "git" "office" "vscode" "wine"]; + apps.list = ["discord" "git" "office" "vscode" "wine"]; # User V7 user = { diff --git a/files/gnome/dconf.nix b/files/gnome/dconf.nix @@ -12,7 +12,7 @@ in { # Home Directory home.file = { # Wallpapers - ".local/share/backgrounds".source = files.proprietary.wallpapers; + ".local/share/backgrounds".source = files.proprietary.wallpapers.path; # GTK+ Bookmarks ".config/gtk-3.0/bookmarks".text = lib.mkBefore '' @@ -129,17 +129,17 @@ in { }; "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; + #color-scheme = "prefer-dark"; clock-show-weekday = true; - document-font-name = "Product Sans 11"; + #document-font-name = "Product Sans 11"; enable-animations = true; enable-hot-corners = true; font-antialiasing = "grayscale"; font-hinting = "slight"; - font-name = "Product Sans Medium, Medium 11"; + #font-name = "Product Sans Medium, Medium 11"; gtk-im-module = "gtk-im-context-simple"; locate-pointer = true; - monospace-font-name = "MesloLGS NF 10"; + #monospace-font-name = "MesloLGS NF 10"; show-battery-percentage = true; toolkit-accessibility = false; }; @@ -408,7 +408,7 @@ in { }; # Shell Extensions - "org/gnome/shell/extensions/user-theme".name = "Adwaita"; + #"org/gnome/shell/extensions/user-theme".name = "Adwaita"; "org/gnome/shell/extensions/alphabetical-app-grid".folder-order-position = "start"; "org/gnome/shell/extensions/gestureImprovements".allow-minimize-window = true; "org/gnome/shell/extensions/gnome-ui-tune".hide-search = false; diff --git a/files/plank/dock.desktop b/files/plank/dock.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Encoding=UTF-8 -Version=0.9.4 Type=Application Name=Dock Comment= diff --git a/flake.lock b/flake.lock @@ -1,5 +1,135 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1689633990, + "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1674275109, + "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", + "repo": "base16-vim", + "type": "github" + } + }, "deploy": { "inputs": { "flake-compat": "flake-compat", @@ -83,6 +213,22 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -102,12 +248,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -116,6 +265,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "gaming": { "inputs": { "flake-parts": "flake-parts", @@ -171,21 +336,18 @@ }, "home": { "inputs": { - "nixpkgs": [ - "stable" - ] + "nixpkgs": ["unstable"] }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1697688028, + "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", + "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -193,19 +355,10 @@ "hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": [ - "utils", - "flake-utils" - ], - "gitignore": [ - "ignore" - ], - "nixpkgs": [ - "stable" - ], - "nixpkgs-stable": [ - "stable" - ] + "flake-utils": ["utils", "flake-utils"], + "gitignore": ["ignore"], + "nixpkgs": ["stable"], + "nixpkgs-stable": ["stable"] }, "locked": { "lastModified": 1695576016, @@ -223,9 +376,7 @@ }, "ignore": { "inputs": { - "nixpkgs": [ - "stable" - ] + "nixpkgs": ["stable"] }, "locked": { "lastModified": 1694102001, @@ -258,9 +409,7 @@ }, "index": { "inputs": { - "nixpkgs": [ - "stable" - ] + "nixpkgs": ["stable"] }, "locked": { "lastModified": 1696131323, @@ -442,11 +591,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1696490160, - "narHash": "sha256-LIEHEiWs0NDcuxIMk5axmR/IygPH153af7eHaAqQSps=", + "lastModified": 1697710837, + "narHash": "sha256-cqobLuhtRrxLe1E0n4ke4Frc7gxiIPD21qvrWpSzzy8=", "owner": "maydayv7", "repo": "proprietary", - "rev": "e55e0e20f19c6fdf7d16bd03810c3d4ad6974d5d", + "rev": "e69524e448c9cfe9e8008f5f496d9a29bcd1b010", "type": "github" }, "original": { @@ -472,6 +621,7 @@ "proprietary": "proprietary", "sops": "sops", "stable": "stable", + "stylix": "stylix", "unstable": "unstable", "utils": "utils_3", "windows": "windows", @@ -513,6 +663,34 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-alacritty": "base16-alacritty", + "base16-fish": "base16-fish", + "base16-foot": "base16-foot", + "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_3", + "home-manager": ["home"], + "nixpkgs": ["unstable"] + }, + "locked": { + "lastModified": 1697094532, + "narHash": "sha256-SvTC0wNCGpoUBvo9//IoTv5NQjozY0Y5ViTziRO+vt8=", + "owner": "danth", + "repo": "stylix", + "rev": "feceaa9d81725c0ca28ab46326b6dd1310a10dea", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -528,13 +706,28 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -582,11 +775,11 @@ "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1657226504, - "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", + "lastModified": 1696331477, + "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", + "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", "type": "github" }, "original": { @@ -597,9 +790,7 @@ }, "windows": { "inputs": { - "nixpkgs": [ - "stable" - ] + "nixpkgs": ["stable"] }, "locked": { "lastModified": 1687787314, @@ -617,10 +808,8 @@ }, "wine": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "unstable" - ] + "flake-compat": "flake-compat_4", + "nixpkgs": ["unstable"] }, "locked": { "lastModified": 1695992551, diff --git a/flake.nix b/flake.nix @@ -23,7 +23,7 @@ # Author -> V 7 <maydayv7@gmail.com> # # License -> MIT # # URL -> github:maydayv7/dotfiles # -# Version -> 23.05 (v12) # +# Version -> unstable (v13) # # --------------------------------------- # # Welcome to Ground Zero! # # The Very Heart of my 'dotfiles' # @@ -87,6 +87,12 @@ rev = "819180647f428a3826bfc917a54449da1e532ce0"; }; + # User Home Manager + home = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "unstable"; + }; + # Source Filter Functions filter.url = "github:numtide/nix-filter"; ignore = { @@ -100,12 +106,6 @@ # PC Hardware Module hardware.url = "github:nixos/nixos-hardware"; - # User Home Manager - home = { - url = "github:nix-community/home-manager?ref=release-23.05"; - inputs.nixpkgs.follows = "stable"; - }; - # Authentication Credentials Manager sops.url = "github:Mic92/sops-nix"; @@ -115,6 +115,13 @@ # System Image Generators generators.url = "github:nix-community/nixos-generators"; + # Base16 Theming + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "unstable"; + inputs.home-manager.follows = "home"; + }; + # Nix Index Database index = { url = "github:Mic92/nix-index-database"; diff --git a/modules/apps/firefox.nix b/modules/apps/firefox.nix @@ -4,12 +4,9 @@ pkgs, files, ... -}: let - inherit (lib) mkIf util; - enable = builtins.elem "firefox" config.apps.list; -in { +}: { ## Firefox Browser Configuration ## - config = mkIf enable { + config = { environment = { systemPackages = [pkgs.firefox]; sessionVariables.MOZ_USE_XINPUT2 = "1"; @@ -25,7 +22,7 @@ in { persist.directories = [".cache/mozilla/firefox" ".mozilla/firefox"]; home = { # File Associations - xdg.mimeApps.defaultApplications = util.build.mime files.xdg.mime { + xdg.mimeApps.defaultApplications = lib.util.build.mime files.xdg.mime { browser = ["firefox.desktop"]; }; diff --git a/modules/apps/office.nix b/modules/apps/office.nix @@ -22,7 +22,6 @@ in { # Internet google-chrome - teams thunderbird whatsapp-for-linux zoom-us @@ -45,7 +44,6 @@ in { ".zoom" ".config/google-chrome" ".config/libreoffice" - ".config/Microsoft" ".config/onlyoffice" ".local/share/data" ".local/share/onlyoffice" diff --git a/modules/apps/vscode.nix b/modules/apps/vscode.nix @@ -35,8 +35,7 @@ in { settings // {"editor.fontFamily" = "'${font}', 'monospace', monospace";}; # Useful Extensions - extensions = with pkgs; - with unstable.vscode-extensions // vscode-extensions; + extensions = with pkgs.vscode-extensions; [ dotjoshjohnson.xml eamodio.gitlens diff --git a/modules/base/firmware.nix b/modules/base/firmware.nix @@ -50,7 +50,6 @@ with {inherit (lib) mkAfter mkForce;}; { mediaKeys.enable = true; }; - nixpkgs.config.pulseaudio = true; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/modules/default.nix b/modules/default.nix @@ -24,7 +24,6 @@ in { system ? "x86_64-linux", name ? "nixos", description ? "", - channel ? "stable", format ? null, imports ? [], timezone, @@ -40,8 +39,8 @@ in { users ? null, }: let # Default Package Channel - input = inputs."${channel}"; - pkgs = self.channels."${system}"."${channel}"; + input = inputs.unstable; + pkgs = self.legacyPackages."${system}"; # System Libraries inherit (lib') util; @@ -77,7 +76,6 @@ in { in # Assertions assert (user == null) -> (users != null); - assert any (name: name == channel) (attrNames self.channels."${system}"); ## Device Configuration ## (makeOverridable lib'.nixosSystem) { inherit system; diff --git a/modules/gui/default.nix b/modules/gui/default.nix @@ -17,7 +17,7 @@ in { default = null; }; - config.warnings = + config.assertions = optional (config.gui.desktop == null) - (options.gui.desktop.description + " is unset"); + (options.gui.desktop.description + " must be set"); } diff --git a/modules/gui/fonts.nix b/modules/gui/fonts.nix @@ -16,32 +16,45 @@ in { ## Font Configuration ## config = mkIf enable { fonts = { - enableDefaultFonts = true; + enableDefaultPackages = true; fontDir.enable = true; enableGhostscriptFonts = true; fontconfig = { enable = true; localConf = files.fonts.config; - defaultFonts = { - monospace = ["MesloLGS NF"]; - sansSerif = ["Product Sans"]; - serif = ["Noto Serif"]; - emoji = ["Noto Color Emoji"]; - }; + }; + }; + + stylix.fonts = { + serif = { + package = pkgs.noto-fonts; + name = "Noto Serif"; + }; + + sansSerif = { + package = pkgs.custom.fonts; + name = "Product Sans"; + }; + + monospace = { + package = pkgs.meslo-lgs-nf; + name = "MesloLGS NF"; + }; + + emoji = { + package = pkgs.noto-fonts-color-emoji; + name = "Noto Color Emoji"; }; }; # Font Packages - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ corefonts dejavu_fonts fira fira-code fira-mono liberation_ttf - meslo-lgs-nf - noto-fonts - noto-fonts-emoji roboto roboto-slab source-code-pro @@ -59,9 +72,6 @@ in { "SourceCodePro" ]; }) - - # Custom Fonts - custom.fonts ]; ## Font Compatibility @@ -69,7 +79,7 @@ in { x11Fonts = runCommand "X11-fonts" {preferLocalBuild = true;} '' mkdir -p "$out" font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' - find ${toString config.fonts.fonts} -regex "$font_regexp" \ + find ${toString config.fonts.packages} -regex "$font_regexp" \ -exec cp '{}' "$out" \; cd "$out" ${gzip}/bin/gunzip -f *.gz diff --git a/modules/gui/gnome.nix b/modules/gui/gnome.nix @@ -32,8 +32,6 @@ in { # Desktop Integration gui.fonts.enable = true; xdg.portal.enable = true; - nixpkgs.config.firefox.enableGnomeExtensions = - mkIf (elem pkgs.firefox apps) true; programs = { dconf.enable = true; @@ -64,10 +62,12 @@ in { # GTK+ Theming gtk = { enable = true; - theme = { + /* + *theme = { name = "adw-gtk3-dark"; package = pkgs.adw-gtk3; }; + */ iconTheme = { name = "Papirus-Dark"; @@ -125,17 +125,18 @@ in { {text = ''@import "https://raw.githack.com/GeopJr/DNOME/dist/DNOME.css";'';}; # Firefox GNOME Theme - ".mozilla/firefox/default/chrome/userChrome.css".text = - mkIf (elem pkgs.firefox apps) - ''@import "${pkgs.custom.firefox-gnome-theme}/userChrome.css";''; - ".mozilla/firefox/default/chrome/userContent.css".text = - mkIf (elem pkgs.firefox apps) firefox.theme; - ".mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = - mkIf (elem pkgs.firefox apps) - "${pkgs.chrome-gnome-shell}/lib/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + ".mozilla/firefox/default/chrome/userChrome.css".text = ''@import "${pkgs.custom.firefox-gnome-theme}/userChrome.css";''; + ".mozilla/firefox/default/chrome/userContent.css".text = firefox.theme; + ".mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/lib/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; }; }; + # Color Scheme + stylix = { + image = files.proprietary.wallpapers.Sunset; + targets.gnome.enable = true; + }; + # QT Theme environment.variables."QT_STYLE_OVERRIDE" = mkForce "kvantum"; environment.etc."xdg/Kvantum/kvantum.kvconfig".text = '' @@ -184,34 +185,43 @@ in { celluloid dconf2nix gnuchess + (firefox.override (args: + args + // { + cfg = + args.cfg + or {} + // { + enableGnomeExtensions = true; + }; + })) ]) - ++ (with pkgs; - with unstable.gnomeExtensions // gnomeExtensions; [ - # GNOME Shell Extensions - alphabetical-app-grid - appindicator - caffeine - coverflow-alt-tab - custom.fly-pie - gesture-improvements - gnome-40-ui-improvements - guillotine - gtile - just-perfection - lock-keys - lock-screen-message - pano - quick-settings-tweaker - rounded-window-corners - space-bar - status-area-horizontal-spacing - timepp - transparent-top-bar-adjustable-transparency - top-bar-organizer - user-avatar-in-quick-settings - vitals - weather-oclock - ]); + ++ (with pkgs.gnomeExtensions; [ + # GNOME Shell Extensions + alphabetical-app-grid + appindicator + caffeine + coverflow-alt-tab + custom.fly-pie + gesture-improvements + gnome-40-ui-improvements + guillotine + gtile + just-perfection + lock-keys + lock-screen-message + pano + quick-settings-tweaker + rounded-window-corners + space-bar + status-area-horizontal-spacing + timepp + transparent-top-bar-adjustable-transparency + top-bar-organizer + user-avatar-in-quick-settings + vitals + weather-oclock + ]); # Persisted Files user.persist = { diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + inputs, + pkgs, + files, + ... +}: { + imports = [inputs.stylix.nixosModules.stylix]; + stylix = { + homeManagerIntegration.autoImport = true; + polarity = "dark"; + targets = { + console.enable = true; + kmscon.enable = true; + }; + }; +} diff --git a/modules/gui/xfce.nix b/modules/gui/xfce.nix @@ -101,6 +101,9 @@ in { ]; }; + # Color Scheme + stylix.image = files.proprietary.wallpapers.Sunset; + # User Configuration user.home = { # GTK+ Theming diff --git a/modules/hardware/filesystem.nix b/modules/hardware/filesystem.nix @@ -118,6 +118,7 @@ in { # Boot Settings boot = { + resumeDevice = "/dev/disk/by-partlabel/swap"; supportedFilesystems = ["zfs"]; kernelParams = ["elevator=none" "nohibernate"]; zfs = { diff --git a/modules/nix/config.nix b/modules/nix/config.nix @@ -3,4 +3,5 @@ allowBroken = false; allowUnfree = true; allowInsecurePredicate = x: true; + pulseAudio = true; } diff --git a/modules/shell/default.nix b/modules/shell/default.nix @@ -29,7 +29,7 @@ with {inherit (lib) mkEnableOption mkIf mkMerge util;}; { environment.systemPackages = with pkgs; [ bat etcher - exa + eza fd file lolcat @@ -90,7 +90,7 @@ with {inherit (lib) mkEnableOption mkIf mkMerge util;}; { colors = "${scripts.colors}"; edit = "sudo $EDITOR"; l = "ls --color --group-directories-first"; - ls = "exa -b -h -l -F --octal-permissions --icons --time-style iso"; + ls = "eza -b -h -l -F --octal-permissions --icons --time-style iso"; sike = "neofetch"; nixos-option = "nixos-option -I nixpkgs=${path.system}/lib/compat"; }; diff --git a/modules/user/security.nix b/modules/user/security.nix @@ -20,11 +20,11 @@ in { then (mkForce {}) else util.map.secrets ./passwords true; - users.extraUsers.root.passwordFile = + users.extraUsers.root.hashedPasswordFile = mkIf (hasAttr "root.secret" secrets) secrets."root.secret".path; users.users = mapAttrs (name: value: { - passwordFile = mkIf (!value.minimal) secrets."${name}.secret".path; + hashedPasswordFile = mkIf (!value.minimal) secrets."${name}.secret".path; }) settings; diff --git a/packages/dotfiles.nix b/packages/dotfiles.nix @@ -6,8 +6,8 @@ }: pkgs.stdenv.mkDerivation rec { pname = "Dotfiles"; - version = "v12"; - longVersion = "23.05"; + version = "v13"; + longVersion = "unstable"; src = files.path.toplevel; dontBuild = true; diff --git a/secrets/README.md b/secrets/README.md @@ -1,5 +1,5 @@ ### Credentials -The authentication credentials are managed using [`sops-nix`](https://github.com/Mic92/sops-nix) at `secrets`. The [`sops`](https://github.com/mozilla/sops) encrypted secrets (using GPG authentication) are stored at multiple places, like in this directory, as well as [`modules/user/passwords`](../modules/user/passwords). User passwords are made using the command `mkpasswd -m sha-512` and specified using the `passwordFile` option. The `sops` encrypted secrets are of `binary` format (and have the extension `.secret`) and can be conveniently managed using the [`nixos`](../scripts/README.md) `secret` command. The `keys` directory contains the _public_ User GPG Keys which are automatically imported +The authentication credentials are managed using [`sops-nix`](https://github.com/Mic92/sops-nix) at `secrets`. The [`sops`](https://github.com/mozilla/sops) encrypted secrets (using GPG authentication) are stored at multiple places, like in this directory, as well as [`modules/user/passwords`](../modules/user/passwords). User passwords are made using the command `mkpasswd -m sha-512` and specified using the `hashedPasswordFile` option. The `sops` encrypted secrets are of `binary` format (and have the extension `.secret`) and can be conveniently managed using the [`nixos`](../scripts/README.md) `secret` command. The `keys` directory contains the _public_ User GPG Keys which are automatically imported To create a secret, use the `nixos secret create` command, and append the directory along with requisite access permissions to the `.sops.yaml` file diff --git a/site/content/anime.md b/site/content/anime.md @@ -15,6 +15,7 @@ comments = true - Aharen-san wa Hakarenai - Akudama Drive - Ao can't Study +- Assassination Classroom <sup>#</sup> - BLUE LOCK <sup>\*</sup> - Bunny Girl Senpai - Chuunibyou demo Koi ga Shitai! <sup>#</sup> @@ -109,6 +110,7 @@ comments = true - Aishiteru Game wo Owarasetai <sup>\*</sup> - Ako to Bambi <sup>\*</sup> - Classroom of the Elite <sup>\*</sup> +- Fetiple - Fuufu Ijou, Koibito Miman <sup>\*</sup> - Horimiya - I want to end the game I love <sup>\*</sup> @@ -124,6 +126,9 @@ comments = true # Web Comic +- Down to Earth <sup>\*</sup> +- Maybe Meant to Be <sup>\*</sup> +- SubZero <sup>\*</sup> - The Beginning after the End <sup>\*</sup> # Wishlist diff --git a/site/sass/_main.scss b/site/sass/_main.scss @@ -8,8 +8,14 @@ html { body { background-color: var(--background); color: var(--color); - font-family: "JetBrainsMono", Menlo, DejaVu Sans Mono, Monaco, Consolas, - Ubuntu Mono, monospace; + font-family: + "JetBrainsMono", + Menlo, + DejaVu Sans Mono, + Monaco, + Consolas, + Ubuntu Mono, + monospace; font-feature-settings: "liga"; font-size: $font-size; line-height: 1.54; diff --git a/site/sass/_post.scss b/site/sass/_post.scss @@ -148,8 +148,14 @@ blockquote { background: var(--accent-alpha-20); border-radius: $corner-radius; color: var(--accent-secondary); - font-family: "JetBrainsMono", Menlo, DejaVu Sans Mono, Monaco, Consolas, - Ubuntu Mono, monospace; + font-family: + "JetBrainsMono", + Menlo, + DejaVu Sans Mono, + Monaco, + Consolas, + Ubuntu Mono, + monospace; font-feature-settings: normal; font-size: 0.95rem; margin: 0 2px; @@ -159,8 +165,14 @@ blockquote { pre { border: 1px solid var(--border-color); border-radius: $corner-radius; - font-family: "JetBrainsMono", Menlo, DejaVu Sans Mono, Monaco, Consolas, - Ubuntu Mono, monospace; + font-family: + "JetBrainsMono", + Menlo, + DejaVu Sans Mono, + Monaco, + Consolas, + Ubuntu Mono, + monospace; font-size: 0.95rem; overflow: auto; padding: 15px 10px; diff --git a/site/static/js/clipboard.js b/site/static/js/clipboard.js @@ -15,7 +15,7 @@ function addCopyButtons(clipboard) { }, function (error) { button.innerText = "Error"; - } + }, ); }); diff --git a/site/static/js/footnote.js b/site/static/js/footnote.js @@ -6,7 +6,7 @@ window.addEventListener("load", function () { } for (const footnote of document.getElementsByClassName( - "footnote-definition" + "footnote-definition", )) { const hash = footnote.id; const refhash = "ref:" + hash; diff --git a/site/static/js/katex.js b/site/static/js/katex.js @@ -41,7 +41,7 @@ n, function (e) { return t[e]; - }.bind(null, n) + }.bind(null, n), ); return a; }), @@ -207,7 +207,7 @@ (this.macros = t.macros || {}), (this.minRuleThickness = Math.max( 0, - c.deflt(t.minRuleThickness, 0) + c.deflt(t.minRuleThickness, 0), )), (this.colorIsTextColor = c.deflt(t.colorIsTextColor, !1)), (this.strict = c.deflt(t.strict, "warn")), @@ -231,7 +231,7 @@ " [" + t + "]", - r + r, ); "warn" === a ? "undefined" != typeof console && @@ -240,7 +240,7 @@ e + " [" + t + - "]" + "]", ) : "undefined" != typeof console && console.warn( @@ -250,7 +250,7 @@ e + " [" + t + - "]" + "]", ); } }), @@ -273,7 +273,7 @@ e + " [" + t + - "]" + "]", ), !1) : ("undefined" != typeof console && @@ -284,7 +284,7 @@ e + " [" + t + - "]" + "]", ), !1))) ); @@ -738,7 +738,7 @@ this.italic + "em"), this.classes.length > 0 && ((e = e || document.createElement("span")).className = T( - this.classes + this.classes, )), this.style)) this.style.hasOwnProperty(r) && @@ -779,7 +779,7 @@ (e.toNode = function () { var t = document.createElementNS( "http://www.w3.org/2000/svg", - "svg" + "svg", ); for (var e in this.attributes) Object.prototype.hasOwnProperty.call(this.attributes, e) && @@ -813,7 +813,7 @@ (e.toNode = function () { var t = document.createElementNS( "http://www.w3.org/2000/svg", - "path" + "path", ); return ( this.alternate @@ -839,7 +839,7 @@ (e.toNode = function () { var t = document.createElementNS( "http://www.w3.org/2000/svg", - "line" + "line", ); for (var e in this.attributes) Object.prototype.hasOwnProperty.call(this.attributes, e) && @@ -4002,7 +4002,7 @@ e + "' and mode '" + r + - "'" + "'", ), (i = new E(t, 0, 0, 0, 0, 0, n)); if (a) { @@ -4120,7 +4120,7 @@ return ( (a.height = Math.max( r || e.fontMetrics().defaultRuleThickness, - e.minRuleThickness + e.minRuleThickness, )), (a.style.borderBottomWidth = a.height + "em"), (a.maxFontSize = 1), @@ -4178,7 +4178,7 @@ else { if ("firstBaseline" !== t.positionType) throw new Error( - "Invalid positionType " + t.positionType + "." + "Invalid positionType " + t.positionType + ".", ); l = -u.elem.depth; } @@ -4295,7 +4295,7 @@ v, a, e, - i.concat("amsrm", e.fontWeight, e.fontShape) + i.concat("amsrm", e.fontWeight, e.fontShape), ); } if ("main" !== x && x) { @@ -4487,7 +4487,7 @@ }, { node: m }, u, - p + p, ), re( n, @@ -4504,7 +4504,7 @@ }, { node: m }, u, - p + p, ), n ); @@ -4647,7 +4647,7 @@ (e.toNode = function () { var t = document.createElementNS( "http://www.w3.org/1998/Math/MathML", - this.type + this.type, ); for (var e in this.attributes) Object.prototype.hasOwnProperty.call(this.attributes, e) && @@ -4730,7 +4730,7 @@ return document.createTextNode(this.character); var t = document.createElementNS( "http://www.w3.org/1998/Math/MathML", - "mspace" + "mspace", ); return t.setAttribute("width", this.width + "em"), t; }), @@ -5043,7 +5043,7 @@ x2: "100%", y2: "100%", "stroke-width": "0.046em", - }) + }), ), /^x?cancel$/.test(e) && s.push( @@ -5053,7 +5053,7 @@ x2: "100%", y2: "0", "stroke-width": "0.046em", - }) + }), ); var l = new L(s, { width: "100%", height: i + "em" }); n = Dt.makeSvgSpan([], [l], a); @@ -5122,7 +5122,7 @@ throw new Error( "Correct katexImagesData or update code here to support\n " + y + - " children." + " children.", ); (u = ["brace-left", "brace-center", "brace-right"]), (p = ["xMinYMin", "xMidYMin", "xMaxYMin"]); @@ -5161,7 +5161,7 @@ "Expected node of type " + e + ", but got " + - (t ? "node of type " + t.type : String(t)) + (t ? "node of type " + t.type : String(t)), ); return t; } @@ -5170,7 +5170,7 @@ if (!e) throw new Error( "Expected node of symbol group type, but got " + - (t ? "node of type " + t.type : String(t)) + (t ? "node of type " + t.type : String(t)), ); return e; } @@ -5185,7 +5185,7 @@ (n = (function (t) { if (t instanceof N) return t; throw new Error( - "Expected span<HtmlDomNode> but got " + String(t) + "." + "Expected span<HtmlDomNode> but got " + String(t) + ".", ); })(oe(t, e))), (t.base = a)) @@ -5219,7 +5219,7 @@ }, ], }, - e + e, )); else { var m, u; @@ -5229,8 +5229,8 @@ (m = Dt.makeOrd( { mode: a.mode, text: a.label }, e, - "textord" - )) + "textord", + )), )).italic = 0), (u = m.width)), (l = Dt.makeSpan(["accent-body"], [m])); @@ -5249,7 +5249,7 @@ { type: "elem", elem: l }, ], }, - e + e, )); } var f = Dt.makeSpan(["mord", "accent"], [l], e); @@ -5284,7 +5284,7 @@ .map(function (t) { return "\\" + t; }) - .join("|") + .join("|"), ); _t({ type: "accent", @@ -5395,7 +5395,7 @@ { type: "elem", elem: r }, ], }, - e + e, ); return Dt.makeSpan(["mord", "accentunder"], [i], e); }, @@ -5460,7 +5460,7 @@ t.below && ((n = e.havingStyle(a.sub())), (r = Dt.wrapFragment(oe(t.below, n, e), e)).classes.push( - "x-arrow-pad" + "x-arrow-pad", )); var o, s = Be(t, e), @@ -5482,7 +5482,7 @@ { type: "elem", elem: r, shift: m }, ], }, - e + e, ); } else o = Dt.makeVList( @@ -5493,7 +5493,7 @@ { type: "elem", elem: s, shift: l }, ], }, - e + e, ); return ( o.children[0].children[0].children[1].classes.push("svg-align"), @@ -5605,7 +5605,7 @@ !a.settings.displayMode || !a.settings.useStrictBehavior( "newLineInDisplayMode", - "In LaTeX, \\\\ or \\newline does nothing in display mode" + "In LaTeX, \\\\ or \\newline does nothing in display mode", )), { type: "cr", @@ -5702,7 +5702,7 @@ ) { if (1 !== (a = e.gullet.consumeArgs(1)[0]).length) throw new o( - 'Invalid argument number length "' + a.length + '"' + 'Invalid argument number length "' + a.length + '"', ); if (!/^[1-9]$/.test(a[0].text)) throw new o('Invalid argument number "' + a[0].text + '"'); @@ -5764,7 +5764,7 @@ var a = G((j.math[t] && j.math[t].replace) || t, e, r); if (!a) throw new Error( - "Unsupported symbol " + t + " and font size " + e + "." + "Unsupported symbol " + t + " and font size " + e + ".", ); return a; }, @@ -5797,7 +5797,7 @@ Dt.makeSpan(["delimsizing", "size" + e], [o], a), w.TEXT, a, - i + i, ); return r && Ge(s, a, w.TEXT), s; }, @@ -5809,7 +5809,7 @@ type: "elem", elem: Dt.makeSpan( ["delimsizinginner", a], - [Dt.makeSpan([], [Dt.makeSymbol(t, e, r)])] + [Dt.makeSpan([], [Dt.makeSymbol(t, e, r)])], ), } ); @@ -5935,7 +5935,7 @@ var R = a.havingBaseStyle(w.TEXT), E = Dt.makeVList( { positionType: "bottom", positionData: z, children: T }, - R + R, ); return Ue(Dt.makeSpan(["delimsizing", "mult"], [E], R), w.TEXT, a, i); }, @@ -6208,7 +6208,7 @@ o = n.sizeMultiplier, s = Math.max( 0, - e.minRuleThickness - e.fontMetrics().sqrtRuleThickness + e.minRuleThickness - e.fontMetrics().sqrtRuleThickness, ), l = 0, h = 0, @@ -6222,7 +6222,7 @@ (l = (1 + s + 0.08) / o), (m = 1e3 + 1e3 * s + 80), s, - e + e, )).style.minWidth = "0.853em"), (a = 0.833 / o)) : "large" === i.type @@ -6346,7 +6346,7 @@ r ? "Invalid delimiter '" + r.text + "' after '" + e.funcName + "'" : "Invalid delimiter type '" + t.type + "'", - t + t, ); } function ur(t) { @@ -6566,7 +6566,7 @@ { type: "elem", elem: n, shift: 0 }, ], }, - e + e, ) : Dt.makeVList( { @@ -6581,7 +6581,7 @@ }, ], }, - e + e, )), /cancel/.test(i) && ((a.height = n.height), (a.depth = n.depth)), /cancel/.test(i) && !l @@ -6593,7 +6593,7 @@ var r = 0, a = new ue.MathNode( t.label.indexOf("colorbox") > -1 ? "mpadded" : "menclose", - [ve(t.body, e)] + [ve(t.body, e)], ); switch (t.label) { case "\\cancel": @@ -6621,7 +6621,7 @@ var n = Math.max(e.fontMetrics().fboxrule, e.minRuleThickness); a.setAttribute( "style", - "border: " + n + "em solid " + String(t.borderColor) + "border: " + n + "em solid " + String(t.borderColor), ); } break; @@ -6903,7 +6903,7 @@ } (H = Dt.makeVList( { positionType: "individualShift", children: H }, - e + e, )), (H = Dt.makeSpan(["col-align-" + (R.align || "c")], [H])), O.push(H), @@ -6930,7 +6930,7 @@ } l = Dt.makeVList( { positionType: "individualShift", children: W }, - e + e, ); } return Dt.makeSpan(["mord"], [l], e); @@ -6944,9 +6944,9 @@ "mtr", t.map(function (t) { return new ue.MathNode("mtd", [ve(t, e)]); - }) + }), ); - }) + }), ), a = 0.5 === t.arraystretch @@ -6995,13 +6995,13 @@ "" !== n && (r = new ue.MathNode("menclose", [r])).setAttribute( "notation", - n.trim() + n.trim(), ), t.arraystretch && t.arraystretch < 1 && (r = new ue.MathNode("mstyle", [r])).setAttribute( "scriptlevel", - "1" + "1", ), r ); @@ -7030,7 +7030,7 @@ if (r < n) throw new o( "Too many math in a row: expected " + r + ", but got " + n, - t[0] + t[0], ); } }); @@ -7048,15 +7048,15 @@ props: { numArgs: 1 }, handler: function (t, e) { var r = { - cols: (Ne(e[0]) ? [e[0]] : Ce(e[0], "ordgroup").body).map(function ( - t - ) { - var e = qe(t).text; - if (-1 !== "lcr".indexOf(e)) return { type: "align", align: e }; - if ("|" === e) return { type: "separator", separator: "|" }; - if (":" === e) return { type: "separator", separator: ":" }; - throw new o("Unknown column alignment: " + e, t); - }), + cols: (Ne(e[0]) ? [e[0]] : Ce(e[0], "ordgroup").body).map( + function (t) { + var e = qe(t).text; + if (-1 !== "lcr".indexOf(e)) return { type: "align", align: e }; + if ("|" === e) return { type: "separator", separator: "|" }; + if (":" === e) return { type: "separator", separator: ":" }; + throw new o("Unknown column alignment: " + e, t); + }, + ), hskipBeforeAndAfter: !0, }; return vr(t.parser, r, br(t.envName)); @@ -7120,7 +7120,7 @@ var e = qe(t).text; if (-1 !== "lc".indexOf(e)) return { type: "align", align: e }; throw new o("Unknown column alignment: " + e, t); - } + }, ); if (r.length > 1) throw new o("{subarray} can contain only one column"); @@ -7149,7 +7149,7 @@ { type: "align", align: "l", pregap: 0, postgap: 0 }, ], }, - br(t.envName) + br(t.envName), ); return { type: "leftright", @@ -7179,7 +7179,7 @@ return vr( t.parser, { cols: [{ type: "align", align: "c" }], addJot: !0 }, - "display" + "display", ); }, htmlBuilder: yr, @@ -7228,7 +7228,7 @@ if (f.name !== i) throw new o( "Mismatch: \\begin{" + i + "} matched by \\end{" + f.name + "}", - d + d, ); return p; } @@ -7509,7 +7509,7 @@ { type: "elem", elem: o, shift: -u }, ], }, - e + e, ); } else { var S = u - o.depth - (b.height - d); @@ -7522,7 +7522,7 @@ { type: "elem", elem: o, shift: -u }, ], }, - e + e, )); } return ( @@ -7545,7 +7545,7 @@ Dt.makeSpan( ["mord"].concat(r.sizingClasses(e)), [x, Dt.makeSpan(["mfrac"], [f]), v], - e + e, ) ); }, @@ -7810,7 +7810,7 @@ { type: "elem", elem: s }, ], }, - e + e, )).children[0].children[0].children[1].classes.push("svg-align") : (i = Dt.makeVList( { @@ -7822,7 +7822,7 @@ { type: "elem", elem: o }, ], }, - e + e, )).children[0].children[0].children[0].classes.push("svg-align"), r) ) { @@ -7837,7 +7837,7 @@ { type: "elem", elem: r }, ], }, - e + e, ) : Dt.makeVList( { @@ -7849,7 +7849,7 @@ { type: "elem", elem: l }, ], }, - e + e, ); } return Dt.makeSpan(["mord", a.isOver ? "mover" : "munder"], [i], e); @@ -7942,7 +7942,7 @@ a.settings.strict && a.settings.reportNonstrict( "htmlExtension", - "HTML extension is disabled on strict mode" + "HTML extension is disabled on strict mode", ); var l = {}; switch (n) { @@ -8056,7 +8056,7 @@ break; default: throw new o( - "Invalid key: '" + c[0] + "' in \\includegraphics." + "Invalid key: '" + c[0] + "' in \\includegraphics.", ); } } @@ -8066,7 +8066,7 @@ "" === l && (l = (l = (l = p).replace(/^.*[\\/]/, "")).substring( 0, - l.lastIndexOf(".") + l.lastIndexOf("."), )), a.settings.isTrusted({ command: "\\includegraphics", url: p }) ? { @@ -8130,17 +8130,17 @@ a + " supports only mu units, not " + n.value.unit + - " units" + " units", ), "math" !== r.mode && r.settings.reportNonstrict( "mathVsTextUnits", - "LaTeX's " + a + " works only in math mode" + "LaTeX's " + a + " works only in math mode", )) : o && r.settings.reportNonstrict( "mathVsTextUnits", - "LaTeX's " + a + " doesn't support mu units" + "LaTeX's " + a + " doesn't support mu units", ); } return { type: "kern", mode: r.mode, dimension: n.value }; @@ -8266,7 +8266,7 @@ elem: m, kern: Math.max( a.fontMetrics().bigOpSpacing1, - a.fontMetrics().bigOpSpacing3 - m.depth + a.fontMetrics().bigOpSpacing3 - m.depth, ), }; } @@ -8276,7 +8276,7 @@ elem: c, kern: Math.max( a.fontMetrics().bigOpSpacing2, - a.fontMetrics().bigOpSpacing4 - c.height + a.fontMetrics().bigOpSpacing4 - c.height, ), }; } @@ -8302,7 +8302,7 @@ { type: "kern", size: a.fontMetrics().bigOpSpacing5 }, ], }, - a + a, ); } else if (s) { var p = t.height - o; @@ -8317,7 +8317,7 @@ { type: "elem", elem: t }, ], }, - a + a, ); } else { if (!l) return t; @@ -8333,7 +8333,7 @@ { type: "kern", size: a.fontMetrics().bigOpSpacing5 }, ], }, - a + a, ); } return Dt.makeSpan(["mop", "op-limits"], [h], a); @@ -8380,7 +8380,7 @@ { type: "elem", elem: p, shift: l ? 0.08 : 0 }, ], }, - e + e, )), (n.name = "\\" + m), o.classes.unshift("mop"), @@ -8776,7 +8776,7 @@ { type: "kern", size: n }, ], }, - e + e, ); return Dt.makeSpan(["mord", "overline"], [i], e); }, @@ -8825,7 +8825,7 @@ positionType: "firstBaseline", children: [{ type: "elem", elem: r }], }, - e + e, )), Dt.makeSpan(["mord"], [r], e) ); @@ -8879,7 +8879,7 @@ positionData: -a, children: [{ type: "elem", elem: r }], }, - e + e, ); }, mathmlBuilder: function (t, e) { @@ -9029,7 +9029,7 @@ positionType: "firstBaseline", children: [{ type: "elem", elem: r }], }, - e + e, ); return Dt.makeSpan(["mord"], [i], e); }, @@ -9080,7 +9080,7 @@ { type: "kern", size: h }, ], }, - e + e, ); if (t.index) { var d = e.havingStyle(w.SCRIPTSCRIPT), @@ -9092,7 +9092,7 @@ positionData: -g, children: [{ type: "elem", elem: f }], }, - e + e, ), v = Dt.makeSpan(["root"], [x]); return Dt.makeSpan(["mord", "sqrt"], [v, p], e); @@ -9243,14 +9243,14 @@ ]; x = Dt.makeVList( { positionType: "individualShift", children: z }, - e + e, ); } else if (n) { p = Math.max(p, m.sub1, n.height - 0.8 * m.xHeight); var A = [{ type: "elem", elem: n, marginLeft: y, marginRight: b }]; x = Dt.makeVList( { positionType: "shift", positionData: p, children: A }, - e + e, ); } else { if (!a) throw new Error("supsub must have either sup or sub."); @@ -9261,7 +9261,7 @@ positionData: -u, children: [{ type: "elem", elem: a, marginRight: b }], }, - e + e, )); } var T = ne(h, "right") || "mord"; @@ -9399,7 +9399,7 @@ return Dt.makeSpan( ["mspace", r], [Dt.mathsym(t.text, t.mode, e)], - e + e, ); } if (Kr.hasOwnProperty(t.text)) @@ -9508,7 +9508,7 @@ { type: "elem", elem: r }, ], }, - e + e, ); return Dt.makeSpan(["mord", "underline"], [i], e); }, @@ -9525,7 +9525,7 @@ props: { numArgs: 0, allowedInText: !0 }, handler: function (t, e, r) { throw new o( - "\\verb ended by end of line instead of matching delimiter" + "\\verb ended by end of line instead of matching delimiter", ); }, htmlBuilder: function (t, e) { @@ -9540,13 +9540,13 @@ Dt.makeSymbol(o, "Typewriter-Regular", t.mode, n, [ "mord", "texttt", - ]) + ]), ); } return Dt.makeSpan( ["mord", "text"].concat(n.sizingClasses(e)), Dt.tryCombineChars(a), - n + n, ); }, mathmlBuilder: function (t, e) { @@ -9587,7 +9587,7 @@ if (null === r || r.index !== e) throw new o( "Unexpected character: '" + t[e] + "'", - new n(t[e], new a(this, e, e + 1)) + new n(t[e], new a(this, e, e + 1)), ); var i = r[2] || " "; if (14 === this.catcodes[i]) { @@ -9597,7 +9597,7 @@ ? ((this.tokenRegex.lastIndex = t.length), this.settings.reportNonstrict( "commentAtEnd", - "% comment has no terminating newline; LaTeX would fail because of commenting the end of math mode (e.g. $)" + "% comment has no terminating newline; LaTeX would fail because of commenting the end of math mode (e.g. $)", )) : (this.tokenRegex.lastIndex = s + 1), this.lex() @@ -9631,7 +9631,7 @@ (e.endGroup = function () { if (0 === this.undefStack.length) throw new o( - "Unbalanced namespace destruction: attempt to pop global namespace; please report this as a bug" + "Unbalanced namespace destruction: attempt to pop global namespace; please report this as a bug", ); var t = this.undefStack.pop(); for (var e in t) @@ -9760,7 +9760,7 @@ n + "} attempting to redefine " + n + - "; use \\renewcommand" + "; use \\renewcommand", ); if (!i && !r) throw new o( @@ -9768,7 +9768,7 @@ n + "} when command " + n + - " does not yet exist; use \\newcommand" + " does not yet exist; use \\newcommand", ); var s = 0; if (1 === (a = t.consumeArgs(1)[0]).length && "[" === a[0].text) { @@ -9802,7 +9802,7 @@ .map(function (t) { return t.text; }) - .join("") + .join(""), ), "" ); @@ -9816,7 +9816,7 @@ .map(function (t) { return t.text; }) - .join("") + .join(""), ), "" ); @@ -9837,11 +9837,11 @@ pa("\\textcopyright", "\\html@mathml{\\textcircled{c}}{\\char`\xa9}"), pa( "\\copyright", - "\\TextOrMath{\\textcopyright}{\\text{\\textcopyright}}" + "\\TextOrMath{\\textcopyright}{\\text{\\textcopyright}}", ), pa( "\\textregistered", - "\\html@mathml{\\textcircled{\\scriptsize R}}{\\char`\xae}" + "\\html@mathml{\\textcircled{\\scriptsize R}}{\\char`\xae}", ), pa("\u212c", "\\mathscr{B}"), pa("\u2130", "\\mathscr{E}"), @@ -9862,42 +9862,42 @@ pa("\\not", '\\html@mathml{\\mathrel{\\mathrlap\\@not}}{\\char"338}'), pa( "\\neq", - "\\html@mathml{\\mathrel{\\not=}}{\\mathrel{\\char`\u2260}}" + "\\html@mathml{\\mathrel{\\not=}}{\\mathrel{\\char`\u2260}}", ), pa("\\ne", "\\neq"), pa("\u2260", "\\neq"), pa( "\\notin", - "\\html@mathml{\\mathrel{{\\in}\\mathllap{/\\mskip1mu}}}{\\mathrel{\\char`\u2209}}" + "\\html@mathml{\\mathrel{{\\in}\\mathllap{/\\mskip1mu}}}{\\mathrel{\\char`\u2209}}", ), pa("\u2209", "\\notin"), pa( "\u2258", - "\\html@mathml{\\mathrel{=\\kern{-1em}\\raisebox{0.4em}{$\\scriptsize\\frown$}}}{\\mathrel{\\char`\u2258}}" + "\\html@mathml{\\mathrel{=\\kern{-1em}\\raisebox{0.4em}{$\\scriptsize\\frown$}}}{\\mathrel{\\char`\u2258}}", ), pa( "\u2259", - "\\html@mathml{\\stackrel{\\tiny\\wedge}{=}}{\\mathrel{\\char`\u2258}}" + "\\html@mathml{\\stackrel{\\tiny\\wedge}{=}}{\\mathrel{\\char`\u2258}}", ), pa( "\u225a", - "\\html@mathml{\\stackrel{\\tiny\\vee}{=}}{\\mathrel{\\char`\u225a}}" + "\\html@mathml{\\stackrel{\\tiny\\vee}{=}}{\\mathrel{\\char`\u225a}}", ), pa( "\u225b", - "\\html@mathml{\\stackrel{\\scriptsize\\star}{=}}{\\mathrel{\\char`\u225b}}" + "\\html@mathml{\\stackrel{\\scriptsize\\star}{=}}{\\mathrel{\\char`\u225b}}", ), pa( "\u225d", - "\\html@mathml{\\stackrel{\\tiny\\mathrm{def}}{=}}{\\mathrel{\\char`\u225d}}" + "\\html@mathml{\\stackrel{\\tiny\\mathrm{def}}{=}}{\\mathrel{\\char`\u225d}}", ), pa( "\u225e", - "\\html@mathml{\\stackrel{\\tiny\\mathrm{m}}{=}}{\\mathrel{\\char`\u225e}}" + "\\html@mathml{\\stackrel{\\tiny\\mathrm{m}}{=}}{\\mathrel{\\char`\u225e}}", ), pa( "\u225f", - "\\html@mathml{\\stackrel{\\tiny?}{=}}{\\mathrel{\\char`\u225f}}" + "\\html@mathml{\\stackrel{\\tiny?}{=}}{\\mathrel{\\char`\u225f}}", ), pa("\u27c2", "\\perp"), pa("\u203c", "\\mathclose{!\\mkern-0.8mu!}"), @@ -9929,7 +9929,7 @@ pa("\\substack", "\\begin{subarray}{c}#1\\end{subarray}"), pa( "\\colon", - "\\nobreak\\mskip2mu\\mathpunct{}\\mathchoice{\\mkern-3mu}{\\mkern-3mu}{}{}{:}\\mskip6mu" + "\\nobreak\\mskip2mu\\mathpunct{}\\mathchoice{\\mkern-3mu}{\\mkern-3mu}{}{}{:}\\mskip6mu", ), pa("\\boxed", "\\fbox{$\\displaystyle{#1}$}"), pa("\\iff", "\\DOTSB\\;\\Longleftrightarrow\\;"), @@ -10060,25 +10060,25 @@ }), pa( "\\bmod", - "\\mathchoice{\\mskip1mu}{\\mskip1mu}{\\mskip5mu}{\\mskip5mu}\\mathbin{\\rm mod}\\mathchoice{\\mskip1mu}{\\mskip1mu}{\\mskip5mu}{\\mskip5mu}" + "\\mathchoice{\\mskip1mu}{\\mskip1mu}{\\mskip5mu}{\\mskip5mu}\\mathbin{\\rm mod}\\mathchoice{\\mskip1mu}{\\mskip1mu}{\\mskip5mu}{\\mskip5mu}", ), pa( "\\pod", - "\\allowbreak\\mathchoice{\\mkern18mu}{\\mkern8mu}{\\mkern8mu}{\\mkern8mu}(#1)" + "\\allowbreak\\mathchoice{\\mkern18mu}{\\mkern8mu}{\\mkern8mu}{\\mkern8mu}(#1)", ), pa("\\pmod", "\\pod{{\\rm mod}\\mkern6mu#1}"), pa( "\\mod", - "\\allowbreak\\mathchoice{\\mkern18mu}{\\mkern12mu}{\\mkern12mu}{\\mkern12mu}{\\rm mod}\\,\\,#1" + "\\allowbreak\\mathchoice{\\mkern18mu}{\\mkern12mu}{\\mkern12mu}{\\mkern12mu}{\\rm mod}\\,\\,#1", ), pa( "\\pmb", - "\\html@mathml{\\@binrel{#1}{\\mathrlap{#1}\\kern0.5px#1}}{\\mathbf{#1}}" + "\\html@mathml{\\@binrel{#1}{\\mathrlap{#1}\\kern0.5px#1}}{\\mathbf{#1}}", ), pa("\\\\", "\\newline"), pa( "\\TeX", - "\\textrm{\\html@mathml{T\\kern-.1667em\\raisebox{-.5ex}{E}\\kern-.125emX}{TeX}}" + "\\textrm{\\html@mathml{T\\kern-.1667em\\raisebox{-.5ex}{E}\\kern-.125emX}{TeX}}", ); var va = F["Main-Regular"]["T".charCodeAt(0)][1] - @@ -10088,13 +10088,13 @@ "\\LaTeX", "\\textrm{\\html@mathml{L\\kern-.36em\\raisebox{" + va + - "}{\\scriptstyle A}\\kern-.15em\\TeX}{LaTeX}}" + "}{\\scriptstyle A}\\kern-.15em\\TeX}{LaTeX}}", ), pa( "\\KaTeX", "\\textrm{\\html@mathml{K\\kern-.17em\\raisebox{" + va + - "}{\\scriptstyle A}\\kern-.15em\\TeX}{KaTeX}}" + "}{\\scriptstyle A}\\kern-.15em\\TeX}{KaTeX}}", ), pa("\\hspace", "\\@ifstar\\@hspacer\\@hspace"), pa("\\@hspace", "\\hskip #1\\relax"), @@ -10103,55 +10103,55 @@ pa("\\vcentcolon", "\\mathrel{\\mathop\\ordinarycolon}"), pa( "\\dblcolon", - '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-.9mu}\\vcentcolon}}{\\mathop{\\char"2237}}' + '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-.9mu}\\vcentcolon}}{\\mathop{\\char"2237}}', ), pa( "\\coloneqq", - '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}=}}{\\mathop{\\char"2254}}' + '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}=}}{\\mathop{\\char"2254}}', ), pa( "\\Coloneqq", - '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}=}}{\\mathop{\\char"2237\\char"3d}}' + '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}=}}{\\mathop{\\char"2237\\char"3d}}', ), pa( "\\coloneq", - '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\mathrel{-}}}{\\mathop{\\char"3a\\char"2212}}' + '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\mathrel{-}}}{\\mathop{\\char"3a\\char"2212}}', ), pa( "\\Coloneq", - '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\mathrel{-}}}{\\mathop{\\char"2237\\char"2212}}' + '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\mathrel{-}}}{\\mathop{\\char"2237\\char"2212}}', ), pa( "\\eqqcolon", - '\\html@mathml{\\mathrel{=\\mathrel{\\mkern-1.2mu}\\vcentcolon}}{\\mathop{\\char"2255}}' + '\\html@mathml{\\mathrel{=\\mathrel{\\mkern-1.2mu}\\vcentcolon}}{\\mathop{\\char"2255}}', ), pa( "\\Eqqcolon", - '\\html@mathml{\\mathrel{=\\mathrel{\\mkern-1.2mu}\\dblcolon}}{\\mathop{\\char"3d\\char"2237}}' + '\\html@mathml{\\mathrel{=\\mathrel{\\mkern-1.2mu}\\dblcolon}}{\\mathop{\\char"3d\\char"2237}}', ), pa( "\\eqcolon", - '\\html@mathml{\\mathrel{\\mathrel{-}\\mathrel{\\mkern-1.2mu}\\vcentcolon}}{\\mathop{\\char"2239}}' + '\\html@mathml{\\mathrel{\\mathrel{-}\\mathrel{\\mkern-1.2mu}\\vcentcolon}}{\\mathop{\\char"2239}}', ), pa( "\\Eqcolon", - '\\html@mathml{\\mathrel{\\mathrel{-}\\mathrel{\\mkern-1.2mu}\\dblcolon}}{\\mathop{\\char"2212\\char"2237}}' + '\\html@mathml{\\mathrel{\\mathrel{-}\\mathrel{\\mkern-1.2mu}\\dblcolon}}{\\mathop{\\char"2212\\char"2237}}', ), pa( "\\colonapprox", - '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\approx}}{\\mathop{\\char"3a\\char"2248}}' + '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\approx}}{\\mathop{\\char"3a\\char"2248}}', ), pa( "\\Colonapprox", - '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\approx}}{\\mathop{\\char"2237\\char"2248}}' + '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\approx}}{\\mathop{\\char"2237\\char"2248}}', ), pa( "\\colonsim", - '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\sim}}{\\mathop{\\char"3a\\char"223c}}' + '\\html@mathml{\\mathrel{\\vcentcolon\\mathrel{\\mkern-1.2mu}\\sim}}{\\mathop{\\char"3a\\char"223c}}', ), pa( "\\Colonsim", - '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\sim}}{\\mathop{\\char"2237\\char"223c}}' + '\\html@mathml{\\mathrel{\\dblcolon\\mathrel{\\mkern-1.2mu}\\sim}}{\\mathop{\\char"2237\\char"223c}}', ), pa("\u2237", "\\dblcolon"), pa("\u2239", "\\eqcolon"), @@ -10172,19 +10172,19 @@ pa("\\coloncolonsim", "\\Colonsim"), pa( "\\simcolon", - "\\mathrel{\\sim\\mathrel{\\mkern-1.2mu}\\vcentcolon}" + "\\mathrel{\\sim\\mathrel{\\mkern-1.2mu}\\vcentcolon}", ), pa( "\\simcoloncolon", - "\\mathrel{\\sim\\mathrel{\\mkern-1.2mu}\\dblcolon}" + "\\mathrel{\\sim\\mathrel{\\mkern-1.2mu}\\dblcolon}", ), pa( "\\approxcolon", - "\\mathrel{\\approx\\mathrel{\\mkern-1.2mu}\\vcentcolon}" + "\\mathrel{\\approx\\mathrel{\\mkern-1.2mu}\\vcentcolon}", ), pa( "\\approxcoloncolon", - "\\mathrel{\\approx\\mathrel{\\mkern-1.2mu}\\dblcolon}" + "\\mathrel{\\approx\\mathrel{\\mkern-1.2mu}\\dblcolon}", ), pa("\\notni", "\\html@mathml{\\not\\ni}{\\mathrel{\\char`\u220c}}"), pa("\\limsup", "\\DOTSB\\operatorname*{lim\\,sup}"), @@ -10207,27 +10207,27 @@ pa("\\jmath", "\\html@mathml{\\@jmath}{\u0237}"), pa( "\\llbracket", - "\\html@mathml{\\mathopen{[\\mkern-3.2mu[}}{\\mathopen{\\char`\u27e6}}" + "\\html@mathml{\\mathopen{[\\mkern-3.2mu[}}{\\mathopen{\\char`\u27e6}}", ), pa( "\\rrbracket", - "\\html@mathml{\\mathclose{]\\mkern-3.2mu]}}{\\mathclose{\\char`\u27e7}}" + "\\html@mathml{\\mathclose{]\\mkern-3.2mu]}}{\\mathclose{\\char`\u27e7}}", ), pa("\u27e6", "\\llbracket"), pa("\u27e7", "\\rrbracket"), pa( "\\lBrace", - "\\html@mathml{\\mathopen{\\{\\mkern-3.2mu[}}{\\mathopen{\\char`\u2983}}" + "\\html@mathml{\\mathopen{\\{\\mkern-3.2mu[}}{\\mathopen{\\char`\u2983}}", ), pa( "\\rBrace", - "\\html@mathml{\\mathclose{]\\mkern-3.2mu\\}}}{\\mathclose{\\char`\u2984}}" + "\\html@mathml{\\mathclose{]\\mkern-3.2mu\\}}}{\\mathclose{\\char`\u2984}}", ), pa("\u2983", "\\lBrace"), pa("\u2984", "\\rBrace"), pa( "\\minuso", - "\\mathbin{\\html@mathml{{\\mathrlap{\\mathchoice{\\kern{0.145em}}{\\kern{0.145em}}{\\kern{0.1015em}}{\\kern{0.0725em}}\\circ}{-}}}{\\char`\u29b5}}" + "\\mathbin{\\html@mathml{{\\mathrlap{\\mathchoice{\\kern{0.145em}}{\\kern{0.145em}}{\\kern{0.1015em}}{\\kern{0.0725em}}\\circ}{-}}}{\\char`\u29b5}}", ), pa("\u29b5", "\\minuso"), pa("\\darr", "\\downarrow"), @@ -10450,7 +10450,7 @@ this.expansionCount > this.settings.maxExpand) ) throw new o( - "Too many expansions: infinite loop or need to increase maxExpand setting" + "Too many expansions: infinite loop or need to increase maxExpand setting", ); var n = a.tokens; if (a.numArgs) @@ -10465,7 +10465,7 @@ if (0 === s) throw new o( "Incomplete placeholder at end of macro body", - l + l, ); if ("#" === (l = n[--s]).text) n.splice(s + 1, 1); else { @@ -10912,7 +10912,7 @@ if ((void 0 === e && (e = !0), this.fetch().text !== t)) throw new o( "Expected '" + t + "', got '" + this.fetch().text + "'", - this.fetch() + this.fetch(), ); e && this.consume(); }), @@ -10962,7 +10962,7 @@ if (-1 !== r) throw new o( "only one infix operator per group", - t[a].token + t[a].token, ); (r = a), (e = t[a].replaceWith); } @@ -10999,7 +10999,7 @@ t.SUPSUB_GREEDINESS, void 0, void 0, - !0 + !0, ); if (!n) throw new o("Expected group after '" + a + "'", r); return n; @@ -11035,7 +11035,7 @@ ) throw new o( "Limit controls must follow a math operator", - n + n, ); var s = "\\limits" === n.text; a.limits = s; @@ -11074,7 +11074,7 @@ n + "' with no arguments" + (e ? " as " + e : ""), - a + a, ); if ("text" === this.mode && !i.allowedInText) throw new o("Can't use function '" + n + "' in text mode", a); @@ -11108,7 +11108,7 @@ l, h, a, - m + m, ); if (!c) { if (h) { @@ -11181,7 +11181,7 @@ case "EOF": throw new o( "Unexpected end of input in " + t, - m.range(u, h) + m.range(u, h), ); case a: c++; @@ -11226,7 +11226,7 @@ ? this.parseStringGroup("size", t) : this.parseRegexGroup( /^[-+]? *(?:$|\d+|\d+\.\d*|\.\d*) *[a-z]{0,2} *$/, - "size" + "size", )) ) return null; @@ -11322,7 +11322,7 @@ r.length < 2 || r.charAt(0) !== r.slice(-1)) ) throw new o( - "\\verb assertion failed --\n please report what input caused this bug" + "\\verb assertion failed --\n please report what input caused this bug", ); return { type: "verb", @@ -11340,7 +11340,7 @@ 'Accented Unicode text character "' + e[0] + '" used in math mode', - t + t, ), (e = ka[e[0]] + e.substr(1))); var i, @@ -11360,7 +11360,7 @@ 'Latin-1/Unicode text character "' + e[0] + '" used in math mode', - t + t, ); var l, h = j[this.mode][e].group, @@ -11386,7 +11386,7 @@ 'Unicode text character "' + e[0] + '" used in math mode', - t + t, ) : this.settings.reportNonstrict( "unknownSymbol", @@ -11395,7 +11395,7 @@ '" (' + e.charCodeAt(0) + ")", - t + t, )), (i = { type: "textord", @@ -11412,7 +11412,7 @@ if (!d) throw new o( "Accent " + p + " unsupported in " + this.mode + " mode", - t + t, ); i = { type: "accent", @@ -11455,7 +11455,7 @@ "CSS1Compat" !== document.compatMode && ("undefined" != typeof console && console.warn( - "Warning: KaTeX doesn't work in quirks mode. Make sure your website has a suitable doctype." + "Warning: KaTeX doesn't work in quirks mode. Make sure your website has a suitable doctype.", ), (za = function () { throw new o("KaTeX doesn't work in quirks mode."); diff --git a/site/static/js/mobile.js b/site/static/js/mobile.js @@ -8,7 +8,7 @@ menu_more = document.querySelector(".menu-inner-list-more"), page_form = document.querySelector(".pagination__form"), phone_width = getComputedStyle(document.body).getPropertyValue( - "--phoneWidth" + "--phoneWidth", ), is_phone = function () { return window.matchMedia(phone_width).matches; diff --git a/site/static/js/search.js b/site/static/js/search.js @@ -157,7 +157,7 @@ function initSearch() { item.innerHTML = formatSearchResultItem(results[i], term.split(" ")); $searchResultsItems.appendChild(item); } - }, 150) + }, 150), ); window.addEventListener("click", function (e) { diff --git a/site/static/js/theme.js b/site/static/js/theme.js @@ -28,7 +28,7 @@ } updateThemeSelect( document.querySelectorAll(`.${STYLESHEET_CLASSNAME}`)[0].id, - true + true, ); showBody(); }; diff --git a/site/static/math/auto-render.js b/site/static/math/auto-render.js @@ -41,7 +41,7 @@ o, function (t) { return e[t]; - }.bind(null, o) + }.bind(null, o), ); return n; }), @@ -145,7 +145,7 @@ "KaTeX auto-render: Failed to parse `" + r[a].data + "` with ", - e + e, ), n.appendChild(document.createTextNode(r[a].rawData)); continue; diff --git a/site/static/math/katex.css b/site/static/math/katex.css @@ -1,6 +1,7 @@ @font-face { font-family: KaTeX_AMS; - src: url(fonts/KaTeX_AMS-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_AMS-Regular.woff2) format("woff2"), url(fonts/KaTeX_AMS-Regular.woff) format("woff"), url(fonts/KaTeX_AMS-Regular.ttf) format("truetype"); font-weight: 400; @@ -8,7 +9,8 @@ } @font-face { font-family: KaTeX_Caligraphic; - src: url(fonts/KaTeX_Caligraphic-Bold.woff2) format("woff2"), + src: + url(fonts/KaTeX_Caligraphic-Bold.woff2) format("woff2"), url(fonts/KaTeX_Caligraphic-Bold.woff) format("woff"), url(fonts/KaTeX_Caligraphic-Bold.ttf) format("truetype"); font-weight: 700; @@ -16,7 +18,8 @@ } @font-face { font-family: KaTeX_Caligraphic; - src: url(fonts/KaTeX_Caligraphic-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Caligraphic-Regular.woff2) format("woff2"), url(fonts/KaTeX_Caligraphic-Regular.woff) format("woff"), url(fonts/KaTeX_Caligraphic-Regular.ttf) format("truetype"); font-weight: 400; @@ -24,7 +27,8 @@ } @font-face { font-family: KaTeX_Fraktur; - src: url(fonts/KaTeX_Fraktur-Bold.woff2) format("woff2"), + src: + url(fonts/KaTeX_Fraktur-Bold.woff2) format("woff2"), url(fonts/KaTeX_Fraktur-Bold.woff) format("woff"), url(fonts/KaTeX_Fraktur-Bold.ttf) format("truetype"); font-weight: 700; @@ -32,7 +36,8 @@ } @font-face { font-family: KaTeX_Fraktur; - src: url(fonts/KaTeX_Fraktur-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Fraktur-Regular.woff2) format("woff2"), url(fonts/KaTeX_Fraktur-Regular.woff) format("woff"), url(fonts/KaTeX_Fraktur-Regular.ttf) format("truetype"); font-weight: 400; @@ -40,7 +45,8 @@ } @font-face { font-family: KaTeX_Main; - src: url(fonts/KaTeX_Main-Bold.woff2) format("woff2"), + src: + url(fonts/KaTeX_Main-Bold.woff2) format("woff2"), url(fonts/KaTeX_Main-Bold.woff) format("woff"), url(fonts/KaTeX_Main-Bold.ttf) format("truetype"); font-weight: 700; @@ -48,7 +54,8 @@ } @font-face { font-family: KaTeX_Main; - src: url(fonts/KaTeX_Main-BoldItalic.woff2) format("woff2"), + src: + url(fonts/KaTeX_Main-BoldItalic.woff2) format("woff2"), url(fonts/KaTeX_Main-BoldItalic.woff) format("woff"), url(fonts/KaTeX_Main-BoldItalic.ttf) format("truetype"); font-weight: 700; @@ -56,7 +63,8 @@ } @font-face { font-family: KaTeX_Main; - src: url(fonts/KaTeX_Main-Italic.woff2) format("woff2"), + src: + url(fonts/KaTeX_Main-Italic.woff2) format("woff2"), url(fonts/KaTeX_Main-Italic.woff) format("woff"), url(fonts/KaTeX_Main-Italic.ttf) format("truetype"); font-weight: 400; @@ -64,7 +72,8 @@ } @font-face { font-family: KaTeX_Main; - src: url(fonts/KaTeX_Main-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Main-Regular.woff2) format("woff2"), url(fonts/KaTeX_Main-Regular.woff) format("woff"), url(fonts/KaTeX_Main-Regular.ttf) format("truetype"); font-weight: 400; @@ -72,7 +81,8 @@ } @font-face { font-family: KaTeX_Math; - src: url(fonts/KaTeX_Math-BoldItalic.woff2) format("woff2"), + src: + url(fonts/KaTeX_Math-BoldItalic.woff2) format("woff2"), url(fonts/KaTeX_Math-BoldItalic.woff) format("woff"), url(fonts/KaTeX_Math-BoldItalic.ttf) format("truetype"); font-weight: 700; @@ -80,7 +90,8 @@ } @font-face { font-family: KaTeX_Math; - src: url(fonts/KaTeX_Math-Italic.woff2) format("woff2"), + src: + url(fonts/KaTeX_Math-Italic.woff2) format("woff2"), url(fonts/KaTeX_Math-Italic.woff) format("woff"), url(fonts/KaTeX_Math-Italic.ttf) format("truetype"); font-weight: 400; @@ -88,7 +99,8 @@ } @font-face { font-family: "KaTeX_SansSerif"; - src: url(fonts/KaTeX_SansSerif-Bold.woff2) format("woff2"), + src: + url(fonts/KaTeX_SansSerif-Bold.woff2) format("woff2"), url(fonts/KaTeX_SansSerif-Bold.woff) format("woff"), url(fonts/KaTeX_SansSerif-Bold.ttf) format("truetype"); font-weight: 700; @@ -96,7 +108,8 @@ } @font-face { font-family: "KaTeX_SansSerif"; - src: url(fonts/KaTeX_SansSerif-Italic.woff2) format("woff2"), + src: + url(fonts/KaTeX_SansSerif-Italic.woff2) format("woff2"), url(fonts/KaTeX_SansSerif-Italic.woff) format("woff"), url(fonts/KaTeX_SansSerif-Italic.ttf) format("truetype"); font-weight: 400; @@ -104,7 +117,8 @@ } @font-face { font-family: "KaTeX_SansSerif"; - src: url(fonts/KaTeX_SansSerif-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_SansSerif-Regular.woff2) format("woff2"), url(fonts/KaTeX_SansSerif-Regular.woff) format("woff"), url(fonts/KaTeX_SansSerif-Regular.ttf) format("truetype"); font-weight: 400; @@ -112,7 +126,8 @@ } @font-face { font-family: KaTeX_Script; - src: url(fonts/KaTeX_Script-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Script-Regular.woff2) format("woff2"), url(fonts/KaTeX_Script-Regular.woff) format("woff"), url(fonts/KaTeX_Script-Regular.ttf) format("truetype"); font-weight: 400; @@ -120,7 +135,8 @@ } @font-face { font-family: KaTeX_Size1; - src: url(fonts/KaTeX_Size1-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Size1-Regular.woff2) format("woff2"), url(fonts/KaTeX_Size1-Regular.woff) format("woff"), url(fonts/KaTeX_Size1-Regular.ttf) format("truetype"); font-weight: 400; @@ -128,7 +144,8 @@ } @font-face { font-family: KaTeX_Size2; - src: url(fonts/KaTeX_Size2-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Size2-Regular.woff2) format("woff2"), url(fonts/KaTeX_Size2-Regular.woff) format("woff"), url(fonts/KaTeX_Size2-Regular.ttf) format("truetype"); font-weight: 400; @@ -136,7 +153,8 @@ } @font-face { font-family: KaTeX_Size3; - src: url(fonts/KaTeX_Size3-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Size3-Regular.woff2) format("woff2"), url(fonts/KaTeX_Size3-Regular.woff) format("woff"), url(fonts/KaTeX_Size3-Regular.ttf) format("truetype"); font-weight: 400; @@ -144,7 +162,8 @@ } @font-face { font-family: KaTeX_Size4; - src: url(fonts/KaTeX_Size4-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Size4-Regular.woff2) format("woff2"), url(fonts/KaTeX_Size4-Regular.woff) format("woff"), url(fonts/KaTeX_Size4-Regular.ttf) format("truetype"); font-weight: 400; @@ -152,14 +171,18 @@ } @font-face { font-family: KaTeX_Typewriter; - src: url(fonts/KaTeX_Typewriter-Regular.woff2) format("woff2"), + src: + url(fonts/KaTeX_Typewriter-Regular.woff2) format("woff2"), url(fonts/KaTeX_Typewriter-Regular.woff) format("woff"), url(fonts/KaTeX_Typewriter-Regular.ttf) format("truetype"); font-weight: 400; font-style: normal; } .katex { - font: normal 1.21em KaTeX_Main, Times New Roman, serif; + font: + normal 1.21em KaTeX_Main, + Times New Roman, + serif; line-height: 1.2; text-indent: 0; text-rendering: auto; diff --git a/site/static/math/mathtex-script-type.js b/site/static/math/mathtex-script-type.js @@ -41,7 +41,7 @@ o, function (t) { return e[t]; - }.bind(null, o) + }.bind(null, o), ); return n; }), diff --git a/site/templates/base.html b/site/templates/base.html @@ -8,7 +8,7 @@ squiggle -%} {% import "macros/edit.html" as edit -%} {% import {% import "macros/comments.html" as comments -%} {% import "macros/javascript.html" as js -%} -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> {%- block title -%}