swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: consolidate overrides into overlay

Browse source
This commit is contained in:
Swarsel 2024-08-10 16:50:06 +02:00
parent ec004d7859
commit a298c8cfac
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
8 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
SwarselSystems.org
View file

@ -150,7 +150,7 @@ For styling, I am using the [[https://github.com/danth/stylix][stylix]] NixOS mo
}; };
monospace = { monospace = {
package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; package = pkgs.nerdfonts; # has overrides
name = "FiraCode Nerd Font Mono"; name = "FiraCode Nerd Font Mono";
}; };
@ -6503,7 +6503,7 @@ Programming languages and default lsp's are defined here: [[#h:0e7e8bea-ec58-499
# audio stuff # audio stuff
spek # spectrum analyzer spek # spectrum analyzer
losslessaudiochecker losslessaudiochecker
ffmpeg_5-full ffmpeg_7-full
flac flac
mediainfo mediainfo
picard-tools picard-tools
@ -6633,14 +6633,14 @@ Programming languages and default lsp's are defined here: [[#h:0e7e8bea-ec58-499
mu mu
# latex and related packages # latex and related packages
(pkgs.texlive.combine { (texlive.combine {
inherit (pkgs.texlive) scheme-full inherit (pkgs.texlive) scheme-full
dvisvgm dvipng# for preview and export as html dvisvgm dvipng# for preview and export as html
wrapfig amsmath ulem hyperref capt-of; wrapfig amsmath ulem hyperref capt-of;
}) })
# font stuff # font stuff
(nerdfonts.override { fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; }) nerdfonts # has overrides
noto-fonts-emoji noto-fonts-emoji
font-awesome_5 font-awesome_5
noto-fonts noto-fonts
@ -7867,13 +7867,7 @@ I used to build the firefox addon =bypass-paywalls-clean= myself here, but the m
{ {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox.override { package = pkgs.firefox; # uses overrides
nativeMessagingHosts = [
pkgs.tridactyl-native
pkgs.browserpass
pkgs.plasma5Packages.plasma-browser-integration
];
};
policies = { policies = {
CaptivePortal = false; CaptivePortal = false;
DisableFirefoxStudies = true; DisableFirefoxStudies = true;
@ -8400,10 +8394,8 @@ Currently, I am too lazy to explain every option here, but most of it is very se
heroic heroic
# minecraft # minecraft
prismlauncher # has overrides
temurin-bin-17 temurin-bin-17
(prismlauncher.override {
glfw = pkgs.glfw-wayland-minecraft;
})
]; ];
} }

22
overlays/default.nix
View file

@ -1,9 +1,25 @@
{ inputs, ... }: { { inputs, ... }: {
additions = final: _prev: import ../pkgs { pkgs = final; }; additions = final: _prev: import ../pkgs { pkgs = final; };
modifications = final: _prev: { 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 { # river = prev.river.overrideAttrs (oldAttrs: rec {
# pname = "river"; # pname = "river";

2
profiles/TEMPLATE/nixos.nix
View file

@ -72,7 +72,7 @@
}; };
monospace = { monospace = {
package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; package = pkgs.nerdfonts; # has overrides
name = "FiraCode Nerd Font Mono"; name = "FiraCode Nerd Font Mono";
}; };

8
profiles/common/home/firefox.nix
View file

@ -2,13 +2,7 @@
{ {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox.override { package = pkgs.firefox; # uses overrides
nativeMessagingHosts = [
pkgs.tridactyl-native
pkgs.browserpass
pkgs.plasma5Packages.plasma-browser-integration
];
};
policies = { policies = {
CaptivePortal = false; CaptivePortal = false;
DisableFirefoxStudies = true; DisableFirefoxStudies = true;

4
profiles/common/home/packages.nix
View file

@ -136,14 +136,14 @@
mu mu
# latex and related packages # latex and related packages
(pkgs.texlive.combine { (texlive.combine {
inherit (pkgs.texlive) scheme-full inherit (pkgs.texlive) scheme-full
dvisvgm dvipng# for preview and export as html dvisvgm dvipng# for preview and export as html
wrapfig amsmath ulem hyperref capt-of; wrapfig amsmath ulem hyperref capt-of;
}) })
# font stuff # font stuff
(nerdfonts.override { fonts = [ "FiraMono" "FiraCode" "NerdFontsSymbolsOnly" ]; }) nerdfonts # has overrides
noto-fonts-emoji noto-fonts-emoji
font-awesome_5 font-awesome_5
noto-fonts noto-fonts

2
profiles/common/home/stylix.nix
View file

@ -36,7 +36,7 @@
}; };
monospace = { monospace = {
package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; package = pkgs.nerdfonts; # has overrides
name = "FiraCode Nerd Font Mono"; name = "FiraCode Nerd Font Mono";
}; };

2
profiles/common/nixos/stylix.nix
View file

@ -36,7 +36,7 @@
}; };
monospace = { monospace = {
package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; package = pkgs.nerdfonts; # has overrides
name = "FiraCode Nerd Font Mono"; name = "FiraCode Nerd Font Mono";
}; };

4
profiles/optional/home/gaming.nix
View file

@ -19,9 +19,7 @@
heroic heroic
# minecraft # minecraft
prismlauncher # has overrides
temurin-bin-17 temurin-bin-17
(prismlauncher.override {
glfw = pkgs.glfw-wayland-minecraft;
})
]; ];
} }