diff --git a/flake.nix b/flake.nix index 72d6f9a..3dc0eec 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ ./modules/nixos/cli.nix ./modules/nixos/sops.nix ./modules/nixos/impermanence.nix + ./modules/nixos/font.nix ] ++ extraModules; }; in { diff --git a/modules/nixos/base.nix b/modules/nixos/base.nix index df530d8..4f06774 100644 --- a/modules/nixos/base.nix +++ b/modules/nixos/base.nix @@ -3,6 +3,10 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; time.timeZone = "Asia/Tokyo"; i18n.defaultLocale = "ja_JP.UTF-8"; + services.xserver.xkb.layout = "jp"; + services.xserver.xkb.variant = ""; + services.xserver.xkb.options = "ctrl:nocaps"; + console.keyMap = "jp106"; # common user users.users.moons = { diff --git a/modules/nixos/font.nix b/modules/nixos/font.nix new file mode 100644 index 0000000..325d5bb --- /dev/null +++ b/modules/nixos/font.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: + +{ + fonts = { + packages = (with pkgs; + [ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + terminus_font + cantarell-fonts + font-awesome + ] + ); + fontDir.enable = true; + fontconfig = { + defaultFonts = { + serif = [ + "Noto Serif CJK JP" + "Noto Color Emoji" + ]; + sansSerif =[ + "Noto Sans CJK JP" + "Noto Clor Emoji" + ]; + emoji = ["Noto Color Emoji"]; + }; + }; + }; +} \ No newline at end of file