feat: 0517 update

2025-05-17 23:15:16 +08:00
parent 3a12722913
commit dea4d8ed4c
33 changed files with 85 additions and 127 deletions
--- a/config/hosts/imxyy-nix-server/ai.nix
+++ b/config/hosts/imxyy-nix-server/ai.nix
@@ -1,4 +1,3 @@
-_:
 {
  services.open-webui = {
    enable = true;
--- a/config/hosts/imxyy-nix-server/caddy.nix
+++ b/config/hosts/imxyy-nix-server/caddy.nix
@@ -1,4 +1,3 @@
-_:
 {
  services.caddy = {
    enable = true;
--- a/config/hosts/imxyy-nix-server/default.nix
+++ b/config/hosts/imxyy-nix-server/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./nixos.nix
--- a/config/hosts/imxyy-nix-server/gitea.nix
+++ b/config/hosts/imxyy-nix-server/gitea.nix
@@ -1,4 +1,3 @@
-_:
 {
  services.caddy.virtualHosts."git.imxyy.top" = {
    extraConfig = ''
--- a/config/hosts/imxyy-nix-server/homepage.nix
+++ b/config/hosts/imxyy-nix-server/homepage.nix
@@ -1,4 +1,3 @@
-_:
 {
  virtualisation.oci-containers = {
    containers = {
--- a/config/hosts/imxyy-nix-server/matrix.nix
+++ b/config/hosts/imxyy-nix-server/matrix.nix
@@ -1,4 +1,3 @@
-_:
 {
  services.matrix-synapse = {
    enable = true;
--- a/config/hosts/imxyy-nix-server/nginx.nix
+++ b/config/hosts/imxyy-nix-server/nginx.nix
@@ -1,4 +1,3 @@
-_:
 {
  services.nginx = {
    enable = true;
--- a/config/hosts/imxyy-nix-server/samba.nix
+++ b/config/hosts/imxyy-nix-server/samba.nix
@@ -1,4 +1,3 @@
-_:
 {
  services.samba = {
    enable = true;
--- a/config/hosts/imxyy-nix-server/yesplaymusic.nix
+++ b/config/hosts/imxyy-nix-server/yesplaymusic.nix
@@ -1,4 +1,3 @@
-_:
 {
  virtualisation.oci-containers.containers."YesPlayMusic" = {
    image = "git.imxyy.top/imxyy1soope1/yesplaymusic:latest";
--- a/config/hosts/imxyy-nix-wsl/default.nix
+++ b/config/hosts/imxyy-nix-wsl/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./nixos.nix
--- a/config/hosts/imxyy-nix/default.nix
+++ b/config/hosts/imxyy-nix/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./nixos.nix
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1745523430,
-        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
+        "lastModified": 1746562888,
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
        "type": "github"
      },
      "original": {
@@ -105,11 +105,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744976007,
-        "narHash": "sha256-hT6OHL8xLp6PZba9hPDxvdGwNkf5ROH9L7ATtnuODpk=",
+        "lastModified": 1747424768,
+        "narHash": "sha256-pCvcwhwfGsQksBDWRClY3TALLYlascau3SIgFzDODzQ=",
        "owner": "Bali10050",
        "repo": "Darkly",
-        "rev": "e08797c12eba9ac3ff6906cc46c4728f80e27462",
+        "rev": "d537f5199e9e2ef11f900e658027864f7e0e6286",
        "type": "github"
      },
      "original": {
@@ -148,11 +148,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1746772806,
-        "narHash": "sha256-5/Nq62wjkZrOhUULTFjgi4Dsc7T8kIluUPkoLsyAeUA=",
+        "lastModified": 1747392669,
+        "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "505bf684711e964c8f84d4c804e38f62b24accec",
+        "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb",
        "type": "github"
      },
      "original": {
@@ -289,7 +289,6 @@
      "inputs": {
        "nixpkgs-lib": [
          "stylix",
-          "nur",
          "nixpkgs"
        ]
      },
@@ -358,27 +357,6 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "fromYaml": {
      "flake": false,
      "locked": {
@@ -544,11 +522,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1746798521,
-        "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=",
+        "lastModified": 1747439237,
+        "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c",
+        "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708",
        "type": "github"
      },
      "original": {
@@ -566,11 +544,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1746369725,
-        "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
+        "lastModified": 1747279714,
+        "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
+        "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
        "type": "github"
      },
      "original": {
@@ -670,11 +648,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1746142190,
-        "narHash": "sha256-t36K3TWLMRWoGyjYyo+H8bBquDcp4orZqNZVagWNjwY=",
+        "lastModified": 1747491150,
+        "narHash": "sha256-UpHzUfmxpKko/4f/Nw971wfw+0EgHEJHkoJ3mGQKDkg=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "af701c1c16c289b1b14f333d844b4f756308d244",
+        "rev": "ea61079b4d48031087c0c994782c24c846d4b95e",
        "type": "github"
      },
      "original": {
@@ -703,11 +681,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1746124654,
-        "narHash": "sha256-LmhkAt2KLvf8lp+kEUQuTFmmv7iXO8IkwwSaPasfXJw=",
+        "lastModified": 1747486745,
+        "narHash": "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "6c9705dd4b2eaba25f024d1a3efd7943fd393632",
+        "rev": "ae89cb6017668f3a81ccd92461cbbc70ab8377d0",
        "type": "github"
      },
      "original": {
@@ -826,11 +804,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1746843136,
-        "narHash": "sha256-uOKsY0wdreAlbxuMTJlKDr8pIfWB7ghfYdT8zbbZCH8=",
+        "lastModified": 1747493127,
+        "narHash": "sha256-OQn2hKMxsujs/Qgync/7mZ4h14bX8j/7HMvonmMa0tk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6a0960ad4b3d13bff34bd78e9fcefc4310507707",
+        "rev": "b7407d86ecf71a44bbdde98369f9a86011946155",
        "type": "github"
      },
      "original": {
@@ -842,11 +820,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1746810718,
-        "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
+        "lastModified": 1747485343,
+        "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
+        "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
        "type": "github"
      },
      "original": {
@@ -858,11 +836,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1746827877,
-        "narHash": "sha256-Gx/GMu9BOyJLucrDcUNFMSP4IHgFGUMp8MRofHIdpyo=",
+        "lastModified": 1747452614,
+        "narHash": "sha256-hSEz6JHZTJJTeIudt0SK3UoZnfThHwKCUGvSe5/zn8g=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0f1c18b262f26c8e8d992605558714843d179c26",
+        "rev": "e067fb89ac3e59f993f257c799318132f1492f01",
        "type": "github"
      },
      "original": {
@@ -906,11 +884,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1746663147,
-        "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
+        "lastModified": 1747327360,
+        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
+        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
        "type": "github"
      },
      "original": {
@@ -927,11 +905,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1746849833,
-        "narHash": "sha256-zLrK9cXTJ/8PPFIkrq/3ohXGx7/7tH54wV9K1tCtiow=",
+        "lastModified": 1747488149,
+        "narHash": "sha256-HviZQVzJV6ew3QJY1Qq2k80bYp+1OTnzdMal98b511o=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "18f3a79b205795fed650a335b34f22015681779b",
+        "rev": "9214c6e98991705689c127e2187d4453c5a3d861",
        "type": "github"
      },
      "original": {
@@ -942,7 +920,10 @@
    },
    "nur_2": {
      "inputs": {
-        "flake-parts": "flake-parts_4",
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
        "nixpkgs": [
          "stylix",
          "nixpkgs"
@@ -992,11 +973,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1746510767,
-        "narHash": "sha256-0Pjx+XN//AH8xBwWCVoKVLADLvbfJ+2VsrXW5CbIQIo=",
+        "lastModified": 1747482026,
+        "narHash": "sha256-GKLLiilmgQzNN0WY7QylXNlChVB0PAMHgxhsKBR32W0=",
        "ref": "refs/heads/master",
-        "rev": "8863bf55ff5c4045e82e468aa7a8e7969e8c921d",
-        "revCount": 507,
+        "rev": "eebba25ccd7043c6edeefa0a07303e7247f62700",
+        "revCount": 525,
        "type": "git",
        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
      },
@@ -1031,11 +1012,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1746722075,
-        "narHash": "sha256-t4ZntWiW4C3lE621lV3XyK3KltC5/SW1V9G+CSz70rQ=",
+        "lastModified": 1747323949,
+        "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "8b624868e4ce2cb5b39559175f0978bee86bdeea",
+        "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe",
        "type": "github"
      },
      "original": {
@@ -1073,7 +1054,7 @@
        "base16-vim": "base16-vim",
        "firefox-gnome-theme": "firefox-gnome-theme",
        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_3",
+        "flake-parts": "flake-parts_4",
        "git-hooks": "git-hooks_2",
        "gnome-shell": "gnome-shell",
        "home-manager": "home-manager_2",
@@ -1089,11 +1070,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1746806701,
-        "narHash": "sha256-3XzWny4EsC1SuBuNP0yWI1lwuFbo1P8jioayreHODqg=",
+        "lastModified": 1747441332,
+        "narHash": "sha256-On+cwR/dMW9s+YWsYifIaRs18nNyK5HVFJav6HsRrU8=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "6690180c17153026c854584e8b7cb9df599127fe",
+        "rev": "101d23dfacbb2704c40639ae9b6ac1d41de7143a",
        "type": "github"
      },
      "original": {
@@ -1292,11 +1273,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1745730655,
-        "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
+        "lastModified": 1747111562,
+        "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
+        "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -144,7 +144,7 @@
              sharedModules = [
                inputs.sops-nix.homeManagerModules.sops
                inputs.impermanence.nixosModules.home-manager.impermanence
-                inputs.stylix.homeManagerModules.stylix
+                inputs.stylix.homeModules.stylix
                # workaround for annoying stylix
                (
                  { lib, ... }:
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/cli/media/default.nix
+++ b/modules/cli/media/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/cli/monitor/default.nix
+++ b/modules/cli/monitor/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/cli/shell/default.nix
+++ b/modules/cli/shell/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/coding/default.nix
+++ b/modules/coding/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/coding/editor/default.nix
+++ b/modules/coding/editor/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua
+++ b/modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua
@@ -37,7 +37,7 @@ local extra_config = {
    settings = {
      rust_analyzer = {
        check = {
-          command = "cargo clippy"
+          command = "clippy"
        },
        diagnostics = {
          experimental = true,
--- a/modules/coding/langs/default.nix
+++ b/modules/coding/langs/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/browser/default.nix
+++ b/modules/desktop/browser/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/gaming/default.nix
+++ b/modules/desktop/gaming/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/media/default.nix
+++ b/modules/desktop/media/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/notify/default.nix
+++ b/modules/desktop/notify/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/screencast/default.nix
+++ b/modules/desktop/screencast/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/terminal/default.nix
+++ b/modules/desktop/terminal/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/wm/default.nix
+++ b/modules/desktop/wm/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./all.nix
--- a/modules/desktop/wm/niri/default.nix
+++ b/modules/desktop/wm/niri/default.nix
@@ -53,7 +53,15 @@ in
      sddm = {
        enable = true;
        wayland.enable = true;
-        extraPackages = [ pkgs.where-is-my-sddm-theme ];
+        theme = "where_is_my_sddm_theme";
+        extraPackages = [
+          (pkgs.where-is-my-sddm-theme.override {
+            variants = [ "qt6" ];
+            themeConfig.General = {
+              background = toString ./wallpaper.png;
+            };
+          })
+        ];
      };
    };
    my.home = {
--- a/modules/desktop/wm/niri/waybar/config.nix
+++ b/modules/desktop/wm/niri/waybar/config.nix
@@ -1,5 +1,4 @@
-_:
-{
+_: {
  layer = "top";
  position = "top";
  mod = "dock";
--- a/modules/getty-autologin.nix
+++ b/modules/getty-autologin.nix
@@ -30,29 +30,26 @@ let
      builtins.map (ttynum: { "getty@tty${toString ttynum}" = config; }) cfg.ttys
    );

-  autologinModule = types.submodule (
-    _:
-    {
-      options = {
-        enable = mkEnableOption "autologin";
-        user = mkOption {
-          type = types.str;
-          default = "";
-          example = "foo";
-          description = mdDoc ''
-            Username of the account that will be automatically logged in at the console.
-          '';
-        };
-        ttys = mkOption {
-          type = types.listOf types.int;
-          default = [ 6 ];
-          description = mdDoc ''
-            TTY numbers for autologin.user to login to.
-          '';
-        };
+  autologinModule = types.submodule ({
+    options = {
+      enable = mkEnableOption "autologin";
+      user = mkOption {
+        type = types.str;
+        default = "";
+        example = "foo";
+        description = mdDoc ''
+          Username of the account that will be automatically logged in at the console.
+        '';
      };
-    }
-  );
+      ttys = mkOption {
+        type = types.listOf types.int;
+        default = [ 6 ];
+        description = mdDoc ''
+          TTY numbers for autologin.user to login to.
+        '';
+      };
+    };
+  });

 in

--- a/modules/i18n/default.nix
+++ b/modules/i18n/default.nix
@@ -1,4 +1,3 @@
-_:
 {
  imports = [
    ./fcitx5.nix