Compare commits

..

No commits in common. "edfca1462145f341b14efed5566ee64b646dbbd8" and "cf83a45191fdae552b3f0ed9fbe49ee463d41bf2" have entirely different histories.

13 changed files with 33 additions and 126 deletions

View file

@ -39,9 +39,8 @@
swaybg = getExe pkgs.swaybg;
ghostty = getExe config.programs.ghostty.package;
wl-paste = getExe' pkgs.wl-clipboard "wl-paste";
wl-copy = getExe' pkgs.wl-clipboard "wl-copy";
cliphist = getExe' pkgs.cliphist "cliphist";
cliphist-fuzzel-img = getExe' pkgs.cliphist "cliphist-fuzzel-img";
wl-clip-persist = getExe pkgs.wl-clip-persist;
in
(
let
@ -49,7 +48,7 @@ in
in [
(plain "binds" [
(plain "Mod+V" [
(spawn [cliphist-fuzzel-img])
(spawn [sh "-c" "${cliphist} list | ${fuzzel} --dmenu | ${cliphist} decode | ${wl-copy}"])
])
(plain "Mod+Shift+P" [
(spawn [swaylock "--screenshots" "--clock" "--indicator" "--indicator-radius" "100" "--indicator-thickness" "7" "--effect-blur" "7x5" "--effect-vignette" "0.5:0.5" "--grace" "2" "--fade-in" "0.5"])
@ -391,8 +390,7 @@ in
(spawn-at-startup [swaybg "-i" "${config.home.homeDirectory}/wallpaper/01.png"])
(spawn-at-startup [polkit-kde-agent])
(spawn-at-startup [wl-paste "--watch" cliphist "store"])
(spawn-at-startup [wl-clip-persist "--clipboard" "regular"])
(spawn-at-startup [fcitx5 "--replace"])
(spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"])
(plain "input" [
(plain "touchpad" [
(leaf "click-method" "clickfinger")

View file

@ -19,6 +19,7 @@
users.deploy.enable = true;
containers.interface = "ens3";
programs = {
transfer-sh.enable = true;
rustypaste = {
enable = true;
url = "https://paste.youthlic.fun";

View file

@ -1,5 +0,0 @@
{outputs, ...}: final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (outputs.packages."${system}") cliphist;
}

View file

@ -8,9 +8,8 @@ in
./spotifyx.nix
./radicle-explorer.nix
./wshowkeys.nix
# ./QQ.nix
./QQ.nix
./helix.nix
./cliphist.nix
]
|> map (file: import file args)
|> (overlays: (lib.composeManyExtensions overlays) final prev)

View file

@ -22,7 +22,7 @@
},
"TrackersListCollection": {
"cargoLocks": null,
"date": "2025-06-10",
"date": "2025-06-09",
"extract": null,
"name": "TrackersListCollection",
"passthru": null,
@ -34,35 +34,14 @@
"name": null,
"owner": "XIU2",
"repo": "TrackersListCollection",
"rev": "01e578ea12a7f00d989dfaf13c5f43875f1ff853",
"sha256": "sha256-npX1g1rvprXLEwkjE7S3hfpUCdmEnolSq4eLki9pvag=",
"rev": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c",
"sha256": "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=",
"sparseCheckout": [
"all.txt"
],
"type": "github"
},
"version": "01e578ea12a7f00d989dfaf13c5f43875f1ff853"
},
"cliphist": {
"cargoLocks": null,
"date": "2025-06-07",
"extract": null,
"name": "cliphist",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"owner": "sentriz",
"repo": "cliphist",
"rev": "f49bd905cff72d32d62c209224353865436f9a13",
"sha256": "sha256-waD4AIAAlorW+UBvHKFc5dm/CqP0Fw3pygYqPX5cYNc=",
"sparseCheckout": [],
"type": "github"
},
"version": "f49bd905cff72d32d62c209224353865436f9a13"
"version": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c"
},
"dioxionary": {
"cargoLocks": {
@ -157,7 +136,7 @@
},
"rime-ice": {
"cargoLocks": null,
"date": "2025-06-09",
"date": "2025-06-06",
"extract": null,
"name": "rime-ice",
"passthru": null,
@ -169,12 +148,12 @@
"name": null,
"owner": "iDvel",
"repo": "rime-ice",
"rev": "5b94b7df626bffedc3fe05ee71511aa0272bfc36",
"sha256": "sha256-RK5togo9YEQVSUL1bpkcsHmzK1V8IMe0adFB1T2hVoI=",
"rev": "b86e6147d68c229b45bb1f2a593f8b76155e964d",
"sha256": "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=",
"sparseCheckout": [],
"type": "github"
},
"version": "5b94b7df626bffedc3fe05ee71511aa0272bfc36"
"version": "b86e6147d68c229b45bb1f2a593f8b76155e964d"
},
"spotx": {
"cargoLocks": null,

View file

@ -15,30 +15,18 @@
};
TrackersListCollection = {
pname = "TrackersListCollection";
version = "01e578ea12a7f00d989dfaf13c5f43875f1ff853";
version = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
src = fetchFromGitHub {
owner = "XIU2";
repo = "TrackersListCollection";
rev = "01e578ea12a7f00d989dfaf13c5f43875f1ff853";
rev = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sparseCheckout = [ "all.txt" ];
sha256 = "sha256-npX1g1rvprXLEwkjE7S3hfpUCdmEnolSq4eLki9pvag=";
sha256 = "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=";
};
date = "2025-06-10";
};
cliphist = {
pname = "cliphist";
version = "f49bd905cff72d32d62c209224353865436f9a13";
src = fetchFromGitHub {
owner = "sentriz";
repo = "cliphist";
rev = "f49bd905cff72d32d62c209224353865436f9a13";
fetchSubmodules = false;
sha256 = "sha256-waD4AIAAlorW+UBvHKFc5dm/CqP0Fw3pygYqPX5cYNc=";
};
date = "2025-06-07";
date = "2025-06-09";
};
dioxionary = {
pname = "dioxionary";
@ -104,15 +92,15 @@
};
rime-ice = {
pname = "rime-ice";
version = "5b94b7df626bffedc3fe05ee71511aa0272bfc36";
version = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
src = fetchFromGitHub {
owner = "iDvel";
repo = "rime-ice";
rev = "5b94b7df626bffedc3fe05ee71511aa0272bfc36";
rev = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
fetchSubmodules = false;
sha256 = "sha256-RK5togo9YEQVSUL1bpkcsHmzK1V8IMe0adFB1T2hVoI=";
sha256 = "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=";
};
date = "2025-06-09";
date = "2025-06-06";
};
spotx = {
pname = "spotx";

View file

@ -1,41 +0,0 @@
{
srcs,
cliphist,
imagemagick,
wl-clipboard,
fuzzel,
gawk,
gnugrep,
lib,
makeWrapper,
}: let
inherit (srcs.cliphist) src date version;
in
cliphist.overrideAttrs (final: prev: {
inherit src;
version =
if prev.version != "0.6.1"
then
throw ''
Please remove <pkgs/cliphist.nix>
''
else "0-unstable-${date}-git${version}";
vendorHash = "sha256-No8d9ztepBO+fgF2XkEf/tyCPDAD57rBkzA8iVyNUmw=";
buildInputs =
(prev.buildInputs or [])
++ [
makeWrapper
];
postInstall = ''
cp -t $out/bin/ $src/contrib/*
rm $out/bin/cliphist.service
wrapProgram $out/bin/cliphist-fuzzel-img \
--prefix PATH : ${lib.makeBinPath [
imagemagick
wl-clipboard
fuzzel
gawk
gnugrep
]}
'';
})

View file

@ -22,7 +22,6 @@ in
OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {};
QQ = callPackage ./QQ.nix {};
editor-runtime = callPackage ./editor-runtime.nix {};
cliphist = callPackage ./cliphist.nix {};
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};

View file

@ -42,7 +42,3 @@ fetch.github = "DreamMaoMao/wshowkeys"
[OuterWildsTextAdventure]
src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git"
fetch.github = "top-mind/OuterWildsTextAdventureWeb"
[cliphist]
src.git = "https://github.com/sentriz/cliphist.git"
fetch.github = "sentriz/cliphist"

View file

@ -1,10 +1,7 @@
{
writeShellApplication,
pinentry-all,
}:
writeShellApplication {
{pkgs}:
pkgs.writeShellApplication {
name = "pinentry";
runtimeInputs = [
runtimeInputs = with pkgs; [
pinentry-all
];
text = ''

View file

@ -1,8 +1,8 @@
{
radicle-explorer,
pkgs,
rootPath,
}:
(radicle-explorer.withConfig {
(pkgs.radicle-explorer.withConfig {
preferredSeeds = [
{
hostname = "seed.youthlic.fun";

View file

@ -1,20 +1,16 @@
{
spotify,
unzip,
zip,
perl,
symlinkJoin,
pkgs,
srcs,
}: let
inherit (srcs) spotx;
spotifyx = spotify.overrideAttrs (final: prev: {
spotifyx = pkgs.spotify.overrideAttrs (final: prev: {
nativeBuildInputs =
prev.nativeBuildInputs
++ [
++ (with pkgs; [
unzip
zip
perl
];
]);
spotx = spotx.src;
postUnpack = ''
cp $spotx/spotx.sh ./spotx.sh
@ -26,7 +22,7 @@
'';
});
in
symlinkJoin {
pkgs.symlinkJoin {
name = "spotifyx";
paths = [spotifyx];
}

View file

@ -1,10 +1,10 @@
{
pkgs,
srcs,
wshowkeys,
}: let
inherit (srcs) wshowkeys-mao;
in
wshowkeys.overrideAttrs (final: prev: {
pkgs.wshowkeys.overrideAttrs (final: prev: {
inherit (wshowkeys-mao) src;
pname = "wshowkeys-mao";
version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;