From 148fa76155fd79958b3eb6065d5493d9f5bcf05d Mon Sep 17 00:00:00 2001 From: macronova Date: Fri, 28 Jun 2024 17:14:24 -0700 Subject: [PATCH] Update flake --- common/users.nix | 12 +++++++----- flake.lock | 24 ++++++++++++------------ linux/blitzar/locale.nix | 14 +++----------- linux/protostar/gui.nix | 1 - 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/common/users.nix b/common/users.nix index 831633e..ca6daf0 100644 --- a/common/users.nix +++ b/common/users.nix @@ -26,11 +26,6 @@ in { home = { file = { - fonts = { - enable = osConfig.programs.steam.enable; - source = config.lib.file.mkOutOfStoreSymlink "/run/current-system/sw/share/X11/fonts"; - target = ".local/share/fonts"; - }; kvantum = { enable = config.programs.plasma.enable; target = ".config/Kvantum/kvantum.kvconfig"; @@ -125,6 +120,13 @@ in }; }; + i18n.supportedLocales = [ + "C.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + "ja_JP.UTF-8/UTF-8" + "zh_CN.UTF-8/UTF-8" + ]; + programs = { fish.enable = true; nh.enable = true; diff --git a/flake.lock b/flake.lock index 6e01fb1..da33623 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1719451710, - "narHash": "sha256-h+bFEQHQ46pBkEsOXbxmmY6QNPPGrgpDbNlHtAKG49M=", + "lastModified": 1719582740, + "narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=", "owner": "nix-community", "repo": "disko", - "rev": "8767dbf5d723b1b6834f4d09b217da7c31580d58", + "rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "hardware": { "locked": { - "lastModified": 1719487696, - "narHash": "sha256-pCsl9qFCuIuhIfGH03CiBOsy1LNwITC6VMb6/5tz+Qc=", + "lastModified": 1719552654, + "narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "14aadcba1a26c8c142453839f888afd0db8b2041", + "rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1719438532, - "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { @@ -277,11 +277,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { diff --git a/linux/blitzar/locale.nix b/linux/blitzar/locale.nix index d2fae48..6f9ab5a 100644 --- a/linux/blitzar/locale.nix +++ b/linux/blitzar/locale.nix @@ -2,17 +2,9 @@ { # Configure input methods - i18n = { - inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ fcitx5-nord fcitx5-rime ]; - }; - supportedLocales = [ - "C.UTF-8/UTF-8" - "en_US.UTF-8/UTF-8" - "ja_JP.UTF-8/UTF-8" - "zh_CN.UTF-8/UTF-8" - ]; + i18n.inputMethod = { + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ fcitx5-nord fcitx5-rime ]; }; # Configure keyboard mapping diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix index 4d9df38..88066bb 100644 --- a/linux/protostar/gui.nix +++ b/linux/protostar/gui.nix @@ -6,7 +6,6 @@ let in { home-manager.users.${usr} = { - home.packages = with jovianPkgs; [ feishin lutris