comment kde and cosmic because of confliction with niri

add niri key bind
update flake inputs
2025-03-20 03:15:56 +08:00 · 2025-03-20 03:15:54 +08:00 · 2025-03-20 03:15:52 +08:00 · 2025-03-20 03:15:50 +08:00 · 2025-03-20 03:15:49 +08:00 · 2025-03-20 03:15:46 +08:00
21 changed files with 3428 additions and 207 deletions
--- a/README.md
+++ b/README.md
@ -41,8 +41,8 @@ Hey, you. This is my nixos configurations.
 | `overlays.additions`                      | the ovelrays add packages in `<nixpkgs>`                                    | ./overlays/additions                     |
 | `nixosModules.default`                    | nixos modules shared on different nixos machines                            | ./nixos/modules                          |
 | `nixosConfigurations.${machine}`          | machine-local nixos config                                                  | ./nixos/configurations/${machine}        |
-| `homeModules.default`              | home-manager modules shared between different user and machine combinations | ./home/modules                           |
-| `homeModules.extra`                | home-manager modules only for non-nixos                                     | ./home/extra                             |
-| `homeModules.${user}`              | home-manager modules shared between different users                         | ./home/${user}/modules                   |
+| `homeModules.default`                     | home-manager modules shared between different user and machine combinations | ./home/modules                           |
+| `homeModules.extra`                       | home-manager modules only for non-nixos                                     | ./home/extra                             |
+| `homeModules.${user}`                     | home-manager modules shared between different users                         | ./home/${user}/modules                   |
 | `homeConfigurations."${user}@${machine}"` | home-manager config for different user and machine combinations             | ./home/${user}/configurations/${machine} |
 | `deploy.nodes.${machine}.system`          | deploy-rs profile for deploying `nixosConfiguration.${machine}` remotely    | -                                        |
