Compare commits
2 commits
0e866d659b
...
07a228e298
| Author | SHA1 | Date | |
|---|---|---|---|
| 07a228e298 | |||
| 3054cf7ae1 |
13 changed files with 505 additions and 609 deletions
|
|
@ -43,27 +43,6 @@
|
||||||
},
|
},
|
||||||
"version": "aa13bda89bcd7deb9be26dc11a4cfb49543274b0"
|
"version": "aa13bda89bcd7deb9be26dc11a4cfb49543274b0"
|
||||||
},
|
},
|
||||||
"cliphist": {
|
|
||||||
"cargoLocks": null,
|
|
||||||
"date": "2025-10-11",
|
|
||||||
"extract": null,
|
|
||||||
"name": "cliphist",
|
|
||||||
"passthru": null,
|
|
||||||
"pinned": false,
|
|
||||||
"src": {
|
|
||||||
"deepClone": false,
|
|
||||||
"fetchSubmodules": false,
|
|
||||||
"leaveDotGit": false,
|
|
||||||
"name": null,
|
|
||||||
"owner": "sentriz",
|
|
||||||
"repo": "cliphist",
|
|
||||||
"rev": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2",
|
|
||||||
"sha256": "sha256-y4FSl/Bj80XqCR0ZwjGEkqYUIF6zJHrYyy01XPFlzjU=",
|
|
||||||
"sparseCheckout": [],
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"version": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2"
|
|
||||||
},
|
|
||||||
"noto-sans-cjk": {
|
"noto-sans-cjk": {
|
||||||
"cargoLocks": null,
|
"cargoLocks": null,
|
||||||
"date": null,
|
"date": null,
|
||||||
|
|
|
||||||
|
|
@ -28,18 +28,6 @@
|
||||||
};
|
};
|
||||||
date = "2026-01-14";
|
date = "2026-01-14";
|
||||||
};
|
};
|
||||||
cliphist = {
|
|
||||||
pname = "cliphist";
|
|
||||||
version = "efb61cb5b5a28d896c05a24ac83b9c39c96575f2";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "sentriz";
|
|
||||||
repo = "cliphist";
|
|
||||||
rev = "efb61cb5b5a28d896c05a24ac83b9c39c96575f2";
|
|
||||||
fetchSubmodules = false;
|
|
||||||
sha256 = "sha256-y4FSl/Bj80XqCR0ZwjGEkqYUIF6zJHrYyy01XPFlzjU=";
|
|
||||||
};
|
|
||||||
date = "2025-10-11";
|
|
||||||
};
|
|
||||||
noto-sans-cjk = {
|
noto-sans-cjk = {
|
||||||
pname = "noto-sans-cjk";
|
pname = "noto-sans-cjk";
|
||||||
version = "Serif2.003";
|
version = "Serif2.003";
|
||||||
|
|
|
||||||
|
|
@ -38,11 +38,10 @@
|
||||||
programs = {
|
programs = {
|
||||||
chromium.enable = true;
|
chromium.enable = true;
|
||||||
thunderbird.enable = true;
|
thunderbird.enable = true;
|
||||||
# espanso.enable = true;
|
|
||||||
mpv.enable = true;
|
mpv.enable = true;
|
||||||
ghostty.enable = true;
|
ghostty.enable = true;
|
||||||
zed-editor.enable = true;
|
zed-editor.enable = true;
|
||||||
firefox.enable = true;
|
zen-browser.enable = true;
|
||||||
helix.enable = true;
|
helix.enable = true;
|
||||||
openssh.enable = true;
|
openssh.enable = true;
|
||||||
alacritty.enable = true;
|
alacritty.enable = true;
|
||||||
|
|
@ -74,11 +73,9 @@
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
scrcpy
|
scrcpy
|
||||||
ast-grep
|
ast-grep
|
||||||
gitu
|
|
||||||
dig
|
dig
|
||||||
fend
|
fend
|
||||||
gitoxide
|
gitoxide
|
||||||
kdePackages.kdenlive
|
|
||||||
fd
|
fd
|
||||||
viu
|
viu
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
{config, ...}: {
|
{...}: {
|
||||||
david.programs.niri = {
|
david.programs.niri = {
|
||||||
waybar.settings = let
|
|
||||||
cfg = config.david.programs.niri.waybar;
|
|
||||||
in [(cfg.template // (cfg.helper.mkBacklight "intel_backlight") // {output = "eDP-1";})];
|
|
||||||
wluma.extraSettings = {
|
wluma.extraSettings = {
|
||||||
output = {
|
output = {
|
||||||
backlight = [
|
backlight = [
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,6 @@
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
scrcpy
|
scrcpy
|
||||||
ast-grep
|
ast-grep
|
||||||
gitu
|
|
||||||
dig
|
dig
|
||||||
fend
|
fend
|
||||||
gitoxide
|
gitoxide
|
||||||
|
|
|
||||||
|
|
@ -105,9 +105,7 @@
|
||||||
"drawerEnabled": true,
|
"drawerEnabled": true,
|
||||||
"hidePassive": false,
|
"hidePassive": false,
|
||||||
"id": "Tray",
|
"id": "Tray",
|
||||||
"pinned": [
|
"pinned": ["Fcitx"]
|
||||||
"Fcitx"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"customFont": "",
|
"customFont": "",
|
||||||
|
|
@ -415,12 +413,7 @@
|
||||||
"autoHideMs": 2000,
|
"autoHideMs": 2000,
|
||||||
"overlayLayer": true,
|
"overlayLayer": true,
|
||||||
"backgroundOpacity": 1,
|
"backgroundOpacity": 1,
|
||||||
"enabledTypes": [
|
"enabledTypes": [0, 1, 2, 3],
|
||||||
0,
|
|
||||||
1,
|
|
||||||
2,
|
|
||||||
3
|
|
||||||
],
|
|
||||||
"monitors": []
|
"monitors": []
|
||||||
},
|
},
|
||||||
"audio": {
|
"audio": {
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
radicle-node
|
radicle-desktop
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
wget
|
wget
|
||||||
git
|
git
|
||||||
|
|
@ -59,7 +59,6 @@
|
||||||
localsend
|
localsend
|
||||||
zulip
|
zulip
|
||||||
wechat
|
wechat
|
||||||
nixvim
|
|
||||||
neovide
|
neovide
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -68,7 +67,7 @@
|
||||||
services.scx = {
|
services.scx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
scheduler = "scx_lavd";
|
scheduler = "scx_lavd";
|
||||||
package = pkgs.scx_git.rustscheds;
|
package = pkgs.scx.rustscheds;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,6 @@
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
radicle-node
|
|
||||||
radicle-desktop
|
radicle-desktop
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
wget
|
wget
|
||||||
|
|
|
||||||
|
|
@ -30,10 +30,6 @@ src.git = "https://github.com/DreamMaoMao/wshowkeys.git"
|
||||||
fetch.github = "top-mind/OuterWildsTextAdventureWeb"
|
fetch.github = "top-mind/OuterWildsTextAdventureWeb"
|
||||||
src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git"
|
src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git"
|
||||||
|
|
||||||
[cliphist]
|
|
||||||
fetch.github = "sentriz/cliphist"
|
|
||||||
src.git = "https://github.com/sentriz/cliphist.git"
|
|
||||||
|
|
||||||
[rime-yuhaostar]
|
[rime-yuhaostar]
|
||||||
fetch.url = "https://github.com/forfudan/yuhao-ime-release/releases/download/$ver/star_xingchen_$ver.zip"
|
fetch.url = "https://github.com/forfudan/yuhao-ime-release/releases/download/$ver/star_xingchen_$ver.zip"
|
||||||
src.github = "forfudan/yuhao-ime-release"
|
src.github = "forfudan/yuhao-ime-release"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
{outputs, ...}: _final: prev: let
|
|
||||||
inherit (prev.stdenv.hostPlatform) system;
|
|
||||||
in {
|
|
||||||
cliphist = outputs.packages."${system}".cliphist';
|
|
||||||
}
|
|
||||||
|
|
@ -10,7 +10,6 @@ in
|
||||||
./wshowkeys.nix
|
./wshowkeys.nix
|
||||||
# ./QQ.nix
|
# ./QQ.nix
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./cliphist.nix
|
|
||||||
./zulip.nix
|
./zulip.nix
|
||||||
./nautilus.nix
|
./nautilus.nix
|
||||||
./neovim-nightly.nix
|
./neovim-nightly.nix
|
||||||
|
|
|
||||||
|
|
@ -1,45 +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-4XyDLOJHdre/1BpjgFt/W6gOlPOvKztE+MsbwE3JAaQ=";
|
|
||||||
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
|
|
||||||
]
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
)
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue