diff --git a/flake.lock b/flake.lock index d631c9f..37fc4b4 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1703271201, - "narHash": "sha256-9uB7x1XP+/+We4mYpxC8UMgxlC0efP6P+4dsgqFuxCU=", + "lastModified": 1703990467, + "narHash": "sha256-LItEeQVwDfLnavNskwdfRnonbEdq8DYiJlWRtF+bwng=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "010a625bd74bc623153344f52f71cc965b31d75a", + "rev": "1a41453cba42a3a1af2fff003be455ddbd75386c", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1703162528, - "narHash": "sha256-pQ41wN6JlStkZOhRTIHEpuwVywLdh+xzZQW1+FzdjVs=", + "lastModified": 1704072400, + "narHash": "sha256-Es4zcFoCJ+Pa9TN46VoqgNlYznuhc6s50LRcDqQEATs=", "owner": "nix-community", "repo": "disko", - "rev": "a050895e4eb06e0738680021a701ea05dc8dbfc9", + "rev": "59f915b45a38cb0ec0e97a713237877a06b43386", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "hardware": { "locked": { - "lastModified": 1702453208, - "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", + "lastModified": 1704124233, + "narHash": "sha256-lBHs/yUtkcGgapHRS31oOb5NqvnVrikvktGOW8rK+sE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", + "rev": "f752581d6723a10da7dfe843e917a3b5e4d8115a", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1703368619, - "narHash": "sha256-ZGPMYL7FMA6enhuwby961bBANmoFX14EA86m2/Jw5Jo=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a2523ea0343b056ba240abbac90ab5f116a7aa7b", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1700085753, - "narHash": "sha256-qtib7f3eRwfaUF+VziJXiBcZFqpHCAXS4HlrFsnzzl4=", + "lastModified": 1703666786, + "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "008d78cc21959e33d0d31f375b88353a7d7121ae", + "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", "type": "gitlab" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702777222, - "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", + "lastModified": 1703950681, + "narHash": "sha256-veU5bE4eLOmi7aOzhE7LfZXcSOONRMay0BKv01WHojo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", + "rev": "0aad9113182747452dbfc68b93c86e168811fa6c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703063446, - "narHash": "sha256-e59l84kPNX+clUJUvHJ6+0C3Tw+gYeJn/QaH1dr/3kg=", + "lastModified": 1704008649, + "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c33cd6bf01cf09f77bfdf6741cddfffa2cd5640", + "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1703499205, + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702937567, - "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", + "lastModified": 1703991717, + "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", + "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", "type": "github" }, "original": { diff --git a/linux/blitzar/configuration.nix b/linux/blitzar/configuration.nix index a4398ea..a029c8e 100644 --- a/linux/blitzar/configuration.nix +++ b/linux/blitzar/configuration.nix @@ -6,21 +6,30 @@ { - # Configure boot loader - boot.loader = { - efi.canTouchEfiVariables = true; - grub = let yorha = pkgs.yorha-grub-theme; in { - enable = true; - device = "nodev"; - efiSupport = true; - splashImage = "${yorha}/background.png"; - theme = yorha; + # Configure boot + boot = { + initrd.systemd.enable = true; + loader = { + efi.canTouchEfiVariables = true; + grub = let yorha = pkgs.yorha-grub-theme; in { + enable = true; + device = "nodev"; + efiSupport = true; + splashImage = "${yorha}/background.png"; + theme = yorha; + }; + timeout = 3; + }; + plymouth = { + enable = true; + extraConfig = "DeviceScale=1"; + theme = "target_2"; + themePackages = [ pkgs.adi1090x-plymouth-themes ]; }; - timeout = 3; }; # Set your time zone. - time.timeZone = "America/Los_Angeles"; + time.timeZone = "Asia/Shanghai"; # Enable bluetooth hardware.bluetooth.enable = true; diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 9199cdc..f4613fc 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -89,10 +89,13 @@ let usr = config.constants.userName; in { autoLogin.user = usr; sddm = { enable = true; - autoLogin.relogin = true; + wayland.enable = true; }; }; - desktopManager.plasma5.enable = true; + desktopManager.plasma5 = { + enable = true; + useQtScaling = true; + }; videoDrivers = [ "amdgpu" ]; }; };