feat(coding/langs): QML

flake.lock

@@ -534,6 +534,27 @@
         "type": "github"
       }
     },
+    "haumea": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685133229,
+        "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=",
+        "owner": "nix-community",
+        "repo": "haumea",
+        "rev": "34dd58385092a23018748b50f9b23de6266dffc2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v0.2.2",
+        "repo": "haumea",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -1092,6 +1113,7 @@
         "darkly": "darkly",
         "fenix": "fenix",
         "go-musicfox": "go-musicfox",
+        "haumea": "haumea",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
         "infuse": "infuse",

flake.nix

@@ -57,6 +57,9 @@
 
     infuse.url = "git+https://codeberg.org/amjoseph/infuse.nix";
     infuse.flake = false;
+
+    haumea.url = "github:nix-community/haumea/v0.2.2";
+    haumea.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -81,12 +84,25 @@
         final: prev: {
           inherit (inputs.home-manager.lib) hm;
           inherit infuse;
+          haumea = inputs.haumea.lib;
         }
       );
       infuse = (import inputs.infuse { inherit (nixpkgs) lib; }).v1.infuse;
     in
     {
-      packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+      packages = forAllSystems (
+        system:
+        lib.haumea.load {
+          src = ./pkgs;
+          loader = [
+            {
+              matches = str: builtins.match ".*\\.nix" str != null;
+              loader = _: path: nixpkgs.legacyPackages.${system}.callPackage path { };
+            }
+          ];
+          transformer = lib.haumea.transformers.liftDefault;
+        }
+      );
 
       # workaround for "treefmt warning"
       formatter = forAllSystems (
@@ -108,7 +124,9 @@
         }
       );
 
-      overlays = import ./overlays { inherit inputs infuse; };
+      overlays = import ./overlays {
+        inherit inputs lib;
+      };
 
       nixosConfigurations = forAllHosts (
         hostname:

modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua

@@ -62,6 +62,9 @@ local extra_config = {
       },
     },
   },
+  qmlls = {
+    cmd = {"qmlls", "-E"}
+  }
 }
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities()

modules/coding/langs/all.nix

@@ -15,6 +15,7 @@ lib.my.makeSwitch {
       python.enable = true;
       rust.enable = true;
       lua.enable = true;
+      qml.enable = true;
     };
   };
 }

modules/coding/langs/qml.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.my.makeSwitch {
+  inherit config;
+  optionName = "QML";
+  optionPath = [
+    "coding"
+    "langs"
+    "qml"
+  ];
+  config' = {
+    my.home.home.packages = with pkgs; [
+      kdePackages.qtdeclarative
+    ];
+  };
+}

modules/desktop/style/default.nix

@@ -25,9 +25,9 @@ lib.my.makeSwitch {
         };
         iconTheme = {
           enable = true;
-          package = pkgs.win11-icon-theme;
+          package = pkgs.papirus-icon-theme;
-          dark = "Win11";
+          dark = "Papirus-Dark";
-          light = "Win11";
+          light = "Papirus-Light";
         };
       };
 

overlays/default.nix

@@ -1,10 +1,24 @@
-{ inputs, infuse, ... }:
 {
-  additions = final: prev: import ../pkgs prev;
+  inputs,
+  lib,
+}:
+{
+  additions =
+    final: prev:
+    lib.haumea.load {
+      src = ../pkgs;
+      loader = [
+        {
+          matches = str: builtins.match ".*\\.nix" str != null;
+          loader = _: path: final.callPackage path { };
+        }
+      ];
+      transformer = lib.haumea.transformers.liftDefault;
+    };
 
   modifications =
     final: prev:
-    infuse prev {
+    lib.infuse prev {
       cage.__output.patches.__append = [ ./cage-specify-output-name.patch ];
       matrix-synapse.__assign = final.stable.matrix-synapse;
       bottles.__input.removeWarningPopup.__assign = true;

pkgs/default.nix

@@ -1,14 +0,0 @@
-pkgs:
-let
-  packages = [
-    "win11-icon-theme"
-    "mono-gtk-theme"
-    "fcitx5-themes"
-    "fcitx5-lightly"
-    "fluent-fcitx5"
-    "wps-office-fonts"
-    "ttf-wps-fonts"
-    "translate-shell"
-  ];
-in
-pkgs.lib.genAttrs packages (package: pkgs.callPackage ./${package}.nix { })

pkgs/win11-icon-theme.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  gtk3,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "win11-icon-themes";
-  version = "main";
-
-  src = fetchFromGitHub {
-    owner = "yeyushengfan258";
-    repo = "Win11-icon-theme";
-    rev = "9c69f73b00fdaadab946d0466430a94c3e53ff68";
-    sha256 = "sha256-jN55je9BPHNZi5+t3IoJoslAzphngYFbbYIbG/d7NeU=";
-  };
-
-  nativeBuildInputs = [
-    gtk3
-  ];
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/icons
-    patchShebangs ./install.sh
-    sed -i "s@shift 2@shift 1@" ./install.sh
-    ./install.sh -d "$out/share/icons" -n Win11
-    ./install.sh -d "$out/share/icons" -n Win11 -a
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "A colorful design icon theme for linux desktops";
-    homepage = "https://github.com/yeyushengfan258/Win11-icon-theme";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Only;
-  };
-}