diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index 4fd56e0..2a82320 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -85,11 +85,11 @@ in { + config.youthlic.gui.niri.extraConfig); in { enable = true; - settings = { - default_session = { - command = "env GTK_USE_PORTAL=0 GDK_DEBUG=no-portals ${lib.getExe' config.programs.niri.package "niri"} --config ${niriConfig} -- ${lib.getExe config.programs.regreet.package}"; - }; - }; + # settings = { + # default_session = { + # command = "env GTK_USE_PORTAL=0 GDK_DEBUG=no-portals ${lib.getExe' config.programs.niri.package "niri"} --config ${niriConfig} -- ${lib.getExe config.programs.regreet.package}"; + # }; + # }; }; xserver = { enable = true; @@ -102,6 +102,7 @@ in { programs = { regreet = { enable = true; + cageArgs = ["-s" "-m" "named" "-o" "DP-3"]; }; niri = { enable = true; diff --git a/overlays/modifications/cage.nix b/overlays/modifications/cage.nix new file mode 100644 index 0000000..e889aa4 --- /dev/null +++ b/overlays/modifications/cage.nix @@ -0,0 +1,5 @@ +{outputs, ...}: final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + inherit (outputs.packages."${system}") cage; +} diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index e6e39b8..c8fbcfd 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -8,6 +8,7 @@ in ./dae.nix ./jujutsu.nix ./spotifyx.nix + ./cage.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 29d233b..647e40c 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -1,4 +1,25 @@ { + "cage": { + "cargoLocks": null, + "date": "2025-05-11", + "extract": null, + "name": "cage", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "qaqland", + "repo": "cage", + "rev": "b4e9f729c301787239677b1bdd4235436bad99c7", + "sha256": "sha256-bPEi77/ENcKVlBmg3KrnmvtCqbLrwEvUqSyhONF3XtU=", + "sparseCheckout": [], + "type": "github" + }, + "version": "b4e9f729c301787239677b1bdd4235436bad99c7" + }, "dioxionary": { "cargoLocks": { "./Cargo.lock": [ @@ -92,7 +113,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-05-08", + "date": "2025-05-11", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,12 +125,12 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "60cd1631f9f5023cf00e86adc535571d1b86f1b2", - "sha256": "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y=", + "rev": "face4fabbe9d2ab01e73ec3cc6253924cca5e2f7", + "sha256": "sha256-K+xYo4SBDws5oPKVkxkfosw8sizzFO9DWxWEu7PRPQ0=", "sparseCheckout": [], "type": "github" }, - "version": "60cd1631f9f5023cf00e86adc535571d1b86f1b2" + "version": "face4fabbe9d2ab01e73ec3cc6253924cca5e2f7" }, "spotx": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index d7e1ab5..b868c2f 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -1,6 +1,18 @@ # This file was generated by nvfetcher, please do not modify it manually. { fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { + cage = { + pname = "cage"; + version = "b4e9f729c301787239677b1bdd4235436bad99c7"; + src = fetchFromGitHub { + owner = "qaqland"; + repo = "cage"; + rev = "b4e9f729c301787239677b1bdd4235436bad99c7"; + fetchSubmodules = false; + sha256 = "sha256-bPEi77/ENcKVlBmg3KrnmvtCqbLrwEvUqSyhONF3XtU="; + }; + date = "2025-05-11"; + }; dioxionary = { pname = "dioxionary"; version = "4db80d458ff7494967c94ebb1db596abba0775b2"; @@ -65,15 +77,15 @@ }; rime-ice = { pname = "rime-ice"; - version = "60cd1631f9f5023cf00e86adc535571d1b86f1b2"; + version = "face4fabbe9d2ab01e73ec3cc6253924cca5e2f7"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "60cd1631f9f5023cf00e86adc535571d1b86f1b2"; + rev = "face4fabbe9d2ab01e73ec3cc6253924cca5e2f7"; fetchSubmodules = false; - sha256 = "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y="; + sha256 = "sha256-K+xYo4SBDws5oPKVkxkfosw8sizzFO9DWxWEu7PRPQ0="; }; - date = "2025-05-08"; + date = "2025-05-11"; }; spotx = { pname = "spotx"; diff --git a/pkgs/cage.nix b/pkgs/cage.nix new file mode 100644 index 0000000..126973f --- /dev/null +++ b/pkgs/cage.nix @@ -0,0 +1,41 @@ +{ + pkgs, + srcs, + ... +}: let + inherit (srcs) cage; + cageWithEnvOption = pkgs.cage.overrideAttrs (final: prev: { + inherit (cage) src version; + }); +in + pkgs.writeShellApplication { + name = "cage"; + runtimeInputs = [cageWithEnvOption]; + text = '' + args=() + output= + + while [[ $# -gt 0 ]]; do + case "$1" in + -o) + if [[ $# -ge 2 ]]; then + output="$2" + shift 2 + else + args+=("$1") + shift + fi + ;; + *) + args+=("$1") + shift + ;; + esac + done + if [[ -n "$output" ]]; then + CAGE_OUTPUT_NAME="$output" cage "''${args[@]}" + else + cage "''${args[@]}" + fi + ''; + } diff --git a/pkgs/default.nix b/pkgs/default.nix index 62853ee..d489e1d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,6 +13,7 @@ in rime-ice = callPackage ./rime-ice.nix {}; dioxionary = callPackage ./dioxionary.nix {}; spotifyx = callPackage ./spotifyx.nix {}; + cage = callPackage ./cage.nix {}; noto-serif-cjk = callPackage ./noto-serif-cjk.nix {}; noto-sans-cjk = callPackage ./noto-sans-cjk.nix {}; diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml index 3fea7d4..495fef2 100644 --- a/pkgs/nvfetcher.toml +++ b/pkgs/nvfetcher.toml @@ -29,3 +29,8 @@ git.sparseCheckout = ["Sans/OTC"] [spotx] src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" fetch.github = "SpotX-Official/SpotX-Bash" + +[cage] +src.git = "https://github.com/qaqland/cage.git" +src.branch = "orenv" +fetch.github = "qaqland/cage"