fmt: tidy

fix: television fish integration
feat(nixd): suppress sema-primop-overridden
2025-12-27 16:28:39 +08:00 · 2025-12-27 16:28:23 +08:00 · 2025-12-27 16:28:00 +08:00 · 2025-12-27 16:27:30 +08:00 · 2025-12-27 16:25:42 +08:00
9 changed files with 102 additions and 108 deletions
--- a/.lazy.lua
+++ b/.lazy.lua
@@ -8,6 +8,11 @@ vim.lsp.config("nixd", {
            .. ".options",
        },
      },
+      diagnostic = {
+        suppress = {
+          "sema-primop-overridden",
+        },
+      },
    },
  },
 })
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1765894709,
-        "narHash": "sha256-M7fu9xe98wDOsW65RKzmNt5R5jSyM9wtRKZfwcGXjg4=",
+        "lastModified": 1766764785,
+        "narHash": "sha256-NM3tceHyqtkt/QBGBbB+vr6tRou0XSzMxKwshceIMgE=",
        "owner": "linyinfeng",
        "repo": "angrr",
-        "rev": "35f13906a4a6410f92eefa9678526ac81321e816",
+        "rev": "d91ba9ce73ea615aea746e99206ad79d359ca6aa",
        "type": "github"
      },
      "original": {
@@ -150,11 +150,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766111011,
-        "narHash": "sha256-OT1QEHVcwz10ZUbEgvXnS/o28kvElKvswaJR6rW+PxI=",
+        "lastModified": 1766433187,
+        "narHash": "sha256-REpIGNEntVGSffMhK1d3vz3QRfxjMiPpOLSuA1LOU74=",
        "owner": "Bali10050",
        "repo": "Darkly",
-        "rev": "fd6a59a0f63e411582359892b4adc84f5a26d96a",
+        "rev": "e1c7e986c968c79849bb07e28395f3ef4c47cc40",
        "type": "github"
      },
      "original": {
@@ -193,11 +193,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1765435813,
-        "narHash": "sha256-C6tT7K1Lx6VsYw1BY5S3OavtapUvEnDQtmQB5DSgbCc=",
+        "lastModified": 1766731651,
+        "narHash": "sha256-Fx4vOweZNpfraHBx9n9JDnz6n2vv41UK1iTApFLS/HY=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "6399553b7a300c77e7f07342904eb696a5b6bf9d",
+        "rev": "7cbc19864b07a3e3c4bf6909a6b353cde9cc5d7f",
        "type": "github"
      },
      "original": {
@@ -225,11 +225,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1765121682,
-        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
+        "lastModified": 1766661267,
+        "narHash": "sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
+        "rev": "f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2",
        "type": "github"
      },
      "original": {
@@ -544,11 +544,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765980955,
-        "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
+        "lastModified": 1766682973,
+        "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
+        "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2",
        "type": "github"
      },
      "original": {
@@ -681,11 +681,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1766090778,
-        "narHash": "sha256-e1SOJYHe5IbKFIOpWswB/4nIog1Zx5iXA4YB49XTFxE=",
+        "lastModified": 1766765523,
+        "narHash": "sha256-DCk3GKdKZNjpvNuDy9ZVfVwCy3tlm96/UZnYkJO7N44=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "d06ab0308d797dc4b2f9025d5952cca90afd11a7",
+        "rev": "a3e638c75d07de759421e6f34bd69c3f9a0a3567",
        "type": "github"
      },
      "original": {
@@ -714,11 +714,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1766085543,
-        "narHash": "sha256-96X+37m2HH8IG3BzXEN3d4eHeUbiu9g1Q+KJQRX/Jpw=",
+        "lastModified": 1766751930,
+        "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "c4462d0c7fddfc11c9e98d43e3ef68a5b3c844ca",
+        "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1",
        "type": "github"
      },
      "original": {
@@ -772,11 +772,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765684049,
-        "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
+        "lastModified": 1766524813,
+        "narHash": "sha256-N/sxS27+t9nGvGWqwwAceSMW/Y5ddcypS/aiTnZ7ScA=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
+        "rev": "c2b36207f2c396c79dbed9d40536db221bd4e363",
        "type": "github"
      },
      "original": {
@@ -858,11 +858,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1766141189,
-        "narHash": "sha256-BpAJ4bP8PIubBDPgaBIHso54jywR7mm8IlpTihW5oEE=",
+        "lastModified": 1766815868,
+        "narHash": "sha256-cTpRd20EknSDkfpumLXIlO3UNnx0U3VmC3LUGVj1mRo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "007e6ccf11c5526e62b534f7360336b9b3b86e20",
+        "rev": "deefe7fae28c478ef2b0e0f72352233806fc6da2",
        "type": "github"
      },
      "original": {
@@ -874,11 +874,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1765838191,
-        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
+        "lastModified": 1766736597,
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
        "type": "github"
      },
      "original": {
@@ -890,11 +890,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1766138279,
-        "narHash": "sha256-T331jrvONqbuuhc9dz0sG0IOYA6KKcA99qgDoIYjExo=",
+        "lastModified": 1766815707,
+        "narHash": "sha256-cGpp590DS4WFwtXU7N2Ouko1nIJkqltIAFYlzXjoJhk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "77aec6c71e9521cafade0e3998d04f1a9961aeab",
+        "rev": "afe1017bc34f91605981821c3e271fd7755864c4",
        "type": "github"
      },
      "original": {
@@ -906,11 +906,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1765779637,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "lastModified": 1766651565,
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
        "type": "github"
      },
      "original": {
@@ -954,11 +954,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1765779637,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "lastModified": 1766651565,
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
        "type": "github"
      },
      "original": {
@@ -975,16 +975,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1766068587,
-        "narHash": "sha256-nlimljubh2NCfSllK5QGEgqcJO92nT5JXz4Bpk5m6hw=",
+        "lastModified": 1766537508,
+        "narHash": "sha256-TBrsYS+n+8AsXRAP4wA3JNOdT604QmPo8yeSTT/p61I=",
        "owner": "noctalia-dev",
        "repo": "noctalia-shell",
-        "rev": "a75fdead1aa5eeeef7f5394cb8ca4dbd6fe6d1a4",
+        "rev": "a865af00357b9b240b3f760359f96413a086054f",
        "type": "github"
      },
      "original": {
        "owner": "noctalia-dev",
-        "ref": "v3.7.1",
+        "ref": "v3.7.5",
        "repo": "noctalia-shell",
        "type": "github"
      }
@@ -1063,11 +1063,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1765400135,
-        "narHash": "sha256-D3+4hfNwUhG0fdCpDhOASLwEQ1jKuHi4mV72up4kLQM=",
+        "lastModified": 1766657615,
+        "narHash": "sha256-HijBTq7UYd5Cb/xQM32vf714DuwUFX+JlN6YMrpDaF4=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "fface27171988b3d605ef45cf986c25533116f7e",
+        "rev": "9581ba4daf07124f28d5b6c335ffad4c88bfce0b",
        "type": "github"
      },
      "original": {
@@ -1084,11 +1084,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765863190,
-        "narHash": "sha256-wnRrh24BUdZL2JPk4i3fjHM6ru7lWBrL9nvYcdIpImw=",
+        "lastModified": 1766347346,
+        "narHash": "sha256-Am4X4r0WIe8wA3HFar1AuTxS4+op2pDaBPdT8CqEEN4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "d6c7d245abf3ed4290e80ebd45d8479c4fd2d207",
+        "rev": "51be135cf0fd5cee6a98ca2b127fb97ce8969c4f",
        "type": "github"
      },
      "original": {
@@ -1119,11 +1119,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1765897595,
-        "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=",
+        "lastModified": 1766603026,
+        "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3",
+        "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
        "type": "github"
      },
      "original": {
@@ -1271,11 +1271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762938485,
-        "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
+        "lastModified": 1766000401,
+        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
+        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
        "type": "github"
      },
      "original": {
@@ -1304,11 +1304,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1765935116,
-        "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=",
+        "lastModified": 1766429945,
+        "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4",
+        "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",
        "type": "github"
      },
      "original": {
@@ -1325,11 +1325,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766032508,
-        "narHash": "sha256-7MHR94mOoa5/s4NBrpsXWaNNzrZyRC0OwRwEobp1wzI=",
+        "lastModified": 1766697593,
+        "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "a7f58a9e3481804915d75a9c86527bca6d9dafb3",
+        "rev": "98d8f48ba80a4b6e3b56addad850d57132301075",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
    };
    niri.url = "github:sodiboo/niri-flake";
    noctalia = {
-      url = "github:noctalia-dev/noctalia-shell/v3.7.1";
+      url = "github:noctalia-dev/noctalia-shell/v3.7.5";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    zen.inputs.nixpkgs.follows = "nixpkgs";
@@ -114,8 +114,8 @@

        imports = [
          ./flake/hosts.nix
+          ./flake/pkgs.nix
          ./treefmt.nix
-          ./pkgs
          ./overlays
        ];

--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -10,9 +10,7 @@
 let
  vars = import ../vars.nix;
  pkgsModule = {
-    nixpkgs = pkgsParams // {
-      inherit (config.nixpkgs.hostPlatform) system;
-    };
+    nixpkgs = pkgsParams;
  };
  hmModule = {
    home-manager = {
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -24,19 +24,16 @@
      flake.setNixPath = false;
    };
  };
