diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix index 04e3f47..7411a5c 100644 --- a/hosts/nom/default.nix +++ b/hosts/nom/default.nix @@ -8,8 +8,9 @@ nixos-hardware.common-gpu-intel nixos-hardware.common-pc-laptop nixos-hardware.common-pc-laptop-ssd - ../../core - ../../dev + + ../../modules/core + ../../modules/dev ../../modules/efi.nix ../../modules/laptop.nix diff --git a/core/default.nix b/modules/core/default.nix similarity index 100% rename from core/default.nix rename to modules/core/default.nix diff --git a/core/inputrc.nix b/modules/core/inputrc.nix similarity index 100% rename from core/inputrc.nix rename to modules/core/inputrc.nix diff --git a/core/issue.nix b/modules/core/issue.nix similarity index 100% rename from core/issue.nix rename to modules/core/issue.nix diff --git a/core/nix.nix b/modules/core/nix.nix similarity index 100% rename from core/nix.nix rename to modules/core/nix.nix diff --git a/core/resolved.nix b/modules/core/resolved.nix similarity index 100% rename from core/resolved.nix rename to modules/core/resolved.nix diff --git a/core/ssh.nix b/modules/core/ssh.nix similarity index 100% rename from core/ssh.nix rename to modules/core/ssh.nix diff --git a/core/tmux.nix b/modules/core/tmux.nix similarity index 100% rename from core/tmux.nix rename to modules/core/tmux.nix diff --git a/core/xdg.nix b/modules/core/xdg.nix similarity index 100% rename from core/xdg.nix rename to modules/core/xdg.nix diff --git a/dev/default.nix b/modules/dev/default.nix similarity index 100% rename from dev/default.nix rename to modules/dev/default.nix diff --git a/dev/documentation.nix b/modules/dev/documentation.nix similarity index 100% rename from dev/documentation.nix rename to modules/dev/documentation.nix diff --git a/dev/virt-manager.nix b/modules/dev/virt-manager.nix similarity index 100% rename from dev/virt-manager.nix rename to modules/dev/virt-manager.nix diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix new file mode 100644 index 0000000..e48e307 --- /dev/null +++ b/modules/graphical/default.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + imports = [ + ./fonts.nix + ]; + + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = with pkgs; [xdg-desktop-portal-gtk]; + }; +} diff --git a/modules/graphical/fonts.nix b/modules/graphical/fonts.nix new file mode 100644 index 0000000..5bcbfa4 --- /dev/null +++ b/modules/graphical/fonts.nix @@ -0,0 +1,50 @@ +{pkgs, ...}: { + fonts = { + enableDefaultFonts = false; + enableGhostscriptFonts = false; + fontDir.enable = false; + fontconfig = { + defaultFonts = { + sansSerif = ["IBM Plex Sans"]; + serif = ["IBM Plex Sans"]; + monospace = ["Hack Nerd Font"]; + emoji = ["Noto Color Emoji"]; + }; + localConf = '' + + + + + monospace + + emoji + + + + sans-serif + + emoji + + + + serif + + emoji + + + + ''; + }; + fonts = with pkgs; [ + (nerdfonts.override {fonts = ["Hack"];}) + ibm-plex + dejavu_fonts + unifont + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + noto-fonts-extra + ]; + }; +}