Compare commits
No commits in common. "edfca1462145f341b14efed5566ee64b646dbbd8" and "cf83a45191fdae552b3f0ed9fbe49ee463d41bf2" have entirely different histories.
edfca14621
...
cf83a45191
13 changed files with 33 additions and 126 deletions
|
|
@ -39,9 +39,8 @@
|
||||||
swaybg = getExe pkgs.swaybg;
|
swaybg = getExe pkgs.swaybg;
|
||||||
ghostty = getExe config.programs.ghostty.package;
|
ghostty = getExe config.programs.ghostty.package;
|
||||||
wl-paste = getExe' pkgs.wl-clipboard "wl-paste";
|
wl-paste = getExe' pkgs.wl-clipboard "wl-paste";
|
||||||
|
wl-copy = getExe' pkgs.wl-clipboard "wl-copy";
|
||||||
cliphist = getExe' pkgs.cliphist "cliphist";
|
cliphist = getExe' pkgs.cliphist "cliphist";
|
||||||
cliphist-fuzzel-img = getExe' pkgs.cliphist "cliphist-fuzzel-img";
|
|
||||||
wl-clip-persist = getExe pkgs.wl-clip-persist;
|
|
||||||
in
|
in
|
||||||
(
|
(
|
||||||
let
|
let
|
||||||
|
|
@ -49,7 +48,7 @@ in
|
||||||
in [
|
in [
|
||||||
(plain "binds" [
|
(plain "binds" [
|
||||||
(plain "Mod+V" [
|
(plain "Mod+V" [
|
||||||
(spawn [cliphist-fuzzel-img])
|
(spawn [sh "-c" "${cliphist} list | ${fuzzel} --dmenu | ${cliphist} decode | ${wl-copy}"])
|
||||||
])
|
])
|
||||||
(plain "Mod+Shift+P" [
|
(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"])
|
(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 [swaybg "-i" "${config.home.homeDirectory}/wallpaper/01.png"])
|
||||||
(spawn-at-startup [polkit-kde-agent])
|
(spawn-at-startup [polkit-kde-agent])
|
||||||
(spawn-at-startup [wl-paste "--watch" cliphist "store"])
|
(spawn-at-startup [wl-paste "--watch" cliphist "store"])
|
||||||
(spawn-at-startup [wl-clip-persist "--clipboard" "regular"])
|
(spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"])
|
||||||
(spawn-at-startup [fcitx5 "--replace"])
|
|
||||||
(plain "input" [
|
(plain "input" [
|
||||||
(plain "touchpad" [
|
(plain "touchpad" [
|
||||||
(leaf "click-method" "clickfinger")
|
(leaf "click-method" "clickfinger")
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
users.deploy.enable = true;
|
users.deploy.enable = true;
|
||||||
containers.interface = "ens3";
|
containers.interface = "ens3";
|
||||||
programs = {
|
programs = {
|
||||||
|
transfer-sh.enable = true;
|
||||||
rustypaste = {
|
rustypaste = {
|
||||||
enable = true;
|
enable = true;
|
||||||
url = "https://paste.youthlic.fun";
|
url = "https://paste.youthlic.fun";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
{outputs, ...}: final: prev: let
|
|
||||||
inherit (prev.stdenv.hostPlatform) system;
|
|
||||||
in {
|
|
||||||
inherit (outputs.packages."${system}") cliphist;
|
|
||||||
}
|
|
||||||
|
|
@ -8,9 +8,8 @@ in
|
||||||
./spotifyx.nix
|
./spotifyx.nix
|
||||||
./radicle-explorer.nix
|
./radicle-explorer.nix
|
||||||
./wshowkeys.nix
|
./wshowkeys.nix
|
||||||
# ./QQ.nix
|
./QQ.nix
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./cliphist.nix
|
|
||||||
]
|
]
|
||||||
|> map (file: import file args)
|
|> map (file: import file args)
|
||||||
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
},
|
},
|
||||||
"TrackersListCollection": {
|
"TrackersListCollection": {
|
||||||
"cargoLocks": null,
|
"cargoLocks": null,
|
||||||
"date": "2025-06-10",
|
"date": "2025-06-09",
|
||||||
"extract": null,
|
"extract": null,
|
||||||
"name": "TrackersListCollection",
|
"name": "TrackersListCollection",
|
||||||
"passthru": null,
|
"passthru": null,
|
||||||
|
|
@ -34,35 +34,14 @@
|
||||||
"name": null,
|
"name": null,
|
||||||
"owner": "XIU2",
|
"owner": "XIU2",
|
||||||
"repo": "TrackersListCollection",
|
"repo": "TrackersListCollection",
|
||||||
"rev": "01e578ea12a7f00d989dfaf13c5f43875f1ff853",
|
"rev": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c",
|
||||||
"sha256": "sha256-npX1g1rvprXLEwkjE7S3hfpUCdmEnolSq4eLki9pvag=",
|
"sha256": "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=",
|
||||||
"sparseCheckout": [
|
"sparseCheckout": [
|
||||||
"all.txt"
|
"all.txt"
|
||||||
],
|
],
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"version": "01e578ea12a7f00d989dfaf13c5f43875f1ff853"
|
"version": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c"
|
||||||
},
|
|
||||||
"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"
|
|
||||||
},
|
},
|
||||||
"dioxionary": {
|
"dioxionary": {
|
||||||
"cargoLocks": {
|
"cargoLocks": {
|
||||||
|
|
@ -157,7 +136,7 @@
|
||||||
},
|
},
|
||||||
"rime-ice": {
|
"rime-ice": {
|
||||||
"cargoLocks": null,
|
"cargoLocks": null,
|
||||||
"date": "2025-06-09",
|
"date": "2025-06-06",
|
||||||
"extract": null,
|
"extract": null,
|
||||||
"name": "rime-ice",
|
"name": "rime-ice",
|
||||||
"passthru": null,
|
"passthru": null,
|
||||||
|
|
@ -169,12 +148,12 @@
|
||||||
"name": null,
|
"name": null,
|
||||||
"owner": "iDvel",
|
"owner": "iDvel",
|
||||||
"repo": "rime-ice",
|
"repo": "rime-ice",
|
||||||
"rev": "5b94b7df626bffedc3fe05ee71511aa0272bfc36",
|
"rev": "b86e6147d68c229b45bb1f2a593f8b76155e964d",
|
||||||
"sha256": "sha256-RK5togo9YEQVSUL1bpkcsHmzK1V8IMe0adFB1T2hVoI=",
|
"sha256": "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=",
|
||||||
"sparseCheckout": [],
|
"sparseCheckout": [],
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"version": "5b94b7df626bffedc3fe05ee71511aa0272bfc36"
|
"version": "b86e6147d68c229b45bb1f2a593f8b76155e964d"
|
||||||
},
|
},
|
||||||
"spotx": {
|
"spotx": {
|
||||||
"cargoLocks": null,
|
"cargoLocks": null,
|
||||||
|
|
|
||||||
|
|
@ -15,30 +15,18 @@
|
||||||
};
|
};
|
||||||
TrackersListCollection = {
|
TrackersListCollection = {
|
||||||
pname = "TrackersListCollection";
|
pname = "TrackersListCollection";
|
||||||
version = "01e578ea12a7f00d989dfaf13c5f43875f1ff853";
|
version = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "XIU2";
|
owner = "XIU2";
|
||||||
repo = "TrackersListCollection";
|
repo = "TrackersListCollection";
|
||||||
rev = "01e578ea12a7f00d989dfaf13c5f43875f1ff853";
|
rev = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
deepClone = false;
|
deepClone = false;
|
||||||
leaveDotGit = false;
|
leaveDotGit = false;
|
||||||
sparseCheckout = [ "all.txt" ];
|
sparseCheckout = [ "all.txt" ];
|
||||||
sha256 = "sha256-npX1g1rvprXLEwkjE7S3hfpUCdmEnolSq4eLki9pvag=";
|
sha256 = "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=";
|
||||||
};
|
};
|
||||||
date = "2025-06-10";
|
date = "2025-06-09";
|
||||||
};
|
|
||||||
cliphist = {
|
|
||||||
pname = "cliphist";
|
|
||||||
version = "f49bd905cff72d32d62c209224353865436f9a13";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "sentriz";
|
|
||||||
repo = "cliphist";
|
|
||||||
rev = "f49bd905cff72d32d62c209224353865436f9a13";
|
|
||||||
fetchSubmodules = false;
|
|
||||||
sha256 = "sha256-waD4AIAAlorW+UBvHKFc5dm/CqP0Fw3pygYqPX5cYNc=";
|
|
||||||
};
|
|
||||||
date = "2025-06-07";
|
|
||||||
};
|
};
|
||||||
dioxionary = {
|
dioxionary = {
|
||||||
pname = "dioxionary";
|
pname = "dioxionary";
|
||||||
|
|
@ -104,15 +92,15 @@
|
||||||
};
|
};
|
||||||
rime-ice = {
|
rime-ice = {
|
||||||
pname = "rime-ice";
|
pname = "rime-ice";
|
||||||
version = "5b94b7df626bffedc3fe05ee71511aa0272bfc36";
|
version = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "iDvel";
|
owner = "iDvel";
|
||||||
repo = "rime-ice";
|
repo = "rime-ice";
|
||||||
rev = "5b94b7df626bffedc3fe05ee71511aa0272bfc36";
|
rev = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
sha256 = "sha256-RK5togo9YEQVSUL1bpkcsHmzK1V8IMe0adFB1T2hVoI=";
|
sha256 = "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=";
|
||||||
};
|
};
|
||||||
date = "2025-06-09";
|
date = "2025-06-06";
|
||||||
};
|
};
|
||||||
spotx = {
|
spotx = {
|
||||||
pname = "spotx";
|
pname = "spotx";
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
]}
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
|
|
@ -22,7 +22,6 @@ in
|
||||||
OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {};
|
OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {};
|
||||||
QQ = callPackage ./QQ.nix {};
|
QQ = callPackage ./QQ.nix {};
|
||||||
editor-runtime = callPackage ./editor-runtime.nix {};
|
editor-runtime = callPackage ./editor-runtime.nix {};
|
||||||
cliphist = callPackage ./cliphist.nix {};
|
|
||||||
|
|
||||||
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
|
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
|
||||||
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
|
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,3 @@ fetch.github = "DreamMaoMao/wshowkeys"
|
||||||
[OuterWildsTextAdventure]
|
[OuterWildsTextAdventure]
|
||||||
src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git"
|
src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git"
|
||||||
fetch.github = "top-mind/OuterWildsTextAdventureWeb"
|
fetch.github = "top-mind/OuterWildsTextAdventureWeb"
|
||||||
|
|
||||||
[cliphist]
|
|
||||||
src.git = "https://github.com/sentriz/cliphist.git"
|
|
||||||
fetch.github = "sentriz/cliphist"
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,7 @@
|
||||||
{
|
{pkgs}:
|
||||||
writeShellApplication,
|
pkgs.writeShellApplication {
|
||||||
pinentry-all,
|
|
||||||
}:
|
|
||||||
writeShellApplication {
|
|
||||||
name = "pinentry";
|
name = "pinentry";
|
||||||
runtimeInputs = [
|
runtimeInputs = with pkgs; [
|
||||||
pinentry-all
|
pinentry-all
|
||||||
];
|
];
|
||||||
text = ''
|
text = ''
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
radicle-explorer,
|
pkgs,
|
||||||
rootPath,
|
rootPath,
|
||||||
}:
|
}:
|
||||||
(radicle-explorer.withConfig {
|
(pkgs.radicle-explorer.withConfig {
|
||||||
preferredSeeds = [
|
preferredSeeds = [
|
||||||
{
|
{
|
||||||
hostname = "seed.youthlic.fun";
|
hostname = "seed.youthlic.fun";
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,16 @@
|
||||||
{
|
{
|
||||||
spotify,
|
pkgs,
|
||||||
unzip,
|
|
||||||
zip,
|
|
||||||
perl,
|
|
||||||
symlinkJoin,
|
|
||||||
srcs,
|
srcs,
|
||||||
}: let
|
}: let
|
||||||
inherit (srcs) spotx;
|
inherit (srcs) spotx;
|
||||||
spotifyx = spotify.overrideAttrs (final: prev: {
|
spotifyx = pkgs.spotify.overrideAttrs (final: prev: {
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
prev.nativeBuildInputs
|
prev.nativeBuildInputs
|
||||||
++ [
|
++ (with pkgs; [
|
||||||
unzip
|
unzip
|
||||||
zip
|
zip
|
||||||
perl
|
perl
|
||||||
];
|
]);
|
||||||
spotx = spotx.src;
|
spotx = spotx.src;
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
cp $spotx/spotx.sh ./spotx.sh
|
cp $spotx/spotx.sh ./spotx.sh
|
||||||
|
|
@ -26,7 +22,7 @@
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
symlinkJoin {
|
pkgs.symlinkJoin {
|
||||||
name = "spotifyx";
|
name = "spotifyx";
|
||||||
paths = [spotifyx];
|
paths = [spotifyx];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
srcs,
|
srcs,
|
||||||
wshowkeys,
|
|
||||||
}: let
|
}: let
|
||||||
inherit (srcs) wshowkeys-mao;
|
inherit (srcs) wshowkeys-mao;
|
||||||
in
|
in
|
||||||
wshowkeys.overrideAttrs (final: prev: {
|
pkgs.wshowkeys.overrideAttrs (final: prev: {
|
||||||
inherit (wshowkeys-mao) src;
|
inherit (wshowkeys-mao) src;
|
||||||
pname = "wshowkeys-mao";
|
pname = "wshowkeys-mao";
|
||||||
version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;
|
version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue