Compare commits
4 commits
242163f0c2
...
3614b353bb
| Author | SHA1 | Date | |
|---|---|---|---|
| 3614b353bb | |||
| 4586c904b3 | |||
| 73ff50db30 | |||
| 2afb64528d |
14 changed files with 115 additions and 72 deletions
66
flake.lock
generated
66
flake.lock
generated
|
|
@ -357,11 +357,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747838296,
|
||||
"narHash": "sha256-+o+cq1xVgWwHAtympYIsu9dJ+nNBnNEEJt9uaaBb8eM=",
|
||||
"lastModified": 1747921971,
|
||||
"narHash": "sha256-ZH/YXPZKyrrlEm9/tlLmYFbG5j76GqisFJYo/Kh85Ak=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "76029e58405759fa40e5d38ecdd52cc1c520f0c1",
|
||||
"rev": "ae0dd313bdb418b6944ce77b44023c7fb31b9000",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -378,11 +378,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747834438,
|
||||
"narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
|
||||
"lastModified": 1747978958,
|
||||
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
|
||||
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -443,11 +443,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747799743,
|
||||
"narHash": "sha256-HxFVB/ydt5PML2okaEvO3hoOxVIt1dX9qFqrCJojs7U=",
|
||||
"lastModified": 1747980132,
|
||||
"narHash": "sha256-jdQZZDMYl9JBtWupRRneP1NLDylf2KPUu8z72tJVBJI=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "b483ca0ed4299199d944824768b0880437aaac03",
|
||||
"rev": "d5ccd8c5e6198bdac760ea65dd6c46e83a55b6f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -476,11 +476,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747635487,
|
||||
"narHash": "sha256-za7ctGh4MaW1h5Drm1WtwNZxiXvQK9yXZAeeIyY9b2Q=",
|
||||
"lastModified": 1747977864,
|
||||
"narHash": "sha256-BEXi6zHNguEsBD3TIUk/2EMOh5c4Z664UaDeUYpWDhw=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "3f2b7e63ba15cf33475116d32e8b7d22208a8438",
|
||||
"rev": "7fdb918cd04076b173a38f026dc5c27ac830b028",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -497,11 +497,11 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747826251,
|
||||
"narHash": "sha256-Fe4AXmnnAKnh/wIe1ao4Pv/8m6WGA1ujwp6VApgos30=",
|
||||
"lastModified": 1747998535,
|
||||
"narHash": "sha256-ksu3B37s1dU8V0JGcYs0i2u5TOFO5DJhCU53/J2/hiY=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "9a67b4a289cd8994080398d40b57cfde8e8cfb0a",
|
||||
"rev": "fd723f06756030d45df9bae01286f9e2f8be12aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -512,11 +512,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1747723695,
|
||||
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
|
||||
"lastModified": 1747900541,
|
||||
"narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
|
||||
"rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -559,11 +559,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1747676747,
|
||||
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -575,11 +575,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1747676747,
|
||||
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -634,11 +634,11 @@
|
|||
"nur-rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747800214,
|
||||
"narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=",
|
||||
"lastModified": 1747973023,
|
||||
"narHash": "sha256-v2OgykASspKAyL+hYKlfa9PM4cwlFZ7/WQ1uvd256ko=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "54be6f6687f510002f7a1e6c3583278d989f3833",
|
||||
"rev": "c7ee05a5dc9b52ba7a6a660537fabaf711b7790a",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -697,11 +697,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747795013,
|
||||
"narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=",
|
||||
"lastModified": 1747967795,
|
||||
"narHash": "sha256-76s4jDRbQzxRO+5y8ilMp5V30qVgY9R6n8U7aOap8ig=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "6b1cf12374361859242a562e1933a7930649131a",
|
||||
"rev": "f1d5bfa8c692cacd798a3e1fb93d54c1b9ac701a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -758,11 +758,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747837303,
|
||||
"narHash": "sha256-m4ZaL9rosLM0XHNdUBO2+7ZzLs13x7FdLXlLnPrE7vI=",
|
||||
"lastModified": 1747952198,
|
||||
"narHash": "sha256-GjxRPffuLQQx1G701fzgom+bKxCEJD9fbq44x4gl/n8=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "d3fadda72abb5d0958b5ce4c0eb551eecc7d538e",
|
||||
"rev": "f99fe598a68831debbf096e289296c7c7178c21f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
spacer
|
||||
devenv
|
||||
just
|
||||
showmethekey
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -464,36 +464,6 @@ in
|
|||
(leaf "geometry-corner-radius" 12.0)
|
||||
(leaf "clip-to-geometry" true)
|
||||
])
|
||||
(window-rule [
|
||||
(match {app-id = "^showmethekey-gtk$";})
|
||||
(leaf "geometry-corner-radius" 0.0)
|
||||
(leaf "clip-to-geometry" false)
|
||||
(leaf "open-floating" true)
|
||||
(leaf "open-focused" false)
|
||||
(plain "default-column-width" [
|
||||
(leaf "fixed" 300)
|
||||
])
|
||||
(plain "default-window-height" [
|
||||
(leaf "fixed" 70)
|
||||
])
|
||||
(leaf "draw-border-with-background" true)
|
||||
(leaf "default-floating-position" {
|
||||
relative-to = "bottom-right";
|
||||
x = 20;
|
||||
y = 20;
|
||||
})
|
||||
(plain "focus-ring" [
|
||||
(flag "off")
|
||||
])
|
||||
(plain "border" [
|
||||
(flag "off")
|
||||
])
|
||||
(plain "shadow" [
|
||||
(flag "off")
|
||||
])
|
||||
(leaf "baba-is-float" true)
|
||||
(leaf "tiled-state" false)
|
||||
])
|
||||
(window-rule [
|
||||
(match {app-id = "^org\\.keepassxc\\.KeePassXC$";})
|
||||
(match {app-id = "^org\\.gnome\\.World\\.Secrets$";})
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
openssh.enable = true;
|
||||
kanata.enable = true;
|
||||
tailscale.enable = true;
|
||||
wshowkeys.enable = true;
|
||||
};
|
||||
};
|
||||
programs.gnupg.agent = {
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
juicity.client.enable = true;
|
||||
owncast.enable = true;
|
||||
minio.enable = true;
|
||||
wshowkeys.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@
|
|||
./minio.nix
|
||||
./supergfxd.nix
|
||||
./radicle.nix
|
||||
./wshowkeys.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
16
nixos/modules/programs/wshowkeys.nix
Normal file
16
nixos/modules/programs/wshowkeys.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.youthlic.programs.wshowkeys;
|
||||
in {
|
||||
options = {
|
||||
youthlic.programs.wshowkeys = {
|
||||
enable = lib.mkEnableOption "wshowkeys";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.wshowkeys.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@ in
|
|||
./dae.nix
|
||||
./spotifyx.nix
|
||||
./radicle-explorer.nix
|
||||
./wshowkeys.nix
|
||||
]
|
||||
|> map (file: import file args)
|
||||
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||
|
|
|
|||
5
overlays/modifications/wshowkeys.nix
Normal file
5
overlays/modifications/wshowkeys.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{outputs, ...}: final: prev: let
|
||||
inherit (prev.stdenv.hostPlatform) system;
|
||||
in {
|
||||
wshowkeys = outputs.packages.${system}.wshowkeys-mao;
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"TrackersListCollection": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-22",
|
||||
"date": "2025-05-23",
|
||||
"extract": null,
|
||||
"name": "TrackersListCollection",
|
||||
"passthru": null,
|
||||
|
|
@ -13,14 +13,14 @@
|
|||
"name": null,
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"rev": "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b",
|
||||
"sha256": "sha256-2ZctoHyfyDCMuqLlMWoy8BIuZff5fAivtsVPLoVef9I=",
|
||||
"rev": "ee8fdda211b4913f7a952fe8ca43b22c3ca2bc54",
|
||||
"sha256": "sha256-e1KUpIR7KcGawZLsd8bD/R0WpOM5evtsMzPxWmJ3WFk=",
|
||||
"sparseCheckout": [
|
||||
"all.txt"
|
||||
],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b"
|
||||
"version": "ee8fdda211b4913f7a952fe8ca43b22c3ca2bc54"
|
||||
},
|
||||
"dioxionary": {
|
||||
"cargoLocks": {
|
||||
|
|
@ -176,5 +176,26 @@
|
|||
"url": "https://github.com/kayhide/tree-sitter-idris"
|
||||
},
|
||||
"version": "c56a25cf57c68ff929356db25505c1cc4c7820f6"
|
||||
},
|
||||
"wshowkeys-mao": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-02-03",
|
||||
"extract": null,
|
||||
"name": "wshowkeys-mao",
|
||||
"passthru": null,
|
||||
"pinned": false,
|
||||
"src": {
|
||||
"deepClone": false,
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"owner": "DreamMaoMao",
|
||||
"repo": "wshowkeys",
|
||||
"rev": "24364e5f40b7ccbed728fe88757f559d84fae234",
|
||||
"sha256": "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "24364e5f40b7ccbed728fe88757f559d84fae234"
|
||||
}
|
||||
}
|
||||
|
|
@ -3,18 +3,18 @@
|
|||
{
|
||||
TrackersListCollection = {
|
||||
pname = "TrackersListCollection";
|
||||
version = "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b";
|
||||
version = "ee8fdda211b4913f7a952fe8ca43b22c3ca2bc54";
|
||||
src = fetchFromGitHub {
|
||||
owner = "XIU2";
|
||||
repo = "TrackersListCollection";
|
||||
rev = "89d1e855ada9fa4e136759c1f2d9f83e4077fa9b";
|
||||
rev = "ee8fdda211b4913f7a952fe8ca43b22c3ca2bc54";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ "all.txt" ];
|
||||
sha256 = "sha256-2ZctoHyfyDCMuqLlMWoy8BIuZff5fAivtsVPLoVef9I=";
|
||||
sha256 = "sha256-e1KUpIR7KcGawZLsd8bD/R0WpOM5evtsMzPxWmJ3WFk=";
|
||||
};
|
||||
date = "2025-05-22";
|
||||
date = "2025-05-23";
|
||||
};
|
||||
dioxionary = {
|
||||
pname = "dioxionary";
|
||||
|
|
@ -117,4 +117,16 @@
|
|||
name = "idris";
|
||||
date = "2024-11-05";
|
||||
};
|
||||
wshowkeys-mao = {
|
||||
pname = "wshowkeys-mao";
|
||||
version = "24364e5f40b7ccbed728fe88757f559d84fae234";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DreamMaoMao";
|
||||
repo = "wshowkeys";
|
||||
rev = "24364e5f40b7ccbed728fe88757f559d84fae234";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=";
|
||||
};
|
||||
date = "2025-02-03";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ in
|
|||
spotifyx = callPackage ./spotifyx.nix {};
|
||||
radicle-explorer = callPackage ./radicle-explorer {};
|
||||
TrackersListCollection = callPackage ./TrackersListCollection.nix {};
|
||||
wshowkeys-mao = callPackage ./wshowkeys-mao.nix {};
|
||||
|
||||
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
|
||||
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
|
||||
|
|
|
|||
|
|
@ -34,3 +34,7 @@ fetch.github = "SpotX-Official/SpotX-Bash"
|
|||
src.git = "https://github.com/XIU2/TrackersListCollection.git"
|
||||
fetch.github = "XIU2/TrackersListCollection"
|
||||
git.sparseCheckout = ["all.txt"]
|
||||
|
||||
[wshowkeys-mao]
|
||||
src.git = "https://github.com/DreamMaoMao/wshowkeys.git"
|
||||
fetch.github = "DreamMaoMao/wshowkeys"
|
||||
|
|
|
|||
11
pkgs/wshowkeys-mao.nix
Normal file
11
pkgs/wshowkeys-mao.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
pkgs,
|
||||
srcs,
|
||||
}: let
|
||||
inherit (srcs) wshowkeys-mao;
|
||||
in
|
||||
pkgs.wshowkeys.overrideAttrs (final: prev: {
|
||||
inherit (wshowkeys-mao) src;
|
||||
pname = "wshowkeys-mao";
|
||||
version = wshowkeys-mao.date + "-" + wshowkeys-mao.version;
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue