diff --git a/core/display.nix b/core/display.nix index 131cd77..4ab3ffe 100644 --- a/core/display.nix +++ b/core/display.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ @@ -101,4 +94,23 @@ #]; #}; + ## I put fonts here because i didn't know where tf else to put them lol + ## CURRENTLY BROKEN, PLEASE FIX - Out of date ? + fonts = { + packages = with pkgs; [ + spleen + terminus_font + terminus_font_ttf + (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) + ]; + fontDir.enable = true; + fontconfig = { + defaultFonts = { + serif = [ "spleen-32x64" ]; + sansSerif = [ "spleen-32x64" ]; + monospace = [ "TerminusTTF" ]; + }; + }; + }; + } diff --git a/core/fonts.nix b/core/fonts.nix deleted file mode 100644 index 8a10540..0000000 --- a/core/fonts.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ inputs, outputs, lib, config, pkgs, ... }: - -{ - - imports = [ - #./file.nix - ]; - - ## I put fonts here because i didn't know where tf else to put them lol - ## CURRENTLY BROKEN - PLEASE FIX - fonts = { - packages = with pkgs; [ - spleen - terminus_font - terminus_font_ttf - (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) - ]; - fontDir.enable = true; - fontconfig = { - defaultFonts = { - serif = [ "spleen-32x64" ]; - sansSerif = [ "spleen-32x64" ]; - monospace = [ "TerminusTTF" ]; - }; - }; - }; - -} diff --git a/core/packages.nix b/core/packages.nix index a4cb5ce..f2d193e 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -3,16 +3,16 @@ { imports = [ - ./fonts.nix + #./file.nix ]; nixpkgs = { config = { allowUnfree = true; + ## Place insecure packages here permittedInsecurePackages = [ ]; - #allowUnsupportedSystem = true; }; ## [START - Stolen code, no clue how it works :3 ] @@ -45,13 +45,6 @@ config.nix.registry; ## [END - Stolen code, mostly understand from here again] - hardware.opentabletdriver = { - enable = true; - #package = [ ]; - #daemon.enable = true; - #blacklistedKernelModules = [ ]; - }; - environment.sessionVariables = rec { XDG_CACHE_HOME = "$HOME/.cache"; XDG_CONFIG_HOME = "$HOME/.config";