dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 2d43ec1b547d7faf33ce2d6f2bdd6d29c7aee404 parent 6311d89bdeb8133868034d0319bea0b42209702e Author: maydayv7 <maydayv7@gmail.com> Date: Sat, 1 Jun 2024 19:27:22 +0530 feat!: Upgrade to NixOS 24.05 (Uakari) Flake lock file updates: • Updated input 'stable': 'github:NixOS/nixpkgs/8a28540ae210be5bfeb098b4442d42115d045fdd' (2024-05-07) → 'github:NixOS/nixpkgs/be2773137295879abda175932f5ef9d9f62a6f31' (2024-06-01) • Updated input 'home-manager': 'github:nix-community/home-manager/d6bb9f934f2870e5cbc5b94c79e9db22246141ff' (2024-04-06) → 'github:nix-community/home-manager/a631666f5ec18271e86a5cde998cba68c33d9ac6' (2024-05-26) • Updated input 'unstable': 'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05) → 'github:NixOS/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29) • Updated input 'stylix': 'github:danth/stylix/a9e3ce064a778b386fb88fb152c02ae95aa2cbd2' (2024-01-19) → 'github:danth/stylix/266db7f00cad4a465e0ce43d91798fda10716212' (2024-06-01) • Updated input 'gaming': 'github:fufexan/nix-gaming/22586cc4910284c9c7306f19dcd63ac0adbcbcc9' (2024-02-29) → 'github:fufexan/nix-gaming/f4d7ce596a37bfd2d765e28ee938fbaff7b76cdd' (2024-06-01) • Updated input 'framework': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9' (2024-05-16) • Updated input 'sops': 'github:Mic92/sops-nix/538c114cfdf1f0458f507087b1dcf018ce1c0c4c' (2024-04-08) → 'github:Mic92/sops-nix/962797a8d7f15ed7033031731d0bb77244839960' (2024-05-26) • Updated input 'hardware': 'github:nixos/nixos-hardware/f58b25254be441cd2a9b4b444ed83f1e51244f1f' (2024-04-12) → 'github:maydayv7/nixos-hardware/58cb6268bfe0ea108e0034cf0647c391d890af51' (2024-06-01) • Updated input 'formatter': 'github:numtide/treefmt-nix/49dc4a92b02b8e68798abd99184f228243b6e3ac' (2024-04-01) → 'github:numtide/treefmt-nix/03b982b77df58d5974c61c6022085bafe780c1cf' (2024-05-31) • Updated input 'generators': 'github:nix-community/nixos-generators/d942db8df8ee860556a38754f15b8d03bf7e6933' (2024-04-08) → 'github:nix-community/nixos-generators/d14b286322c7f4f897ca4b1726ce38cb68596c94' (2024-05-20) • Updated input 'index': 'github:Mic92/nix-index-database/4676d72d872459e1e3a248d049609f110c570e9a' (2024-04-07) → 'github:Mic92/nix-index-database/ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac' (2024-05-27) • Updated input 'vscode': 'github:nix-community/nix-vscode-extensions/07d646a3a23c7bbacec58baec7e9e5d80a5d36a9' (2024-04-13) → 'github:nix-community/nix-vscode-extensions/af34bb2d85bef3d2a27c9044a2d4cc1231d0bc2e' (2024-06-01) • Updated input 'vsppuccin': 'github:catppuccin/vscode/f0a6271f62ebb868f32c7ad4ecb31104c26f987a' (2024-05-11) → 'github:catppuccin/vscode/b7a8806f7532a091b0170f281dbc7f35c3fc7761' (2024-05-20) • Updated input 'windows': 'github:emmanuelrosa/erosanix/26613560b1c3342c16f0ff1ea1e0fcf394c3f73d' (2024-04-11) → 'github:emmanuelrosa/erosanix/d09f1eb85b62317dde65d35e1410b896ea4f2dbc' (2024-05-31)
Diffstat:
33 files changed, 433 insertions(+), 471 deletions(-)
diff --git a/devices/futura.nix b/devices/futura.nix @@ -13,7 +13,7 @@ cpu.cores = 4; filesystem = "simple"; support = ["laptop"]; - modules = ["common-pc" "common-pc-laptop" "common-cpu-intel" "common-gpu-intel"]; + modules = ["common-pc" "common-pc-laptop" "common-cpu-intel"]; }; apps.list = ["firefox" "office"]; diff --git a/flake.lock b/flake.lock @@ -18,39 +18,6 @@ "type": "github" } }, - "base16-alacritty": { - "flake": false, - "locked": { - "lastModified": 1703982197, - "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "type": "github" - } - }, - "base16-alacritty-yaml": { - "flake": false, - "locked": { - "lastModified": 1674275109, - "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - } - }, "base16-fish": { "flake": false, "locked": { @@ -312,11 +279,11 @@ ] }, "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", + "lastModified": 1717182148, + "narHash": "sha256-Hi09/RoizxubRf3PHToT2Nm7TL8B/abSVa6q82uEgNI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", + "rev": "03b982b77df58d5974c61c6022085bafe780c1cf", "type": "github" }, "original": { @@ -332,11 +299,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -369,11 +336,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1709168939, - "narHash": "sha256-btWt7NRsA8Hysgin5su77nIdmZZbxsKW5qqyj/bBlF0=", + "lastModified": 1717205042, + "narHash": "sha256-hkIgydPkU3r2SX3M3iBdbS95q9SWfKwLUu83rYdqKMA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "22586cc4910284c9c7306f19dcd63ac0adbcbcc9", + "rev": "f4d7ce596a37bfd2d765e28ee938fbaff7b76cdd", "type": "github" }, "original": { @@ -392,11 +359,11 @@ ] }, "locked": { - "lastModified": 1712537332, - "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -427,17 +394,35 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", - "owner": "nixos", + "lastModified": 1717244026, + "narHash": "sha256-CnWp54XIYj7DpyDEnTpa0+23UZggLW+LBvMY4eQMqYo=", + "owner": "maydayv7", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "58cb6268bfe0ea108e0034cf0647c391d890af51", "type": "github" }, "original": { - "owner": "nixos", + "owner": "maydayv7", + "ref": "patch-1", "repo": "nixos-hardware", "type": "github" } @@ -449,16 +434,16 @@ ] }, "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -697,11 +682,11 @@ ] }, "locked": { - "lastModified": 1712459390, - "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4676d72d872459e1e3a248d049609f110c570e9a", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -727,11 +712,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708751719, - "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", + "lastModified": 1716619601, + "narHash": "sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", + "rev": "47e03a624662ce399e55c45a5f6da698fc72c797", "type": "github" }, "original": { @@ -911,11 +896,11 @@ ] }, "locked": { - "lastModified": 1712617241, - "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { @@ -926,16 +911,16 @@ }, "stable": { "locked": { - "lastModified": 1715083650, - "narHash": "sha256-jdSlHNL+5Bl8WkXs0vCSQoEQFwdHXTPlWe1ER6QgQPI=", + "lastModified": 1717235855, + "narHash": "sha256-fxZDbbO8UfXDj9DQJP7lwPY8ImoTaCgsoeTdhO5o0Sw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a28540ae210be5bfeb098b4442d42115d045fdd", + "rev": "be2773137295879abda175932f5ef9d9f62a6f31", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -943,8 +928,6 @@ "stylix": { "inputs": { "base16": "base16", - "base16-alacritty": "base16-alacritty", - "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -952,6 +935,7 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" ], @@ -960,16 +944,15 @@ ] }, "locked": { - "lastModified": 1705668784, - "narHash": "sha256-U/1Qol9H5nb8FtWSXSiHY8T4Y7TOIo7NHuqe4uuiBec=", + "lastModified": 1717212835, + "narHash": "sha256-fSNsRokB3YaTmJOcSdDzKJOFWq/bQ/FCoMGpF12sF5c=", "owner": "danth", "repo": "stylix", - "rev": "a9e3ce064a778b386fb88fb152c02ae95aa2cbd2", + "rev": "266db7f00cad4a465e0ce43d91798fda10716212", "type": "github" }, "original": { "owner": "danth", - "ref": "release-23.11", "repo": "stylix", "type": "github" } @@ -1008,11 +991,11 @@ }, "unstable": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -1071,11 +1054,11 @@ ] }, "locked": { - "lastModified": 1712970366, - "narHash": "sha256-QDzaNEbyhnREXw4+W8nGgnuHMUucBes+hCB2Dr/NRh0=", + "lastModified": 1717205309, + "narHash": "sha256-FxtY2Y9S/s759GWMT4L7w81hiklTt3no/+jOfiwxAZQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "07d646a3a23c7bbacec58baec7e9e5d80a5d36a9", + "rev": "af34bb2d85bef3d2a27c9044a2d4cc1231d0bc2e", "type": "github" }, "original": { @@ -1089,11 +1072,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715401925, - "narHash": "sha256-EGZGHCv4OFqzFc9oP82LCKMWfMGsmadOOZ0DZHYSdns=", + "lastModified": 1716179347, + "narHash": "sha256-DPiP4yLRcPgWgrnCC/tRp5vUk9teZIfsCT2r8jr1V8A=", "owner": "catppuccin", "repo": "vscode", - "rev": "f0a6271f62ebb868f32c7ad4ecb31104c26f987a", + "rev": "b7a8806f7532a091b0170f281dbc7f35c3fc7761", "type": "github" }, "original": { @@ -1130,11 +1113,11 @@ ] }, "locked": { - "lastModified": 1712848536, - "narHash": "sha256-ZV7g6jZF4OP36xxRJZZFBWgsnmofSk5H45cWr8kRs9s=", + "lastModified": 1717140807, + "narHash": "sha256-k8JboAPUkp5+gox66NydYq8aZgkG4kkOwgJ/dwW/oQc=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "26613560b1c3342c16f0ff1ea1e0fcf394c3f73d", + "rev": "d09f1eb85b62317dde65d35e1410b896ea4f2dbc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix @@ -39,7 +39,7 @@ ## Package Repositories ## # NixOS Packages Repository nixpkgs.follows = "stable"; - stable.url = "github:NixOS/nixpkgs?ref=release-23.11"; + stable.url = "github:NixOS/nixpkgs?ref=release-24.05"; # Unstable Packages Repository unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; @@ -88,12 +88,12 @@ ## Feature Modules # User Home Manager home-manager = { - url = "github:nix-community/home-manager?ref=release-23.11"; + url = "github:nix-community/home-manager?ref=release-24.05"; inputs.nixpkgs.follows = "stable"; }; # Hardware Support - hardware.url = "github:nixos/nixos-hardware"; + hardware.url = "github:maydayv7/nixos-hardware?ref=patch-1"; # Secure Boot boot = { @@ -134,7 +134,7 @@ # Base16 Theming stylix = { - url = "github:danth/stylix?ref=release-23.11"; + url = "github:danth/stylix"; inputs = { nixpkgs.follows = "stable"; home-manager.follows = "home-manager"; diff --git a/modules/apps/default.nix b/modules/apps/default.nix @@ -1,11 +1,10 @@ { lib, util, - pkgs, ... }: let inherit (util.map) modules; - inherit (lib) getExe mkOption types; + inherit (lib) mkOption types; in { imports = modules.list ./.; @@ -16,12 +15,8 @@ in { }; # AppImage Support - config.boot.binfmt.registrations.appimage = { - wrapInterpreterInShell = false; - interpreter = getExe pkgs.appimage-run; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; + config.programs.appimage = { + enable = true; + binfmt = true; }; } diff --git a/modules/apps/discord.nix b/modules/apps/discord.nix @@ -23,7 +23,7 @@ in { # Discord Activation activation.discordSetup = lib.hm.dag.entryAfter ["writeBoundary"] '' echo "Setting up Discord..." - $DRY_RUN_CMD /usr/bin/env betterdiscordctl $VERBOSE_ARG install || true + run /usr/bin/env betterdiscordctl $VERBOSE_ARG install || true ''; }; }; diff --git a/modules/apps/firefox.nix b/modules/apps/firefox.nix @@ -58,66 +58,67 @@ in { ]; }; - profiles.default.settings = { - ## Flags - # General - "browser.disableResetPrompt" = true; - "browser.onboarding.enabled" = false; - "browser.aboutConfig.showWarning" = false; - "browser.shell.checkDefaultBrowser" = false; - "browser.sessionstore.interval" = "1800000"; - "browser.toolbars.bookmarks.visibility" = "always"; - "browser.urlbar.showSearchSuggestionsFirst" = false; - "browser.urlbar.speculativeConnect.enabled" = false; - "browser.urlbar.dnsResolveSingleWordsAfterSearch" = 0; + profiles.default = { + containersForce = true; + settings = { + ## Flags + # General + "browser.disableResetPrompt" = true; + "browser.onboarding.enabled" = false; + "browser.aboutConfig.showWarning" = false; + "browser.shell.checkDefaultBrowser" = false; + "browser.sessionstore.interval" = "1800000"; + "browser.toolbars.bookmarks.visibility" = "always"; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.urlbar.speculativeConnect.enabled" = false; + "browser.urlbar.dnsResolveSingleWordsAfterSearch" = 0; - # Features - "browser.search.openintab" = true; - "layout.spellcheckDefault" = 2; + # Features + "browser.search.openintab" = true; + "layout.spellcheckDefault" = 2; - # New Tab - "browser.newtabpage.activity-stream.feeds.section.highlights" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.topsites" = false; - "browser.newtabpage.activity-stream.showSearch" = true; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = - false; - "browser.newtabpage.activity-stream.feeds.section.highlights.includePocket" = - false; + # New Tab + "browser.newtabpage.activity-stream.feeds.section.highlights" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.topsites" = false; + "browser.newtabpage.activity-stream.showSearch" = true; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.feeds.section.highlights.includePocket" = false; - # Theming - "browser.uidensity" = 0; - "devtools.theme" = "dark"; - "layers.acceleration.force-enabled" = true; - "mozilla.widget.use-argb-visuals" = true; - "svg.context-properties.content.enabled" = true; - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + # Theming + "browser.uidensity" = 0; + "devtools.theme" = "dark"; + "layers.acceleration.force-enabled" = true; + "mozilla.widget.use-argb-visuals" = true; + "svg.context-properties.content.enabled" = true; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - # Passwords - "signon.autofillForms" = false; - "signon.rememberSignons" = false; - "signon.generation.enabled" = false; - "signon.management.page.breach-alerts.enabled" = false; + # Passwords + "signon.autofillForms" = false; + "signon.rememberSignons" = false; + "signon.generation.enabled" = false; + "signon.management.page.breach-alerts.enabled" = false; - # Extensions - "extensions.pocket.enabled" = false; - "extensions.htmlaboutaddons.inline-options.enabled" = false; - "extensions.htmlaboutaddons.recommendations.enabled" = false; + # Extensions + "extensions.pocket.enabled" = false; + "extensions.htmlaboutaddons.inline-options.enabled" = false; + "extensions.htmlaboutaddons.recommendations.enabled" = false; - # Security - "security.family_safety.mode" = 0; - "security.pki.sha1_enforcement_level" = 1; - "security.tls.enable_0rtt_data" = false; + # Security + "security.family_safety.mode" = 0; + "security.pki.sha1_enforcement_level" = 1; + "security.tls.enable_0rtt_data" = false; - # Reports - "breakpad.reportURL" = ""; - "browser.crashReports.unsubmittedCheck.autoSubmit2" = false; - "browser.tabs.crashReporting.sendReport" = false; - "datareporting.healthreport.service.enabled" = false; - "datareporting.healthreport.uploadEnabled" = false; - "datareporting.policy.dataSubmissionEnabled" = false; + # Reports + "breakpad.reportURL" = ""; + "browser.crashReports.unsubmittedCheck.autoSubmit2" = false; + "browser.tabs.crashReporting.sendReport" = false; + "datareporting.healthreport.service.enabled" = false; + "datareporting.healthreport.uploadEnabled" = false; + "datareporting.policy.dataSubmissionEnabled" = false; + }; }; }; }; diff --git a/modules/apps/git/runner.nix b/modules/apps/git/runner.nix @@ -35,7 +35,7 @@ in { (mkIf (runner.support == "github") { # GitHub Runner environment.systemPackages = [pkgs.act]; - services.github-runner = { + services.github-runners.runner = { enable = true; url = files.path.repo; extraLabels = ["self"]; diff --git a/modules/apps/vscode.nix b/modules/apps/vscode.nix @@ -24,7 +24,7 @@ in { programs.vscode = { enable = true; - package = pkgs.unstable.vscode; + package = pkgs.vscode; # Keyboard Shortcuts inherit keybindings; diff --git a/modules/base/default.nix b/modules/base/default.nix @@ -8,7 +8,7 @@ ... }: let inherit (builtins) attrNames map; - inherit (lib) removePrefix mkOption optionals types; + inherit (lib) removePrefix mkIf mkOption optionals types; cfg = config.base; in { imports = util.map.modules.list ./. ++ [inputs.generators.nixosModules.all-formats]; @@ -34,7 +34,7 @@ in { config = { # Kernel Configuration boot = { - supportedFilesystems = optionals (cfg.kernel == "zfs") ["zfs"]; + supportedFilesystems.zfs = mkIf (cfg.kernel == "zfs") true; kernelPackages = if (cfg.kernel == "zfs") then pkgs.zfs.latestCompatibleLinuxPackages diff --git a/modules/gui/default.nix b/modules/gui/default.nix @@ -45,6 +45,7 @@ in { }; # Desktop Integration + environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"]; xdg.portal = { enable = true; xdgOpenUsePortal = true; diff --git a/modules/gui/desktop/gnome/default.nix b/modules/gui/desktop/gnome/default.nix @@ -17,12 +17,10 @@ in { { # Session services = { + displayManager.defaultSession = "gnome"; xserver = { desktopManager.gnome.enable = true; - displayManager = { - gdm.enable = true; - defaultSession = "gnome"; - }; + displayManager.gdm.enable = true; }; # Initial Setup @@ -90,7 +88,7 @@ in { apps.list = ["firefox"]; programs = { - gnupg.agent.pinentryFlavor = mkForce "gnome3"; + gnupg.agent.pinentryPackage = mkForce pkgs.pinentry.gnome3; firefox = { policies.ExtensionSettings = { name = "gnome-shell-integration"; diff --git a/modules/gui/desktop/hyprland/apps/bar.nix b/modules/gui/desktop/hyprland/apps/bar.nix @@ -36,7 +36,7 @@ in rec { programs.waybar = { enable = true; systemd.enable = true; - package = pkgs.unstable.waybar; + package = pkgs.waybar; style = files.hyprland.waybar; # Panel diff --git a/modules/gui/desktop/hyprland/apps/default.nix b/modules/gui/desktop/hyprland/apps/default.nix @@ -33,7 +33,7 @@ in { environment.systemPackages = with pkgs; [ # Apps celluloid - unstable.clipse + clipse custom.desktop-icons evince font-manager @@ -44,9 +44,9 @@ in { custom.kebihelp lollypop mission-center - unstable.nwg-displays - unstable.nwg-drawer - unstable.overskride + nwg-displays + nwg-drawer + overskride playerctl qalculate-gtk remmina @@ -56,7 +56,7 @@ in { # Utilities custom.hyprutils grim - unstable.grimblast + grimblast hyprkeys pavucontrol slurp @@ -151,6 +151,17 @@ in { services.playerctld.enable = true; services.poweralertd.enable = true; + # Wallpaper Daemon + services.hyprpaper = { + enable = true; + settings = { + ipc = false; + splash = true; + preload = wallpaper; + wallpaper = ", ${wallpaper}"; + }; + }; + # Terminal programs.kitty = { enable = true; @@ -248,29 +259,13 @@ in { tray = true; }; - systemd.user.services = { - # Wallpaper Daemon - hyprpaper = { - Install.WantedBy = ["graphical-session.target"]; - Unit = { - Description = "Hyprland Wallpaper Daemon"; - PartOf = ["graphical-session.target"]; - }; - - Service = { - ExecStart = getExe pkgs.hyprpaper; - Restart = "on-failure"; - }; - }; - - # Screen Share - xwaylandvideobridge = { - Unit.Description = "Stream Wayland windows to apps running under XWayland"; - Install.wantedBy = ["graphical-session.target"]; - Service = { - ExecStart = getExe pkgs.xwaylandvideobridge; - Restart = "on-failure"; - }; + # Screen Share + systemd.user.services.xwaylandvideobridge = { + Unit.Description = "Stream Wayland windows to apps running under XWayland"; + Install.wantedBy = ["graphical-session.target"]; + Service = { + ExecStart = getExe pkgs.xwaylandvideobridge; + Restart = "on-failure"; }; }; @@ -301,14 +296,6 @@ in { file = hyprland.clipse.theme; }; - # Wallpaper - ".config/hypr/hyprpaper.conf".text = '' - splash = true - ipc = false - preload = ${wallpaper} - wallpaper = , ${wallpaper} - ''; - # Text Editor ".config/geany/geany.conf".text = geany.settings; ".config/geany/keybindings.conf".text = geany.keybindings; diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix @@ -8,7 +8,7 @@ ## Plugin Settings # Pyprland home = { - packages = with pkgs; [hyprshade unstable.pyprland]; + packages = with pkgs; [hyprshade pyprland]; file = { ".config/hypr/pyprland.toml".text = files.hyprland.pypr; ".config/hypr/shaders" = { @@ -20,63 +20,59 @@ wayland.windowManager.hyprland = { plugins = with pkgs.hyprworld; [hycov hyprexpo Hypr-DarkWindow Hyprspace hyprsplit]; - extraConfig = with sys.lib.stylix.colors; let - gaps = - builtins.toString - config.wayland.windowManager.hyprland.settings.general.gaps_in; - in '' - plugin { + settings = { + exec-once = ["pypr"]; + plugin = with sys.lib.stylix.colors; let + gaps = + builtins.toString + config.wayland.windowManager.hyprland.settings.general.gaps_in; + in { # Expose - hyprexpo { - columns = 3 - gap_size = ${gaps} - bg_col = rgb(${base00}) - workspace_method = first 1 - enable_gesture = true - gesture_positive = false - } + hyprexpo = { + columns = 3; + gap_size = gaps; + bg_col = "rgb(${base00})"; + workspace_method = "first 1"; + enable_gesture = true; + gesture_positive = false; + }; # Application Overview - hycov { - enable_hotarea = 1 - hotarea_pos = 3 - only_active_workspace = 1 - overview_gappi = 24 - overview_gappo = 60 - enable_gesture = 0 - enable_alt_release_exit = 1 - alt_replace_key = Alt_L - alt_toggle_auto_next = 1 - enable_click_action = 1 - } + hycov = { + enable_hotarea = 1; + hotarea_pos = 3; + only_active_workspace = 1; + overview_gappi = 24; + overview_gappo = 60; + enable_gesture = 0; + enable_alt_release_exit = 1; + alt_replace_key = "Alt_L"; + alt_toggle_auto_next = 1; + enable_click_action = 1; + }; # Workspace Overview - overview { - autoDrag = true - dragAlpha = 0.4 - exitOnClick = true - centerAligned = true - hideTopLayers = true - hideOverlayLayers = false - showNewWorkspace = true - showEmptyWorkspace = false - overrideGaps = true - gapsIn = ${gaps} - gapsOut = ${gaps} - panelBorderWidth = 1 - panelBorderColor = rgb(${base0A}) - workspaceActiveBorder = rgb(${base0D}) - } + overview = { + autoDrag = true; + dragAlpha = 0.4; + exitOnClick = true; + centerAligned = true; + hideTopLayers = true; + hideOverlayLayers = false; + showNewWorkspace = true; + showEmptyWorkspace = false; + overrideGaps = true; + gapsIn = gaps; + gapsOut = gaps; + panelBorderWidth = 1; + panelBorderColor = "rgb(${base0A})"; + workspaceActiveBorder = "rgb(${base0D})"; + }; # Split Monitor Workspaces - hyprsplit { - num_workspaces = 9 - } - } - ''; + hyprsplit.num_workspaces = 9; + }; - settings = { - exec-once = ["pypr"]; bind = [ # Expose "$mod, grave, hyprexpo:expo, toggle" diff --git a/modules/gui/desktop/xfce/compositor.nix b/modules/gui/desktop/xfce/compositor.nix @@ -75,7 +75,7 @@ enable-fading-next-tag = true; }; - package = pkgs.unstable.picom.overrideAttrs (old: { + package = pkgs.picom.overrideAttrs (old: { version = "11a"; src = pkgs.fetchFromGitHub { owner = "FT-Labs"; diff --git a/modules/gui/desktop/xfce/default.nix b/modules/gui/desktop/xfce/default.nix @@ -21,15 +21,15 @@ in { config = mkIf (hasPrefix "xfce" desktop) (mkMerge [ { # Session - services.xserver = { - desktopManager.xfce = { - enable = true; - enableXfwm = true; - }; + services = { + displayManager.defaultSession = "xfce"; + xserver = { + desktopManager.xfce = { + enable = true; + enableXfwm = true; + }; - displayManager = { - defaultSession = "xfce"; - lightdm.greeters.gtk = { + displayManager.lightdm.greeters.gtk = { clock-format = "%H:%M"; indicators = [ "~a11y" diff --git a/modules/gui/gtk.nix b/modules/gui/gtk.nix @@ -34,7 +34,7 @@ in { }; # Desktop Integration - programs.gnupg.agent.pinentryFlavor = "gtk2"; + programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2; user = { # Configuration diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix @@ -41,7 +41,7 @@ in { user.homeConfig = { qt = { enable = true; - platformTheme = "qtct"; + platformTheme.name = "qtct"; style.name = "kvantum"; }; diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix @@ -91,8 +91,8 @@ in { user.homeConfig.stylix.targets = { bat.enable = mkIf shell true; - #btop.enable = mkIf shell true; - #yazi.enable = mkIf shell true; #!# Wait for release + btop.enable = mkIf shell true; + yazi.enable = mkIf shell true; firefox.enable = false; vscode.enable = mkIf (exists "vscode") false; }; diff --git a/modules/gui/xorg.nix b/modules/gui/xorg.nix @@ -15,7 +15,6 @@ services.xserver = { enable = true; autorun = true; - layout = "us"; # Driver Settings videoDrivers = ["modesetting"]; diff --git a/modules/hardware/filesystem.nix b/modules/hardware/filesystem.nix @@ -66,14 +66,16 @@ in { { ## Partitions ## # Common Partitions - boot.supportedFilesystems = ["ntfs" "vfat"]; programs.fuse.userAllowOther = true; - fileSystems = { - # EFI System Partition - "/boot" = { - device = "/dev/disk/by-partlabel/ESP"; - fsType = "vfat"; - }; + boot.supportedFilesystems = { + ntfs = true; + vfat = true; + }; + + # EFI System Partition + fileSystems."/boot" = { + device = "/dev/disk/by-partlabel/ESP"; + fsType = "vfat"; }; # SWAP Partition @@ -126,7 +128,7 @@ in { # Boot Settings boot = { resumeDevice = "/dev/disk/by-partlabel/swap"; - supportedFilesystems = ["zfs"]; + supportedFilesystems.zfs = true; kernelParams = ["elevator=none"]; zfs = { allowHibernation = true; diff --git a/modules/hardware/laptop.nix b/modules/hardware/laptop.nix @@ -34,7 +34,7 @@ in { ''; # Touchpad - services.xserver.libinput = { + services.libinput = { enable = true; touchpad = { tapping = true; diff --git a/modules/hardware/printer.nix b/modules/hardware/printer.nix @@ -24,18 +24,8 @@ in { # Network Print services.avahi = { enable = true; - #nssmdns4 = true; + nssmdns4 = true; openFirewall = true; }; - - #!# Temporary Workaround - system = { - nssModules = [pkgs.nssmdns]; - nssDatabases.hosts = with lib; - mkMerge [ - (mkOrder 900 ["mdns4_minimal [NOTFOUND=return]"]) - (mkOrder 1501 ["mdns4"]) - ]; - }; }; } diff --git a/modules/nix/registry.nix b/modules/nix/registry.nix @@ -5,6 +5,11 @@ }: { ## Nix Registry ## config = { + nixpkgs.flake = { + setNixPath = false; + setFlakeRegistry = false; + }; + nix = { nixPath = ["/etc/nix/inputs"]; registry = diff --git a/modules/shell/default.nix b/modules/shell/default.nix @@ -69,7 +69,7 @@ in { // { btop.enable = true; # Resource Monitor hstr.enable = true; # Command History Browser - #yazi.enable = true # File Browser #!# Wait for release + yazi.enable = true; # File Browser # DirENV Support direnv = { diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix @@ -31,7 +31,7 @@ in { # Features autocd = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; enableVteIntegration = true; syntaxHighlighting.enable = true; diff --git a/modules/user/default.nix b/modules/user/default.nix @@ -126,7 +126,7 @@ in { }; # Login - services.xserver.displayManager.autoLogin = let + services.displayManager.autoLogin = let find = findSingle (value: value.autologin || value.minimal) "0" "1" (attrValues settings); @@ -134,7 +134,7 @@ in { enable = if (find == "0") then false - else if (config.services.xserver.displayManager.defaultSession == null) + else if (config.services.displayManager.defaultSession == null) then throw "Graphical Environment must be present for Automatic Log-In" else if (find == "1") then throw "Only one User can be Automatically Logged-In" diff --git a/modules/user/home.nix b/modules/user/home.nix @@ -11,7 +11,10 @@ user.homeConfig = { imports = [../../users]; - systemd.user.startServices = true; + systemd.user = { + enable = true; + startServices = true; + }; # Package Configuration home = { diff --git a/packages/kebihelp/default.nix b/packages/kebihelp/default.nix @@ -17,11 +17,13 @@ in inherit (metadata) rev sha256; }; + build-system = [setuptools-scm]; nativeBuildInputs = [libsForQt5.qt5.wrapQtAppsHook]; - propagatedBuildInputs = [prettytable pyqt5 pyqt5_sip libsForQt5.qt5.qtwayland]; + propagatedBuildInputs = [prettytable pyqt5 pyqt5-sip libsForQt5.qt5.qtwayland]; format = "pyproject"; dontWrapQtApps = true; + dontCheckRuntimeDeps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; diff --git a/packages/overlays/nixFlakes.nix b/packages/overlays/nixFlakes.nix @@ -1,4 +1,4 @@ final: prev: { # Nix Version - nixFlakes = final.unstable.nixVersions.nix_2_20; + nixFlakes = final.nixVersions.latest; } diff --git a/packages/patches/debugpy.patch b/packages/patches/debugpy.patch @@ -1,12 +0,0 @@ -diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix -index 85389fba2fb2f2..4d76a7be3c9ea0 100644 ---- a/pkgs/development/python-modules/debugpy/default.nix -+++ b/pkgs/development/python-modules/debugpy/default.nix -@@ -87,6 +87,7 @@ buildPythonPackage rec { - requests - ]; - -+ doCheck = false; - preCheck = '' - export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 - export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 diff --git a/site/static/js/katex.js b/site/static/js/katex.js @@ -2,10 +2,10 @@ "object" == typeof exports && "object" == typeof module ? (module.exports = e()) : "function" == typeof define && define.amd - ? define([], e) - : "object" == typeof exports - ? (exports.katex = e()) - : (t.katex = e()); + ? define([], e) + : "object" == typeof exports + ? (exports.katex = e()) + : (t.katex = e()); })("undefined" != typeof self ? self : this, function () { return (function (t) { var e = {}; @@ -147,12 +147,12 @@ ? t(e.body[0]) : e : "color" === e.type - ? 1 === e.body.length - ? t(e.body[0]) - : e - : "font" === e.type - ? t(e.body) - : e; + ? 1 === e.body.length + ? t(e.body[0]) + : e + : "font" === e.type + ? t(e.body) + : e; }, c = { contains: function (t, e) { @@ -4072,10 +4072,10 @@ ("textbf" === e && "textit" === r ? "BoldItalic" : "textbf" === e - ? "Bold" - : "textit" === e - ? "Italic" - : "Regular") + ? "Bold" + : "textit" === e + ? "Italic" + : "Regular") ); }, Lt = { @@ -4109,8 +4109,8 @@ "boldsymbol" === r.font && Bt(t, "Main-Bold", e).metrics ? Ct(t, "Main-Bold", e, r, a.concat(["mathbf"])) : "\\" === t || "main" === j[e][t].font - ? Ct(t, "Main-Regular", e, r, a) - : Ct(t, "AMS-Regular", e, r, a.concat(["amsrm"])) + ? Ct(t, "Main-Regular", e, r, a) + : Ct(t, "AMS-Regular", e, r, a.concat(["amsrm"])) ); }, makeSpan: It, @@ -4708,20 +4708,20 @@ t >= 0.05555 && t <= 0.05556 ? "\u200a" : t >= 0.1666 && t <= 0.1667 - ? "\u2009" - : t >= 0.2222 && t <= 0.2223 - ? "\u2005" - : t >= 0.2777 && t <= 0.2778 - ? "\u2005\u200a" - : t >= -0.05556 && t <= -0.05555 - ? "\u200a\u2063" - : t >= -0.1667 && t <= -0.1666 - ? "\u2009\u2063" - : t >= -0.2223 && t <= -0.2222 - ? "\u205f\u2063" - : t >= -0.2778 && t <= -0.2777 - ? "\u2005\u2063" - : null); + ? "\u2009" + : t >= 0.2222 && t <= 0.2223 + ? "\u2005" + : t >= 0.2777 && t <= 0.2778 + ? "\u2005\u200a" + : t >= -0.05556 && t <= -0.05555 + ? "\u200a\u2063" + : t >= -0.1667 && t <= -0.1666 + ? "\u2009\u2063" + : t >= -0.2223 && t <= -0.2222 + ? "\u205f\u2063" + : t >= -0.2778 && t <= -0.2777 + ? "\u2005\u2063" + : null); } var e = t.prototype; return ( @@ -4769,10 +4769,10 @@ return "textit" === e.fontShape && "textbf" === e.fontWeight ? "sans-serif-bold-italic" : "textit" === e.fontShape - ? "sans-serif-italic" - : "textbf" === e.fontWeight - ? "bold-sans-serif" - : "sans-serif"; + ? "sans-serif-italic" + : "textbf" === e.fontWeight + ? "bold-sans-serif" + : "sans-serif"; if ("textit" === e.fontShape && "textbf" === e.fontWeight) return "bold-italic"; if ("textit" === e.fontShape) return "italic"; @@ -5822,75 +5822,85 @@ "\\uparrow" === t ? (l = h = "\u23d0") : "\\Uparrow" === t - ? (l = h = "\u2016") - : "\\downarrow" === t - ? (o = l = "\u23d0") - : "\\Downarrow" === t - ? (o = l = "\u2016") - : "\\updownarrow" === t - ? ((o = "\\uparrow"), (l = "\u23d0"), (h = "\\downarrow")) - : "\\Updownarrow" === t - ? ((o = "\\Uparrow"), (l = "\u2016"), (h = "\\Downarrow")) - : "[" === t || "\\lbrack" === t - ? ((o = "\u23a1"), - (l = "\u23a2"), - (h = "\u23a3"), - (m = "Size4-Regular")) - : "]" === t || "\\rbrack" === t - ? ((o = "\u23a4"), - (l = "\u23a5"), - (h = "\u23a6"), - (m = "Size4-Regular")) - : "\\lfloor" === t || "\u230a" === t - ? ((l = o = "\u23a2"), (h = "\u23a3"), (m = "Size4-Regular")) - : "\\lceil" === t || "\u2308" === t - ? ((o = "\u23a1"), (l = h = "\u23a2"), (m = "Size4-Regular")) - : "\\rfloor" === t || "\u230b" === t - ? ((l = o = "\u23a5"), (h = "\u23a6"), (m = "Size4-Regular")) - : "\\rceil" === t || "\u2309" === t - ? ((o = "\u23a4"), (l = h = "\u23a5"), (m = "Size4-Regular")) - : "(" === t || "\\lparen" === t - ? ((o = "\u239b"), - (l = "\u239c"), - (h = "\u239d"), - (m = "Size4-Regular")) - : ")" === t || "\\rparen" === t - ? ((o = "\u239e"), - (l = "\u239f"), - (h = "\u23a0"), - (m = "Size4-Regular")) - : "\\{" === t || "\\lbrace" === t - ? ((o = "\u23a7"), - (s = "\u23a8"), - (h = "\u23a9"), - (l = "\u23aa"), - (m = "Size4-Regular")) - : "\\}" === t || "\\rbrace" === t - ? ((o = "\u23ab"), - (s = "\u23ac"), - (h = "\u23ad"), - (l = "\u23aa"), - (m = "Size4-Regular")) - : "\\lgroup" === t || "\u27ee" === t - ? ((o = "\u23a7"), - (h = "\u23a9"), - (l = "\u23aa"), - (m = "Size4-Regular")) - : "\\rgroup" === t || "\u27ef" === t - ? ((o = "\u23ab"), - (h = "\u23ad"), - (l = "\u23aa"), - (m = "Size4-Regular")) - : "\\lmoustache" === t || "\u23b0" === t - ? ((o = "\u23a7"), - (h = "\u23ad"), - (l = "\u23aa"), - (m = "Size4-Regular")) - : ("\\rmoustache" !== t && "\u23b1" !== t) || - ((o = "\u23ab"), - (h = "\u23a9"), - (l = "\u23aa"), - (m = "Size4-Regular")); + ? (l = h = "\u2016") + : "\\downarrow" === t + ? (o = l = "\u23d0") + : "\\Downarrow" === t + ? (o = l = "\u2016") + : "\\updownarrow" === t + ? ((o = "\\uparrow"), (l = "\u23d0"), (h = "\\downarrow")) + : "\\Updownarrow" === t + ? ((o = "\\Uparrow"), (l = "\u2016"), (h = "\\Downarrow")) + : "[" === t || "\\lbrack" === t + ? ((o = "\u23a1"), + (l = "\u23a2"), + (h = "\u23a3"), + (m = "Size4-Regular")) + : "]" === t || "\\rbrack" === t + ? ((o = "\u23a4"), + (l = "\u23a5"), + (h = "\u23a6"), + (m = "Size4-Regular")) + : "\\lfloor" === t || "\u230a" === t + ? ((l = o = "\u23a2"), + (h = "\u23a3"), + (m = "Size4-Regular")) + : "\\lceil" === t || "\u2308" === t + ? ((o = "\u23a1"), + (l = h = "\u23a2"), + (m = "Size4-Regular")) + : "\\rfloor" === t || "\u230b" === t + ? ((l = o = "\u23a5"), + (h = "\u23a6"), + (m = "Size4-Regular")) + : "\\rceil" === t || "\u2309" === t + ? ((o = "\u23a4"), + (l = h = "\u23a5"), + (m = "Size4-Regular")) + : "(" === t || "\\lparen" === t + ? ((o = "\u239b"), + (l = "\u239c"), + (h = "\u239d"), + (m = "Size4-Regular")) + : ")" === t || "\\rparen" === t + ? ((o = "\u239e"), + (l = "\u239f"), + (h = "\u23a0"), + (m = "Size4-Regular")) + : "\\{" === t || "\\lbrace" === t + ? ((o = "\u23a7"), + (s = "\u23a8"), + (h = "\u23a9"), + (l = "\u23aa"), + (m = "Size4-Regular")) + : "\\}" === t || "\\rbrace" === t + ? ((o = "\u23ab"), + (s = "\u23ac"), + (h = "\u23ad"), + (l = "\u23aa"), + (m = "Size4-Regular")) + : "\\lgroup" === t || "\u27ee" === t + ? ((o = "\u23a7"), + (h = "\u23a9"), + (l = "\u23aa"), + (m = "Size4-Regular")) + : "\\rgroup" === t || "\u27ef" === t + ? ((o = "\u23ab"), + (h = "\u23ad"), + (l = "\u23aa"), + (m = "Size4-Regular")) + : "\\lmoustache" === t || + "\u23b0" === t + ? ((o = "\u23a7"), + (h = "\u23ad"), + (l = "\u23aa"), + (m = "Size4-Regular")) + : ("\\rmoustache" !== t && + "\u23b1" !== t) || + ((o = "\u23ab"), + (h = "\u23a9"), + (l = "\u23aa"), + (m = "Size4-Regular")); var c = Ve(o, m, n), u = c.height + c.depth, p = Ve(l, m, n), @@ -6197,8 +6207,8 @@ return r && Ge(s, a, e), s; })(t, s.style, r, a, n, i) : "large" === s.type - ? Ye(t, s.size, r, a, n, i) - : _e(t, e, r, a, n, i); + ? Ye(t, s.size, r, a, n, i) + : _e(t, e, r, a, n, i); }, ir = function (t, e) { var r, @@ -6226,17 +6236,17 @@ )).style.minWidth = "0.853em"), (a = 0.833 / o)) : "large" === i.type - ? ((m = 1080 * Je[i.size]), - (h = (Je[i.size] + s) / o), - (l = (Je[i.size] + s + 0.08) / o), - ((r = je("sqrtSize" + i.size, l, m, s, e)).style.minWidth = - "1.02em"), - (a = 1 / o)) - : ((l = t + s + 0.08), - (h = t + s), - (m = Math.floor(1e3 * t + s) + 80), - ((r = je("sqrtTall", l, m, s, e)).style.minWidth = "0.742em"), - (a = 1.056)), + ? ((m = 1080 * Je[i.size]), + (h = (Je[i.size] + s) / o), + (l = (Je[i.size] + s + 0.08) / o), + ((r = je("sqrtSize" + i.size, l, m, s, e)).style.minWidth = + "1.02em"), + (a = 1 / o)) + : ((l = t + s + 0.08), + (h = t + s), + (m = Math.floor(1e3 * t + s) + 80), + ((r = je("sqrtTall", l, m, s, e)).style.minWidth = "0.742em"), + (a = 1.056)), (r.height = h), (r.style.height = l + "em"), { @@ -6982,8 +6992,8 @@ "alignat" === t.colSeparationType ? r.setAttribute("columnspacing", "0em") : "small" === t.colSeparationType - ? r.setAttribute("columnspacing", "0.2778em") - : r.setAttribute("columnspacing", "1em"); + ? r.setAttribute("columnspacing", "0.2778em") + : r.setAttribute("columnspacing", "1em"); var f = "", g = t.hLinesBeforeRow; (n += g[0].length > 0 ? "left " : ""), @@ -7256,11 +7266,11 @@ ? ((r.attributes.lspace = "0.22em"), (r.attributes.rspace = "0.22em")) : "mpunct" === t.mclass - ? ((r.attributes.lspace = "0em"), - (r.attributes.rspace = "0.17em")) - : ("mopen" !== t.mclass && "mclose" !== t.mclass) || - ((r.attributes.lspace = "0em"), - (r.attributes.rspace = "0em"))), + ? ((r.attributes.lspace = "0em"), + (r.attributes.rspace = "0.17em")) + : ("mopen" !== t.mclass && "mclose" !== t.mclass) || + ((r.attributes.lspace = "0em"), + (r.attributes.rspace = "0em"))), r); } _t({ @@ -7441,10 +7451,10 @@ "display" === t ? (r = r.id >= w.SCRIPT.id ? r.text() : w.DISPLAY) : "text" === t && r.size === w.DISPLAY.size - ? (r = w.TEXT) - : "script" === t - ? (r = w.SCRIPT) - : "scriptscript" === t && (r = w.SCRIPTSCRIPT), + ? (r = w.TEXT) + : "script" === t + ? (r = w.SCRIPT) + : "scriptscript" === t && (r = w.SCRIPTSCRIPT), r ); }, @@ -7540,8 +7550,10 @@ (v = t.continued ? Dt.makeSpan([]) : null == t.rightDelim - ? ie(e, ["mclose"]) - : sr(t.rightDelim, g, !0, e.havingStyle(a), t.mode, ["mclose"])), + ? ie(e, ["mclose"]) + : sr(t.rightDelim, g, !0, e.havingStyle(a), t.mode, [ + "mclose", + ])), Dt.makeSpan( ["mord"].concat(r.sizingClasses(e)), [x, Dt.makeSpan(["mfrac"], [f]), v], @@ -9165,17 +9177,17 @@ ? Ur : null : "operatorname" === r.type - ? r.alwaysHandleSupSub && - (e.style.size === w.DISPLAY.size || r.limits) - ? Xr - : null - : "accent" === r.type - ? c.isCharacterBox(r.base) - ? Ie - : null - : "horizBrace" === r.type && !t.sub === r.isOver - ? Pr - : null + ? r.alwaysHandleSupSub && + (e.style.size === w.DISPLAY.size || r.limits) + ? Xr + : null + : "accent" === r.type + ? c.isCharacterBox(r.base) + ? Ie + : null + : "horizBrace" === r.type && !t.sub === r.isOver + ? Pr + : null : null; })(t, e); if (r) return r(t, e); @@ -9288,11 +9300,11 @@ o && "op" === o.type && o.limits && e.style === w.DISPLAY ? "munderover" : o && - "operatorname" === o.type && - o.alwaysHandleSupSub && - (e.style === w.DISPLAY || o.limits) - ? "munderover" - : "msubsup"; + "operatorname" === o.type && + o.alwaysHandleSupSub && + (e.style === w.DISPLAY || o.limits) + ? "munderover" + : "msubsup"; } else { var s = t.base; n = @@ -9302,11 +9314,11 @@ (e.style === w.DISPLAY || s.alwaysHandleSupSub) ? "munder" : s && - "operatorname" === s.type && - s.alwaysHandleSupSub && - (s.limits || e.style === w.DISPLAY) - ? "munder" - : "msub"; + "operatorname" === s.type && + s.alwaysHandleSupSub && + (s.limits || e.style === w.DISPLAY) + ? "munder" + : "msub"; } else { var l = t.base; @@ -9317,11 +9329,11 @@ (e.style === w.DISPLAY || l.alwaysHandleSupSub) ? "mover" : l && - "operatorname" === l.type && - l.alwaysHandleSupSub && - (l.limits || e.style === w.DISPLAY) - ? "mover" - : "msup"; + "operatorname" === l.type && + l.alwaysHandleSupSub && + (l.limits || e.style === w.DISPLAY) + ? "mover" + : "msup"; } return new ue.MathNode(n, i); }, @@ -9370,10 +9382,10 @@ "text" === t.mode ? new ue.MathNode("mtext", [a]) : /[0-9]/.test(t.text) - ? new ue.MathNode("mn", [a]) - : "\\prime" === t.text - ? new ue.MathNode("mo", [a]) - : new ue.MathNode("mi", [a])), + ? new ue.MathNode("mn", [a]) + : "\\prime" === t.text + ? new ue.MathNode("mo", [a]) + : new ue.MathNode("mi", [a])), n !== Zr[r.type] && r.setAttribute("mathvariant", n), r ); @@ -9447,8 +9459,8 @@ ? ta[r] ? e.withTextFontFamily(ta[r]) : ea[r] - ? e.withTextFontWeight(ea[r]) - : e.withTextFontShape(ra[r]) + ? e.withTextFontWeight(ea[r]) + : e.withTextFontShape(ra[r]) : e; }; _t({ @@ -9991,10 +10003,10 @@ r in ga ? (e = ga[r]) : "\\not" === r.substr(0, 4) - ? (e = "\\dotsb") - : r in j.math && - c.contains(["bin", "rel"], j.math[r].group) && - (e = "\\dotsb"), + ? (e = "\\dotsb") + : r in j.math && + c.contains(["bin", "rel"], j.math[r].group) && + (e = "\\dotsb"), e ); }); diff --git a/site/static/math/auto-render.js b/site/static/math/auto-render.js @@ -2,10 +2,10 @@ "object" == typeof exports && "object" == typeof module ? (module.exports = t(require("katex"))) : "function" == typeof define && define.amd - ? define(["katex"], t) - : "object" == typeof exports - ? (exports.renderMathInElement = t(require("katex"))) - : (e.renderMathInElement = t(e.katex)); + ? define(["katex"], t) + : "object" == typeof exports + ? (exports.renderMathInElement = t(require("katex"))) + : (e.renderMathInElement = t(e.katex)); })("undefined" != typeof self ? self : this, function (e) { return (function (e) { var t = {};