diff --git a/SwarselSystems.org b/SwarselSystems.org index f00a873..64b56e7 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -150,7 +150,7 @@ For styling, I am using the [[https://github.com/danth/stylix][stylix]] NixOS mo }; monospace = { - package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; + package = pkgs.nerdfonts; # has overrides name = "FiraCode Nerd Font Mono"; }; @@ -6503,7 +6503,7 @@ Programming languages and default lsp's are defined here: [[#h:0e7e8bea-ec58-499 # audio stuff spek # spectrum analyzer losslessaudiochecker - ffmpeg_5-full + ffmpeg_7-full flac mediainfo picard-tools @@ -6633,14 +6633,14 @@ Programming languages and default lsp's are defined here: [[#h:0e7e8bea-ec58-499 mu # latex and related packages - (pkgs.texlive.combine { + (texlive.combine { inherit (pkgs.texlive) scheme-full dvisvgm dvipng# for preview and export as html wrapfig amsmath ulem hyperref capt-of; }) # font stuff - (nerdfonts.override { fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; }) + nerdfonts # has overrides noto-fonts-emoji font-awesome_5 noto-fonts @@ -7867,13 +7867,7 @@ I used to build the firefox addon =bypass-paywalls-clean= myself here, but the m { programs.firefox = { enable = true; - package = pkgs.firefox.override { - nativeMessagingHosts = [ - pkgs.tridactyl-native - pkgs.browserpass - pkgs.plasma5Packages.plasma-browser-integration - ]; - }; + package = pkgs.firefox; # uses overrides policies = { CaptivePortal = false; DisableFirefoxStudies = true; @@ -8400,10 +8394,8 @@ Currently, I am too lazy to explain every option here, but most of it is very se heroic # minecraft + prismlauncher # has overrides temurin-bin-17 - (prismlauncher.override { - glfw = pkgs.glfw-wayland-minecraft; - }) ]; } diff --git a/overlays/default.nix b/overlays/default.nix index b9a8554..50e49f3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,9 +1,25 @@ { inputs, ... }: { additions = final: _prev: import ../pkgs { pkgs = final; }; modifications = final: _prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); + vesktop = _prev.vesktop.override { + withSystemVencord = true; + }; + + nerdfonts = _prev.nerdfonts.override { + fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; + }; + + firefox = _prev.firefox.override { + nativeMessagingHosts = [ + _prev.tridactyl-native + _prev.browserpass + _prev.plasma5Packages.plasma-browser-integration + ]; + }; + + prismlauncher = _prev.prismlauncher.override { + glfw = _prev.glfw-wayland-minecraft; + }; # river = prev.river.overrideAttrs (oldAttrs: rec { # pname = "river"; diff --git a/profiles/TEMPLATE/nixos.nix b/profiles/TEMPLATE/nixos.nix index 3097789..39d80bd 100644 --- a/profiles/TEMPLATE/nixos.nix +++ b/profiles/TEMPLATE/nixos.nix @@ -72,7 +72,7 @@ }; monospace = { - package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; + package = pkgs.nerdfonts; # has overrides name = "FiraCode Nerd Font Mono"; }; diff --git a/profiles/common/home/firefox.nix b/profiles/common/home/firefox.nix index a4176cf..c1bf323 100644 --- a/profiles/common/home/firefox.nix +++ b/profiles/common/home/firefox.nix @@ -2,13 +2,7 @@ { programs.firefox = { enable = true; - package = pkgs.firefox.override { - nativeMessagingHosts = [ - pkgs.tridactyl-native - pkgs.browserpass - pkgs.plasma5Packages.plasma-browser-integration - ]; - }; + package = pkgs.firefox; # uses overrides policies = { CaptivePortal = false; DisableFirefoxStudies = true; diff --git a/profiles/common/home/packages.nix b/profiles/common/home/packages.nix index dedcafd..286331e 100644 --- a/profiles/common/home/packages.nix +++ b/profiles/common/home/packages.nix @@ -136,14 +136,14 @@ mu # latex and related packages - (pkgs.texlive.combine { + (texlive.combine { inherit (pkgs.texlive) scheme-full dvisvgm dvipng# for preview and export as html wrapfig amsmath ulem hyperref capt-of; }) # font stuff - (nerdfonts.override { fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; }) + nerdfonts # has overrides noto-fonts-emoji font-awesome_5 noto-fonts diff --git a/profiles/common/home/stylix.nix b/profiles/common/home/stylix.nix index a9bf289..0eb35e9 100644 --- a/profiles/common/home/stylix.nix +++ b/profiles/common/home/stylix.nix @@ -36,7 +36,7 @@ }; monospace = { - package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; + package = pkgs.nerdfonts; # has overrides name = "FiraCode Nerd Font Mono"; }; diff --git a/profiles/common/nixos/stylix.nix b/profiles/common/nixos/stylix.nix index 6f6fcea..803e14d 100644 --- a/profiles/common/nixos/stylix.nix +++ b/profiles/common/nixos/stylix.nix @@ -36,7 +36,7 @@ }; monospace = { - package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; + package = pkgs.nerdfonts; # has overrides name = "FiraCode Nerd Font Mono"; }; diff --git a/profiles/optional/home/gaming.nix b/profiles/optional/home/gaming.nix index 34174ec..71caf72 100644 --- a/profiles/optional/home/gaming.nix +++ b/profiles/optional/home/gaming.nix @@ -19,9 +19,7 @@ heroic # minecraft + prismlauncher # has overrides temurin-bin-17 - (prismlauncher.override { - glfw = pkgs.glfw-wayland-minecraft; - }) ]; }