updated: merged in changes from core branch (wei still dont understand merging lol 🤦

This commit is contained in:
Serenity-F 2024-04-09 20:19:55 +10:00
commit 1a27cf40f1
5 changed files with 136 additions and 133 deletions

View file

@ -1,7 +1,78 @@
{ pkgs, ... }:
{ inputs, outputs, lib, config, pkgs, ... }:
{
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
## find a better home for these please <3
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
monospace = [
"TerminusTTF"
];
serif = [
"spleen-32x64"
];
sansSerif = [
"spleen-32x64"
];
};
};
};
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
nixpkgs = {
## configure nixpkgs instance
config = {
allowUnfree = true;
permittedInsecurePackages = [
];
};
## add overlays here
overlays = [
## to use overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
## or define it inline, for example:
# (final: prev: {
# hi = final.hello.overrideAttrs (oldAttrs: {
# patches = [ ./change-hello-to-hi.patch ];
# });
# })
];
};
# This will add each flake input as a registry
# To make nix3 commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs'
(name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
programs = {
traceroute.enable = true;
fish.enable = true;
@ -9,18 +80,13 @@
};
environment.systemPackages = with pkgs; [
services.flatpak.enable = true;
environment.systemPackages = with pkgs; [
## temporary
waybar
## nixos
# nix-tree
# nix-init
# nix-index
# nixpkgs-review
# nix-output-monitor
## filsesystem
udiskie
ntfs3g
@ -48,35 +114,12 @@
libsecret
git-crypt
## nixos
# nix-tree
# nix-init
# nix-index
# nixpkgs-review
# nix-output-monitor
];
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
monospace = [
"TerminusTTF"
];
serif = [
"spleen-32x64"
];
sansSerif = [
"spleen-32x64"
];
};
};
};
}