summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-14 00:45:04 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-14 00:45:04 +0200
commit728e65ca55b4d952bb7b6ea503b210d87f18bb97 (patch)
tree642a892518ac8bb7b38f19724ab525b773d466b0
parentcf5bc09e33d811dbd8b8798b4311054aaa5fa3d4 (diff)
downloadnixos-728e65ca55b4d952bb7b6ea503b210d87f18bb97.tar
nixos-728e65ca55b4d952bb7b6ea503b210d87f18bb97.tar.gz
nixos-728e65ca55b4d952bb7b6ea503b210d87f18bb97.tar.bz2
nixos-728e65ca55b4d952bb7b6ea503b210d87f18bb97.tar.xz
nixos-728e65ca55b4d952bb7b6ea503b210d87f18bb97.zip
...
-rw-r--r--_sources/generated.json21
-rw-r--r--_sources/generated.nix11
-rw-r--r--accounts/gkleen@sif/default.nix52
-rw-r--r--accounts/gkleen@sif/hyprland.nix9
-rw-r--r--nvfetcher.toml5
5 files changed, 97 insertions, 1 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index a7dba77c..2720c8d2 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -76,6 +76,27 @@
76 }, 76 },
77 "version": "0077334cc299aa7885f804d88f52cdb1b35caf71" 77 "version": "0077334cc299aa7885f804d88f52cdb1b35caf71"
78 }, 78 },
79 "emoji-data": {
80 "cargoLocks": null,
81 "date": null,
82 "extract": null,
83 "name": "emoji-data",
84 "passthru": null,
85 "pinned": false,
86 "src": {
87 "deepClone": false,
88 "fetchSubmodules": true,
89 "leaveDotGit": false,
90 "name": null,
91 "owner": "Mange",
92 "repo": "emoji-data",
93 "rev": "v2.6",
94 "sha256": "sha256-6nBiT9q139P1pXLqkV1JejE0s2rZn1gUbNsejXJR6RU=",
95 "sparseCheckout": [],
96 "type": "github"
97 },
98 "version": "v2.6"
99 },
79 "lesspipe": { 100 "lesspipe": {
80 "cargoLocks": null, 101 "cargoLocks": null,
81 "date": null, 102 "date": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 7050dab8..8bbe4a22 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -48,6 +48,17 @@
48 }; 48 };
49 date = "2015-09-10"; 49 date = "2015-09-10";
50 }; 50 };
51 emoji-data = {
52 pname = "emoji-data";
53 version = "v2.6";
54 src = fetchFromGitHub {
55 owner = "Mange";
56 repo = "emoji-data";
57 rev = "v2.6";
58 fetchSubmodules = true;
59 sha256 = "sha256-6nBiT9q139P1pXLqkV1JejE0s2rZn1gUbNsejXJR6RU=";
60 };
61 };
51 lesspipe = { 62 lesspipe = {
52 pname = "lesspipe"; 63 pname = "lesspipe";
53 version = "2.13"; 64 version = "2.13";
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2c6d747d..0fe68a55 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -971,6 +971,58 @@ in {
971 }; 971 };
972 "dbus-1/services/org.keepassxc.KeePassXC.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.keepassxc.KeePassXC.service"; 972 "dbus-1/services/org.keepassxc.KeePassXC.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.keepassxc.KeePassXC.service";
973 "dbus-1/services/org.freedesktop.secrets.service.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.service.service"; 973 "dbus-1/services/org.freedesktop.secrets.service.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.service.service";
974 "emoji-data/list.txt".source = pkgs.stdenv.mkDerivation {
975 inherit (sources.emoji-data) pname src;
976 version = lib.removePrefix "v" sources.emoji-data.version;
977 buildInputs = with pkgs; [ jq (ruby.withPackages (ps: with ps; [ nokogiri rspec racc rubocop rubocop-performance rspec-core rspec-expectations rspec-mocks diff-lcs parallel parser rainbow regexp_parser rubocop-ast ruby-progressbar unicode-display_width rspec-support optimist ast ])) ];
978 LC_ALL = "C.UTF-8";
979 patches = [
980 (pkgs.writeText "nix.patch" ''
981 diff --git a/Makefile b/Makefile
982 index 896cb50..c7b6db8 100644
983 --- a/Makefile
984 +++ b/Makefile
985 @@ -21,10 +21,10 @@ data:
986 cldr:
987 @[ ! -d cldr/.git ] && git submodule update --init cldr
988
989 -data/all.json: compile.rb $(wildcard lib/*.rb) $(INPUT_FILES) | cldr data check-ruby gems
990 +data/all.json: compile.rb $(wildcard lib/*.rb) $(INPUT_FILES) | data
991 @ruby compile.rb > "$@"
992
993 -data/%.txt: views/%.txt.jq data/all.json | data check-jq
994 +data/%.txt: views/%.txt.jq data/all.json | data
995 @jq -r -f "$<" < data/all.json > "$@"
996
997 data/%.json: views/%.json.jq data/all.json | data check-jq
998 '')
999 ];
1000 postPatch = ''
1001 cp ${pkgs.writeText "list.txt.jq" ''
1002 .categories[] |
1003
1004 # Collect category + subcategory combos
1005 .name as $cat |
1006 reduce .subcategories[] as $sub (
1007 [];
1008 # Build an array of all emojis in this subcategory
1009 . + (
1010 $sub.emojis | map(
1011 # emoji: name (keyword, keyword, keyword)
1012 "\(.characters): \(.name // .tts_descriptions.en // "") (\(.keywords.en // [] | join(", ")))"
1013 )
1014 )
1015 ) |
1016
1017 # Merge into a single string
1018 join("\n")
1019 ''} views/list.txt.jq
1020 '';
1021 buildFlagsArray = ["data/list.txt"];
1022 installPhase = ''
1023 cp data/list.txt $out
1024 '';
1025 };
974 }; 1026 };
975 1027
976 xdg.mimeApps = { 1028 xdg.mimeApps = {
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index d26b72a7..e2106369 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -219,7 +219,7 @@ in {
219 makeWrapper ${lib.getExe pkgs.hyprpicker} $out \ 219 makeWrapper ${lib.getExe pkgs.hyprpicker} $out \
220 --prefix PATH : ${lib.makeBinPath [pkgs.wl-clipboard-rs]} 220 --prefix PATH : ${lib.makeBinPath [pkgs.wl-clipboard-rs]}
221 ''} -a" 221 ''} -a"
222 "$mainMod, E, exec, ${pkgs.writeShellScript "qalc-fuzzel" '' 222 "$mainMod, T, exec, ${pkgs.writeShellScript "qalc-fuzzel" ''
223 export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs libqalculate cfg.programs.fuzzel.package coreutils findutils libnotify gnugrep ])}:$PATH" 223 export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs libqalculate cfg.programs.fuzzel.package coreutils findutils libnotify gnugrep ])}:$PATH"
224 224
225 RESULTS_DIR="$HOME/.cache/qalc-fuzzel" 225 RESULTS_DIR="$HOME/.cache/qalc-fuzzel"
@@ -252,6 +252,13 @@ in {
252 [[ $QALC_RET -eq 0 ]] && wl-copy "$QALC_RES" 252 [[ $QALC_RET -eq 0 ]] && wl-copy "$QALC_RES"
253 notify-send "$QALC_RES" 253 notify-send "$QALC_RES"
254 ''}" 254 ''}"
255 "$mainMod, E, exec, ${pkgs.writeShellScript "emoji-fuzzel" ''
256 export PATH="${lib.makeBinPath (with pkgs; [ cfg.programs.fuzzel.package wtype wl-clipboard-rs ])}:$PATH"
257
258 FUZZEL_RES=$(fuzzel --dmenu --prompt "emoji> " <$HOME/.local/share/emoji-data/list.txt) || exit $?
259 [[ -n "$FUZZEL_RES" ]] || exit 1
260 wl-copy "$(cut -d ':' -f 1 <<<"$FUZZEL_RES" | tr -d '\n')" && wtype -k XF86Paste
261 ''}"
255 262
256 "$mainMod CTRL, return, togglespecialworkspace, term" 263 "$mainMod CTRL, return, togglespecialworkspace, term"
257 "$mainMod CTRL, e, togglespecialworkspace, edit" 264 "$mainMod CTRL, e, togglespecialworkspace, edit"
diff --git a/nvfetcher.toml b/nvfetcher.toml
index d40a8d3a..c8b5efac 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -93,3 +93,8 @@ fetch.tarball = "https://github.com/bk2204/scutiger/archive/refs/tags/v$ver.tar.
93[tomorrow-night-paradise-theme] 93[tomorrow-night-paradise-theme]
94src.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el" 94src.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el"
95fetch.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el" 95fetch.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el"
96
97[emoji-data]
98src.github_tag = "Mange/emoji-data"
99fetch.github = "Mange/emoji-data"
100git.fetchSubmodules = true \ No newline at end of file