--- a/flake.lock
+++ b/flake.lock
@ -70,11 +70,11 @@
    "bt-tracker": {
      "flake": false,
      "locked": {
-        "lastModified": 1741997456,
-        "narHash": "sha256-4WhLuADRRr8tRnySlDGMiPKUBwVfxaOUjBkfaE7lbHw=",
+        "lastModified": 1742343004,
+        "narHash": "sha256-ML9RkdRamPUdDMkDMDBwAugUk5ut3beXNpBFK1LdhmI=",
        "owner": "XIU2",
        "repo": "TrackersListCollection",
-        "rev": "22a50f839018b5c5c0b4ef2675ea3ad89f12e44e",
+        "rev": "a8d9198bc2d62d275eaa40032ce8f6ebd23e524d",
        "type": "github"
      },
      "original": {
@ -329,14 +329,14 @@
          "nixpkgs"
        ],
        "zig": "zig",
-        "zig2nix": "zig2nix"
+        "zon2nix": "zon2nix"
      },
      "locked": {
-        "lastModified": 1742002412,
-        "narHash": "sha256-dw7CLa5+tZmfNCPjH2vSAk7SBfsB2Zp7uOcZ1XAADjE=",
+        "lastModified": 1742339081,
+        "narHash": "sha256-D/isdAlah0AhzTDbzWkwdHeqSMqZbUxXAt/z6Vbe3C8=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "550edd426257fa1976a5f1b8b9539543578f5a35",
+        "rev": "bd7c5cc95f872d241ddc8aea4c81c540c6d9c19f",
        "type": "github"
      },
      "original": {
@ -421,11 +421,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1741962962,
-        "narHash": "sha256-68SVpGxlAFWGmolts5yhWw2v9bx+jmA/0rX3wxIRZkU=",
+        "lastModified": 1742307525,
+        "narHash": "sha256-lS4JHFc2vlHvzfqmsDB4cR+31geFjOktdAwZhX1uU6c=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "9574e551cf8ea4d868a8c102647fcfe0d41496df",
+        "rev": "6f463dbeb323dfbebe63a1f73be6773a9c93d540",
        "type": "github"
      },
      "original": {
@ -442,11 +442,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741955947,
-        "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
+        "lastModified": 1742326330,
+        "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
+        "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee",
        "type": "github"
      },
      "original": {
@ -466,11 +466,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1742003507,
-        "narHash": "sha256-YqOuNSRC0oduAOWh/EqEaTVHawUyXmNHntqmOVDFaLc=",
+        "lastModified": 1742362346,
+        "narHash": "sha256-Lf8wDWNsQkiw4MqD3dOmxmLm7AnW1oMf2Prfx9hT2V4=",
        "owner": "jj-vcs",
        "repo": "jj",
-        "rev": "f8082a052d05fe4424e59bbdf7885452726400f9",
+        "rev": "f37f927bc2f0be1cedce8888701d401e04c66844",
        "type": "github"
      },
      "original": {
@ -530,11 +530,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1741985426,
-        "narHash": "sha256-qtvcOFwWVQqKyjtVYXpC8Mp/cP/xc/Na6L4UXyHyJHA=",
+        "lastModified": 1742355568,
+        "narHash": "sha256-cHW060+beSciKdCK4SZ9vYPOFy/otAq+t9MiO54zKYY=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "93a1359e5625bb7724298e92c4cddf0e8022dc00",
+        "rev": "10b56ff2ecc915ec26505526125b4f3a3006d5b3",
        "type": "github"
      },
      "original": {
@ -563,11 +563,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1741982253,
-        "narHash": "sha256-pQYos0sgmAlf7VFZHB4FZMu0CACTLLARS++H64NRB1I=",
+        "lastModified": 1742276600,
+        "narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "f6aa8c17937fadd1da3c8f2f080ea402ae17da87",
+        "rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a",
        "type": "github"
      },
      "original": {
@ -583,11 +583,11 @@
        "nixpkgs-stable": "nixpkgs-stable_3"
      },
      "locked": {
-        "lastModified": 1742006448,
-        "narHash": "sha256-8OmMOm7MeuhBYYIu9an/OaeH9+mJLXKVj2g/TY8qAg0=",
+        "lastModified": 1742351419,
+        "narHash": "sha256-IC3jdMFJtLnwnjNyCeQ1o9Y8gEmDw5RQ7ZLIXf0u7fs=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
-        "rev": "d63e6b46e0d080fa7cab2cb3ee37b46873615fa3",
+        "rev": "55c7223b2c739b4d948a4a84a8150cedcb779e53",
        "type": "github"
      },
      "original": {
@ -598,11 +598,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1741792691,
-        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
+        "lastModified": 1742217307,
+        "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
+        "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1",
        "type": "github"
      },
      "original": {
@ -614,11 +614,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1741851582,
-        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
+        "lastModified": 1742069588,
+        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
+        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
        "type": "github"
      },
      "original": {
@ -628,38 +628,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f": {
-      "locked": {
-        "lastModified": 1741960758,
-        "narHash": "sha256-pSGMbfkxF7TSeco54W+B1q+g22YCVp1qXHgtrdgtyR4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "845dc1e9cbc2e48640b8968af58b4a19db67aa8f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "845dc1e9cbc2e48640b8968af58b4a19db67aa8f",
-        "type": "github"
-      }
-    },
-    "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1": {
-      "locked": {
-        "lastModified": 1741513245,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
-        "type": "github"
-      }
-    },
    "nixpkgs-lib": {
      "locked": {
        "lastModified": 1740877520,
@ -677,11 +645,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1738255539,
-        "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=",
+        "lastModified": 1741992157,
+        "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5",
+        "rev": "da4b122f63095ca1199bd4d526f9e26426697689",
        "type": "github"
      },
      "original": {
@ -693,11 +661,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1741862977,
-        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
+        "lastModified": 1742268799,
+        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
+        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
        "type": "github"
      },
      "original": {
@ -709,11 +677,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1741862977,
-        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
+        "lastModified": 1742136038,
+        "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
+        "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
        "type": "github"
      },
      "original": {
@ -749,11 +717,11 @@
    "nur-rycee": {
      "flake": false,
      "locked": {
-        "lastModified": 1741957870,
-        "narHash": "sha256-5ahYCLPnBcZX7vlmXzn+m0LDRgYiMDglU6UnH/HngPo=",
+        "lastModified": 1742327995,
+        "narHash": "sha256-cvqCqT7op8uRCIPUYK8CPJbRRmKytFtOzHqomMyO7u8=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "4021f5dad2a46ff78c1bf82ee45c1656e12164f2",
+        "rev": "d91a2ea080804c3a9213d6e460e8cff68cfacf8d",
        "type": "gitlab"
      },
      "original": {
@ -763,23 +731,6 @@
        "type": "gitlab"
      }
    },
-    "nur-xddxdd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1741601101,
-        "narHash": "sha256-dXEy/blI2XGjnTfvNQxCLMpaAEE0eDL7Ai9CzJvdWFE=",
-        "owner": "xddxdd",
-        "repo": "nur-packages",
-        "rev": "c059e437606d78b128b38dda04e7c222284362d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xddxdd",
-        "ref": "master",
-        "repo": "nur-packages",
-        "type": "github"
-      }
-    },
    "oskars-dotfiles": {
      "flake": false,
      "locked": {
@ -817,10 +768,7 @@
          "nixos-cosmic",
          "nixpkgs"
        ],
-        "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f": "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f",
-        "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1": "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
        "nur-rycee": "nur-rycee",
-        "nur-xddxdd": "nur-xddxdd",
        "oskars-dotfiles": "oskars-dotfiles",
        "sops-nix": "sops-nix",
        "stylix": "stylix"
@ -875,11 +823,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741861888,
-        "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=",
+        "lastModified": 1742239755,
+        "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f",
+        "rev": "787afce414bcce803b605c510b60bf43c11f4b55",
        "type": "github"
      },
      "original": {
@ -916,11 +864,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1741976991,
-        "narHash": "sha256-74Q3Kpzde+S3pWaZihNFMjCn8lo4wmDVmg+Uvw8YLLQ=",
+        "lastModified": 1742299802,
+        "narHash": "sha256-enlpX8hwrfmjv/dHTKWzAB5Cwt1Kr6+ptikjX3Ob+FY=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "e43eb4e2a7dfbd96454df2b1c9418299b4373773",
+        "rev": "ff9ae322bcaeccabc65812390000276455331123",
        "type": "github"
      },
      "original": {
@ -1083,11 +1031,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1741910413,
-        "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=",
+        "lastModified": 1742249030,
+        "narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "0325cb1f48a292d873a6844772cca00251cbf945",
+        "rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc",
        "type": "github"
      },
      "original": {
@ -1111,11 +1059,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741702955,
-        "narHash": "sha256-Emk3VnNByigCBlBN34IH2cMrsUqIhdex02uw9TSDsN0=",
+        "lastModified": 1741825901,
+        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "1152ce759114a94134081270affd970ae1b957ed",
+        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
        "type": "github"
      },
      "original": {
@ -1124,7 +1072,7 @@
        "type": "github"
      }
    },
-    "zig2nix": {
+    "zon2nix": {
      "inputs": {
        "flake-utils": [
          "ghostty",
@ -1136,17 +1084,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1741816255,
-        "narHash": "sha256-SJQMnm1vwXy8Td2qp/omjybn+4xZ/MDdZHeK6aa2nb0=",
+        "lastModified": 1742104771,
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
        "owner": "jcollie",
-        "repo": "zig2nix",
-        "rev": "c2a24405298373123e12ca81805e436da648aaf5",
+        "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
        "type": "github"
      },
      "original": {
        "owner": "jcollie",
-        "repo": "zig2nix",
-        "rev": "c2a24405298373123e12ca81805e436da648aaf5",
+        "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@ -7,22 +7,6 @@
    # nixpkgs.url = "github:NixOS/nixpkgs/master";
    nixpkgs.follows = "nixos-cosmic/nixpkgs";

-    # pr: https://github.com/NixOS/nixpkgs/pull/389740
-    nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f = {
-      type = "github";
-      owner = "NixOS";
-      repo = "nixpkgs";
-      rev = "845dc1e9cbc2e48640b8968af58b4a19db67aa8f";
-    };
-
-    # issue: https://github.com/NixOS/nixpkgs/issues/389977
-    nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1 = {
-      type = "github";
-      owner = "NixOS";
-      repo = "nixpkgs";
-      rev = "e3e32b642a31e6714ec1b712de8c91a3352ce7e1";
-    };
-
    lix-module = {
      url = "git+https://git.lix.systems/lix-project/nixos-module";
      inputs = {
@ -113,14 +97,6 @@
      repo = "flake-utils";
    };

-    nur-xddxdd = {
-      type = "github";
-      owner = "xddxdd";
-      repo = "nur-packages";
-      ref = "master";
-      flake = false;
-    };
-
    nur-rycee = {
      type = "gitlab";
      owner = "rycee";
--- a/home/david/configurations/Tytonidae/niri/config.kdl
+++ b/home/david/configurations/Tytonidae/niri/config.kdl
@ -434,6 +434,9 @@ binds {
    Mod+F {
        toggle-window-floating
    }
+    Mod+Shift+F {
+        toggle-windowed-fullscreen
+    }
    Mod+Tab {
        focus-window-previous
    }
--- a/nixos/configurations/Tytonidae/default.nix
+++ b/nixos/configurations/Tytonidae/default.nix
@ -27,6 +27,7 @@
    };
    i18n.enable = true;
    programs = {
+      guix.enable = true;
      dae.enable = true;
      openssh.enable = true;
      steam.enable = true;
@ -43,20 +44,20 @@
    gui.enabled = "niri";
  };

-  specialisation = {
-    cosmic = {
-      inheritParentConfig = true;
-      configuration = {
-        youthlic.gui.enabled = lib.mkForce "cosmic";
-      };
-    };
-    kde = {
-      inheritParentConfig = true;
-      configuration = {
-        youthlic.gui.enabled = lib.mkForce "kde";
-      };
-    };
-  };
+  # specialisation = {
+  #   cosmic = {
+  #     inheritParentConfig = true;
+  #     configuration = {
+  #       youthlic.gui.enabled = lib.mkForce "cosmic";
+  #     };
+  #   };
+  #   kde = {
+  #     inheritParentConfig = true;
+  #     configuration = {
+  #       youthlic.gui.enabled = lib.mkForce "kde";
+  #     };
+  #   };
+  # };

  programs.gnupg.agent = {
    enable = true;
--- a/nixos/modules/i18n.nix
+++ b/nixos/modules/i18n.nix
@ -1,6 +1,5 @@
 {
  pkgs,
-  outputs,
  lib,
  config,
  ...
@ -35,17 +34,11 @@ in
          addons = with pkgs; [
            libsForQt5.fcitx5-qt
            fcitx5-gtk
-            fcitx5-configtool
            fcitx5-fluent
            (fcitx5-rime.override {
-              rimeDataPkgs = (
-                with (outputs.packages."${pkgs.system}");
-                [
-                  rime-ice
-                  rime-zhwiki
-                  rime-moegirl
-                ]
-              );
+              rimeDataPkgs = [
+                rime-ice
+              ];
            })
          ];
          waylandFrontend = true;
--- a/nixos/modules/programs/default.nix
+++ b/nixos/modules/programs/default.nix
@ -20,5 +20,6 @@
    ./nix-ld.nix
    ./juicity
    ./miniflux.nix
+    ./guix.nix
  ];
 }
--- a/nixos/modules/programs/guix.nix
+++ b/nixos/modules/programs/guix.nix
@ -0,0 +1,18 @@
+{ lib, config, ... }:
+let
+  cfg = config.youthlic.programs.guix;
+in
+{
+  options = {
+    youthlic.programs.guix = {
+      enable = lib.mkEnableOption "guix";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.guix = {
+      enable = true;
+      gc.enable = true;
+      publish.enable = true;
+    };
+  };
+}
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@ -1,4 +1,9 @@
-{ lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 let
  cfg = config.youthlic.programs.steam;
 in
@ -10,6 +15,9 @@ in
  };
  config = lib.mkIf cfg.enable {
    hardware.graphics.enable32Bit = true;
+    environment.systemPackages = with pkgs; [
+      gamescope
+    ];
    programs.steam = {
      enable = true;
      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
--- a/overlays/additions/default.nix
+++ b/overlays/additions/default.nix
@ -2,8 +2,9 @@
 final: prev:
 let
  inherit (prev) lib;
-  overlay-files = [
-  ];
-  overlay-list = map (file: import file args) overlay-files;
 in
-(lib.composeManyExtensions overlay-list) final prev
+[
+  ./rime-ice.nix
+]
+|> map (file: import file args)
+|> (overlays: (lib.composeManyExtensions overlays) final prev)
--- a/overlays/additions/rime-ice.nix
+++ b/overlays/additions/rime-ice.nix
@ -0,0 +1,9 @@
+{ outputs, ... }:
+final: prev:
+let
+  inherit (final) stdenv;
+  inherit (stdenv.hostPlatform) system;
+in
+{
+  rime-ice = outputs.packages."${system}".rime-ice;
+}
--- a/overlays/modifications/default.nix
+++ b/overlays/modifications/default.nix
@ -10,8 +10,6 @@ in
  ./juicity.nix
  ./dae.nix
  ./jujutsu.nix
-  ./fix-pwvucontrol.nix
-  ./fix-forgejo-lts.nix
 ]
 |> map (file: import file args)
 |> (overlays: (lib.composeManyExtensions overlays) final prev)
--- a/overlays/modifications/fix-forgejo-lts.nix
+++ b/overlays/modifications/fix-forgejo-lts.nix
@ -1,10 +0,0 @@
-{ inputs, ... }:
-final: prev:
-let
-  inherit (final) stdenv;
-  inherit (stdenv.hostPlatform) system;
-in
-{
-  forgejo-lts =
-    inputs.nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1.legacyPackages."${system}".forgejo-lts;
-}
--- a/overlays/modifications/fix-pwvucontrol.nix
+++ b/overlays/modifications/fix-pwvucontrol.nix
@ -1,10 +0,0 @@
-{ inputs, ... }:
-final: prev:
-let
-  inherit (final) stdenv;
-  inherit (stdenv.hostPlatform) system;
-in
-{
-  pwvucontrol =
-    inputs.nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f.legacyPackages."${system}".pwvucontrol;
-}
--- a/pkgs/_sources/dioxionary-v1.1.4/Cargo.lock
+++ b/pkgs/_sources/dioxionary-v1.1.4/Cargo.lock
--- a/pkgs/_sources/generated.json
+++ b/pkgs/_sources/generated.json
@ -1,4 +1,30 @@
 {
+    "dioxionary": {
+        "cargoLocks": {
+            "./Cargo.lock": [
+                "./dioxionary-v1.1.4/./Cargo.lock",
+                {}
+            ]
+        },
+        "date": null,
+        "extract": null,
+        "name": "dioxionary",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "vaaandark",
+            "repo": "dioxionary",
+            "rev": "v1.1.4",
+            "sha256": "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v1.1.4"
+    },
    "juicity": {
        "cargoLocks": null,
        "date": "2025-02-20",
@ -19,6 +45,27 @@
        },
        "version": "4c5e8bd948ba2f72a0dd38681cf13ae532f6c9f5"
    },
+    "rime-ice": {
+        "cargoLocks": null,
+        "date": "2025-03-11",
+        "extract": null,
+        "name": "rime-ice",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "iDvel",
+            "repo": "rime-ice",
+            "rev": "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7",
+            "sha256": "sha256-/sKoufIf4m5h1Zds6AqIyeCjDaZsFU9ot5ln3ykuNyU=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7"
+    },
    "tree-sitter-idris": {
        "cargoLocks": null,
        "date": "2024-11-05",
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@ -1,6 +1,23 @@
 # This file was generated by nvfetcher, please do not modify it manually.
 { fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
 {
+  dioxionary = {
+    pname = "dioxionary";
+    version = "v1.1.4";
+    src = fetchFromGitHub {
+      owner = "vaaandark";
+      repo = "dioxionary";
+      rev = "v1.1.4";
+      fetchSubmodules = false;
+      sha256 = "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=";
+    };
+    cargoLock."./Cargo.lock" = {
+      lockFile = ./dioxionary-v1.1.4/./Cargo.lock;
+      outputHashes = {
+        
+      };
+    };
+  };
  juicity = {
    pname = "juicity";
    version = "4c5e8bd948ba2f72a0dd38681cf13ae532f6c9f5";
@ -15,6 +32,18 @@
    };
    date = "2025-02-20";
  };
+  rime-ice = {
+    pname = "rime-ice";
+    version = "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7";
+    src = fetchFromGitHub {
+      owner = "iDvel";
+      repo = "rime-ice";
+      rev = "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7";
+      fetchSubmodules = false;
+      sha256 = "sha256-/sKoufIf4m5h1Zds6AqIyeCjDaZsFU9ot5ln3ykuNyU=";
+    };
+    date = "2025-03-11";
+  };
  tree-sitter-idris = {
    pname = "tree-sitter-idris";
    version = "c56a25cf57c68ff929356db25505c1cc4c7820f6";
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -12,6 +12,8 @@ in
  pinentry-selector = callPackage ./pinentry-selector.nix { };
  helix = callPackage ./helix { };
  juicity = callPackage ./juicity.nix { };
+  rime-ice = callPackage ./rime-ice.nix { };
+  dioxionary = callPackage ./dioxionary.nix { };
 }
 // (
  let
@ -19,18 +21,3 @@ in
  in
  pkgs.lib.genAttrs [ "immersive-translate" "tridactyl" ] (name: firefox-addons."${name}")
 )
-// (
-  let
-    nur-xddxdd = (callPackage "${inputs.nur-xddxdd}/default.nix" { });
-  in
-  pkgs.lib.genAttrs [ "rime-zhwiki" "rime-moegirl" ] (name: nur-xddxdd."${name}")
-  // {
-    rime-ice = nur-xddxdd.rime-ice.overrideAttrs {
-      buildPhase = ''
-        runHook preBuild
-
-        runHook postBuild
-      '';
-    };
-  }
-)
--- a/pkgs/dioxionary.nix
+++ b/pkgs/dioxionary.nix
@ -0,0 +1,37 @@
+{
+  srcs,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  installShellFiles,
+  lib,
+  ...
+}:
+let
+  src = srcs.dioxionary;
+in
+rustPlatform.buildRustPackage {
+  inherit (src) pname src;
+  version = "${src.version}";
+  cargoLock = src.cargoLock."./Cargo.lock";
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+  buildInputs = [ openssl.dev ];
+  doCheck = false;
+  postInstall = ''
+    installShellCompletion --cmd dioxionary \
+      --bash <($out/bin/dioxionary completion bash) \
+      --zsh <($out/bin/dioxionary completion zsh) \
+      --fish <($out/bin/dioxionary completion fish)
+  '';
+  meta = {
+    description = "Rusty stardict. Enables terminal-based word lookup and vocabulary memorization using offline or online dictionaries";
+    homepage = "https://github.com/vaaandark/dioxionary";
+    changelog = "https://github.com/vaaandark/dioxionary/releases/tag/${src.version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ulic-youthlic ];
+    mainProgram = "dioxionary";
+  };
+}
--- a/pkgs/nvfetcher.toml
+++ b/pkgs/nvfetcher.toml
@ -6,3 +6,12 @@ fetch.git = "https://githuh.com/juicity/juicity"
 src.git = "https://github.com/kayhide/tree-sitter-idris"
 fetch.git = "https://github.com/kayhide/tree-sitter-idris"
 passthru.name = "idris"
+
+[rime-ice]
+src.git = "https://github.com/iDvel/rime-ice.git"
+fetch.github = "iDvel/rime-ice"
+
+[dioxionary]
+src.github = "vaaandark/dioxionary"
+fetch.github = "vaaandark/dioxionary"
+cargo_locks = ["./Cargo.lock"]
--- a/pkgs/rime-ice.nix
+++ b/pkgs/rime-ice.nix
@ -0,0 +1,16 @@
+{ srcs, stdenvNoCC, ... }:
+let
+  source = srcs.rime-ice;
+in
+stdenvNoCC.mkDerivation {
+  inherit (source) pname version src;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/rime-data
+    cp -r * $out/share/rime-data/
+
+    runHook postInstall
+  '';
+}
Author	SHA1	Message	Date
ulic-youthlic	79afb21d3a	comment kde and cosmic because of confliction with niri	2025-03-20 03:15:56 +08:00
ulic-youthlic	59ae0659b5	add niri key bind	2025-03-20 03:15:54 +08:00
ulic-youthlic	0c2382d259	update flake inputs	2025-03-20 03:15:52 +08:00
ulic-youthlic	a3ed17ede2	add gamescope for steam	2025-03-20 03:15:50 +08:00
ulic-youthlic	7b599a1d50	add guix	2025-03-20 03:15:49 +08:00
ulic-youthlic	f0e7a985aa	unpin forgejo-lts	2025-03-20 03:15:46 +08:00
ulic-youthlic	4823885a98	unpin pwvucontrol	2025-03-20 03:15:45 +08:00
ulic-youthlic	9a6ce5b0a7	update flake inputs	2025-03-20 03:15:43 +08:00
ulic-youthlic	70388ced3b	add package dioxionary	2025-03-20 03:15:41 +08:00
ulic-youthlic	f33adf3801	package rime-ice	2025-03-20 03:15:38 +08:00