+
  perSystem =
    {
      system,
      pkgs,
      ...
    }:
-    let
-    in
    {
      _module.args.pkgs = import inputs.nixpkgs (pkgsParams // { inherit system; });
-
      legacyPackages = pkgs;
-
      packages = lib.genAttrs (builtins.attrNames (config.flake.overlays.additions pkgs pkgs)) (
        pkg: pkgs.${pkg}
      );
@@ -44,21 +41,15 @@

  flake.overlays.additions =
    final: prev:
-    let
-      paths = [
-        # keep-sorted start
-        ./fcitx5-lightly
-        ./jj-starship.nix
-        ./mono-gtk-theme.nix
-        ./ttf-wps-fonts.nix
-        ./wps-office-fonts.nix
-        # keep-sorted end
-      ];
-    in
-    builtins.listToAttrs (
-      map (path: {
-        name = builtins.elemAt (lib.splitString "." (builtins.baseNameOf path)) 0;
-        value = final.callPackage path { };
-      }) paths
-    );
+    with lib.haumea;
+    load {
+      src = ../pkgs;
+      loader = [
+        {
+          matches = str: builtins.match ".*\\.nix" str != null;
+          loader = _: path: final.callPackage path { };
+        }
+      ];
+      transformer = transformers.liftDefault;
+    };
 }
--- a/lib/umport.nix
+++ b/lib/umport.nix
@@ -28,9 +28,7 @@ let
        || extraExcludePredicate path;
    in
    unique (
-      (filter
-        (file: pathIsRegularFile file && hasSuffix ".nix" (builtins.toString file) && !isExcluded file)
-        (
+      (filter (file: pathIsRegularFile file && hasSuffix ".nix" (toString file) && !isExcluded file) (
        concatMap (
          path:
          if recursive then
@@ -40,8 +38,7 @@ let
              name: type: path + (if type == "directory" then "/${name}/default.nix" else "/${name}")
            ) (builtins.readDir path)
        ) (unique (if path == null then paths else [ path ] ++ paths))
-        )
-      )
+      ))
      ++ (if recursive then concatMap (path: toList path) (unique include) else unique include)
    );
 in
--- a/modules/cli/misc.nix
+++ b/modules/cli/misc.nix
@@ -95,8 +95,14 @@ in
      programs.television = {
        enable = true;
        enableZshIntegration = true;
-        enableFishIntegration = true;
+        enableFishIntegration = builtins.warn ''
+          Television shell integration disabled in favor of [issue](https://github.com/nix-community/home-manager/issues/8400)!
+          Enable it when the issue is resolved.
+        '' false;
      };
+      programs.fish.interactiveShellInit = ''
+        ${lib.getExe config.my.hm.programs.television.package} init fish | source
+      '';
      programs.zoxide = {
        enable = true;
        enableZshIntegration = true;
--- a/modules/core/nix.nix
+++ b/modules/core/nix.nix
@@ -38,8 +38,7 @@ in
    }) config.nix.registry;

    nix.settings = {
-      # Enable flakes and new 'nix' command
-      experimental-features = "nix-command flakes";
+      experimental-features = "nix-command flakes pipe-operators";
      substituters = [
        "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
        "https://mirror.sjtu.edu.cn/nix-channels/store"
--- a/modules/getty-autologin.nix
+++ b/modules/getty-autologin.nix
@@ -25,11 +25,9 @@ let

  forAllAutologinTTYs =
    config:
-    attrsets.mergeAttrsList (
-      builtins.map (ttynum: { "getty@tty${toString ttynum}" = config; }) cfg.ttys
-    );
+    attrsets.mergeAttrsList (map (ttynum: { "getty@tty${toString ttynum}" = config; }) cfg.ttys);

-  autologinModule = types.submodule ({
+  autologinModule = types.submodule {
    options = {
      enable = mkEnableOption "autologin";
      user = mkOption {
@@ -48,7 +46,7 @@ let
        '';
      };
    };
-  });
+  };

 in
Author	SHA1	Message	Date
imxyy_soope_	b8597104b3	fmt: tidy	2025-12-27 16:28:39 +08:00
imxyy_soope_	3bd682e800	fix: television fish integration	2025-12-27 16:28:23 +08:00
imxyy_soope_	296f250eba	feat(nixd): suppress sema-primop-overridden	2025-12-27 16:28:00 +08:00
imxyy_soope_	4ab322f08d	refactor: pkgs	2025-12-27 16:27:30 +08:00
imxyy_soope_	e112f5f21d	chore: update flake.lock; update noctalia-shell	2025-12-27 16:25:42 +08:00