Merge branch 'main' of ssh://github.com/ryan4yin/nix-config

Author: DataEraserC

flake.lock

@@ -100,7 +100,7 @@
     };
 
     lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.3";
+      url = "github:nix-community/lanzaboote/v1.0.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -128,7 +128,7 @@
     };
 
     disko = {
-      url = "github:nix-community/disko/v1.11.0";
+      url = "github:nix-community/disko/v1.13.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

flake.nix

@@ -19,14 +19,14 @@ let
       version = "4.1.0.13";
       src = fetchurl {
         url = "https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-        hash = "sha256-o6a7773agYqrP4dXsjzSUT2Du77gZ4wN1F2e0uvEzVc=";
+        hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo=";
       };
     };
     x86_64-linux = {
       version = "4.1.0.13";
       src = fetchurl {
         url = "https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-        hash = "sha256-Pfl81lNVlMJWyPqFli1Af2q8pRLujcKCjYoILCKDx8U=";
+        hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8=";
       };
     };
   };

hardening/bwraps/wechat.nix

@@ -22,7 +22,7 @@
     tokei # count lines of code, alternative to cloc
 
     # db related
-    mycli
+    # mycli
     pgcli
     mongosh
     sqlite

home/base/tui/dev-tools.nix

@@ -15,7 +15,7 @@ in
       # NOTE: Saving the password and OTP together runs counter to the purpose of secondary verification!
       # exts.pass-otp
 
-      exts.pass-import # a generic importer tool from other password managers
+      # exts.pass-import # a generic importer tool from other password managers
       exts.pass-update # an easy flow for updating passwords
     ]);
     # See the “Environment variables” section of pass(1) and the extension man pages for more information about the available keys.

home/base/tui/password-store/default.nix

@@ -75,11 +75,11 @@ in
       ])
       ++ (with pkgs-x64; [
         # a game launcher - great for epic games and gog games
-        (heroic.override {
-          extraPkgs = _pkgs: [
-            pkgs.gamescope # aarch64
-          ];
-        })
+        # (heroic.override {
+        #   extraPkgs = _pkgs: [
+        #     pkgs.gamescope # aarch64
+        #   ];
+        # })
       ]);
 
     # a GUI game launcher for Steam/GoG/Epic
@@ -91,7 +91,6 @@ in
       protonPackages = [ pkgs-x64.proton-ge-bin ];
       winePackages = with pkgs-x64; [
         wineWow64Packages.full
-        wineWowPackages.stagingFull
       ];
       extraPackages = with pkgs; [
         winetricks

home/linux/gui/base/gaming.nix

@@ -50,7 +50,7 @@
     "fontScale": 1,
     "frameRadius": 12,
     "frameThickness": 8,
-    "hideOnOverview": false,
+    "hideOnOverview": true,
     "marginHorizontal": 5,
     "marginVertical": 5,
     "middleClickAction": "none",
@@ -239,10 +239,6 @@
         "enabled": true,
         "id": "calendar-month-card"
       },
-      {
-        "enabled": true,
-        "id": "timer-card"
-      },
       {
         "enabled": true,
         "id": "weather-card"
@@ -387,6 +383,7 @@
     "pinnedStatic": false,
     "position": "bottom",
     "showDockIndicator": false,
+    "showFrameIndicator": true,
     "showLauncherIcon": false,
     "sitOnFrame": false,
     "size": 1
@@ -594,6 +591,13 @@
         "countdownEnabled": true,
         "enabled": true,
         "keybind": "6"
+      },
+      {
+        "action": "rebootToUefi",
+        "command": "",
+        "countdownEnabled": true,
+        "enabled": true,
+        "keybind": ""
       }
     ],
     "showHeader": true,

home/linux/gui/base/noctalia/config/settings.json

@@ -3,9 +3,8 @@
   config,
   mylib,
   pkgs,
-  pkgs-patched,
-  noctalia-shell,
   wallpapers,
+  noctalia-shell,
   ...
 }:
 

home/linux/gui/base/noctalia/default.nix

@@ -10,6 +10,10 @@
     nixos-apple-silicon.nixosModules.default
   ];
 
+  # NOTE:macbook do not have a tpm2 device for luks auto unlock
+  # we have to enter the luks passphrase on boot, so remove login manager here to reduce the pain.
+  services.greetd.settings.default_session.command = lib.mkForce "$HOME/.wayland-session";
+
   zramSwap.memoryPercent = lib.mkForce 75;
 
   nix.settings = {
@@ -59,12 +63,12 @@
     powerKeyLongPress = "poweroff";
   };
   systemd.targets.sleep.enable = true;
-  systemd.sleep.extraConfig = ''
-    AllowSuspend=yes
-    AllowHibernate=no
-    AllowSuspendThenHibernate=no
-    HibernateDelaySec=5min
-  '';
+  systemd.sleep.settings.Sleep = {
+    AllowSuspend = "yes";
+    AllowHibernate = "no";
+    AllowSuspendThenHibernate = "no";
+    HibernateDelaySec = "5min";
+  };
 
   # After adding this snippet, you need to restart the system for the touchbar to work.
   hardware.apple.touchBar = {

hosts/12kingdoms-shoukei/apple-silicon.nix

@@ -100,6 +100,7 @@ in
     # set mode to 755, otherwise systemd will set it to 777, which cause problems.
     # relatime: Update inode access times relative to modify or change time.
     options = [
+      "size=1G"
       "relatime"
       "mode=755"
     ];