feat: qtct

config/hosts/imxyy-nix-server/build.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   sopsRoot,
   ...
@@ -15,10 +14,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-server-nixremote.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];

config/hosts/imxyy-nix-server/minecraft.nix

@@ -8,7 +8,7 @@
       WorkingDirectory = "/opt/minecraft/fabric1.20.6";
       ExecStart = "${lib.getExe' pkgs.openjdk21 "java"} -Xms1G -Xmx5G -jar fabric-server-mc.1.20.6-loader.0.15.11-launcher.1.0.1.jar";
       Restart = "always";
-      RestartSec = "10s";
+      RestartSec = 120;
     };
   };
   my.persist = {

config/hosts/imxyy-nix-server/net.nix

@@ -450,10 +450,8 @@
   };
   systemd.services."headscale" = {
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 120;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
     };
     after = [
       "podman-obligator.service"
@@ -472,10 +470,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-server.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];

config/hosts/imxyy-nix-x16/home.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   username,
@@ -38,6 +37,21 @@
         PATH = "/home/${username}/bin:$PATH";
       };
     };
+
+    programs.niri.settings = {
+      environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
+      outputs = {
+        eDP-1 = {
+          enable = true;
+          mode = {
+            width = 1920;
+            height = 1200;
+            refresh = 60.002;
+          };
+          scale = 1.25;
+        };
+      };
+    };
   };
 
   my = {
@@ -45,6 +59,7 @@
     cli.all.enable = true;
     coding.all.enable = true;
     desktop.all.enable = true;
+    virt.moonlight.enable = true;
 
     desktop.browser.librewolf.enable = lib.mkForce false;
 
@@ -92,15 +107,6 @@
           "image/png" = imageviewer;
           "image/webp" = imageviewer;
         };
-      extraBookmarks =
-        let
-          homedir = config.my.home.home.homeDirectory;
-        in
-        [
-          "file://${homedir}/NAS NAS"
-          "file://${homedir}/NAS/imxyy_soope_ NAS imxyy_soope_"
-          "file://${homedir}/NAS/imxyy_soope_/OS NAS OS"
-        ];
     };
     persist = {
       enable = true;

config/hosts/imxyy-nix-x16/net.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   sopsRoot,
   ...
@@ -10,7 +9,48 @@
     "biosdevname=0"
     "net.ifnames=0"
   ];
-  networking.networkmanager.enable = true;
+  networking = {
+    networkmanager.enable = true;
+    firewall.enable = false;
+    nftables = {
+      enable = true;
+      flushRuleset = true;
+      ruleset = ''
+        table inet firewall {
+          set LANv4 {
+            type ipv4_addr
+            flags interval
+
+            elements = { 10.0.0.0/8, 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, 169.254.0.0/16 }
+          }
+          set LANv6 {
+            type ipv6_addr
+            flags interval
+
+            elements = { fd00::/8, fe80::/10 }
+          }
+
+          chain output {
+            type filter hook output priority 100; policy accept;
+          }
+
+          chain input {
+            type filter hook input priority 0; policy drop;
+            iif lo accept
+            ct state invalid drop
+            ct state established,related accept
+
+            ip saddr @LANv4 accept
+            ip6 saddr @LANv6 accept
+          }
+
+          chain forward {
+            type filter hook forward priority 0; policy drop;
+          }
+        }
+      '';
+    };
+  };
 
   sops.secrets.dae-imxyy-nix-x16 = {
     sopsFile = sopsRoot + /dae-imxyy-nix-x16.dae;
@@ -44,10 +84,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix-x16.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];

config/hosts/imxyy-nix-x16/nixos.nix

@@ -154,21 +154,6 @@
         "vfs-cache-mode=full"
       ];
     };
-    "/home/${username}/NAS" = {
-      device = "//10.0.0.1/share";
-      fsType = "cifs";
-      options = [
-        "username=nas"
-        "password=nasshare"
-        "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"
-        "nodev"
-        "nofail"
-        "uid=1000"
-        "gid=100"
-        "vers=3"
-        "rw"
-      ];
-    };
   };
 
   my.persist.nixosDirs = [ "/etc/NetworkManager/system-connections" ];

config/hosts/imxyy-nix/net.nix

@@ -115,10 +115,8 @@
     enable = true;
     script = "${pkgs.easytier}/bin/easytier-core -c ${config.sops.secrets.et-imxyy-nix.path}";
     serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
+      Restart = "always";
-      RestartMaxDelaySec = lib.mkOverride 500 "1m";
+      RestartSec = 30;
-      RestartSec = lib.mkOverride 500 "100ms";
-      RestartSteps = lib.mkOverride 500 9;
       User = "root";
     };
     wantedBy = [ "multi-user.target" ];

flake.lock

@@ -668,11 +668,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1752078530,
+        "lastModified": 1752291616,
-        "narHash": "sha256-TrRmlYdhWcadWvBpDjB9Xlry4uT4ZUIO46d+o5tjtCQ=",
+        "narHash": "sha256-zpPFo4cgr5tOy8DCLIoD++idsKjnzgVPnBeZLmazYc4=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "d231d92313192d4d0c78d6ef04167fed9dee87cf",
+        "rev": "30962469e2e8fb93c3672ee605316b89b8e9a198",
         "type": "github"
       },
       "original": {

modules/desktop/style/default.nix

@@ -64,6 +64,15 @@ lib.my.makeSwitch {
         ];
         platformTheme.name = "qtct";
       };
+
+      xdg.configFile = {
+        "qt5ct/qt5ct.conf".source = pkgs.replaceVars ./qtct/qt5ct.conf {
+          darker = pkgs.libsForQt5.qt5ct + /share/qt5ct/colors/darker.conf;
+        };
+        "qt6ct/qt6ct.conf".source = pkgs.replaceVars ./qtct/qt6ct.conf {
+          darker = pkgs.qt6ct + /share/qt6ct/colors/darker.conf;
+        };
+      };
     };
   };
 }

modules/desktop/style/qtct/qt5ct.conf

@@ -0,0 +1,32 @@
+[Appearance]
+color_scheme_path=@darker@
+custom_palette=true
+icon_theme=Papirus-Dark
+standard_dialogs=xdgdesktopportal
+style=Darkly
+
+[Fonts]
+fixed="Noto Sans CJK SC,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
+general="Noto Sans CJK SC,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=@Invalid()
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\t\0\0\x4\x1b\0\0\0\0\0\0\0\0\0\0\x3\t\0\0\x4\x1b\0\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\x3\t\0\0\x4\x1b)
+
+[Troubleshooting]
+force_raster_widgets=1
+ignored_applications=@Invalid()

modules/desktop/style/qtct/qt6ct.conf

@@ -0,0 +1,32 @@
+[Appearance]
+color_scheme_path=@darker@
+custom_palette=true
+icon_theme=Papirus-Dark
+standard_dialogs=xdgdesktopportal
+style=Darkly
+
+[Fonts]
+fixed="Noto Sans CJK SC,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
+general="Noto Sans CJK SC,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=@Invalid()
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\t\0\0\x4\x1b\0\0\0\0\0\0\0\0\0\0\x3\t\0\0\x4\x1b\0\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\x3\t\0\0\x4\x1b)
+
+[Troubleshooting]
+force_raster_widgets=1
+ignored_applications=@Invalid()

modules/xdg.nix

@@ -53,10 +53,6 @@ in
           "file://${homedir}/Videos 视频"
           "file://${homedir}/Music 音乐"
           "file://${homedir}/workspace 工作空间"
-          "file://${homedir}/Documents/%E7%8F%AD%E7%BA%A7%E4%BA%8B%E5%8A%A1 班级事务"
-          "file://${homedir}/NAS NAS"
-          "file://${homedir}/NAS/imxyy_soope_ NAS imxyy_soope_"
-          "file://${homedir}/NAS/imxyy_soope_/OS NAS OS"
         ];
       };
   };