diff --git a/flake.lock b/flake.lock index bdba53f..b3fc5ff 100644 --- a/flake.lock +++ b/flake.lock @@ -37,6 +37,24 @@ "type": "github" } }, + "beaker-src": { + "flake": false, + "locked": { + "lastModified": 1780436704, + "narHash": "sha256-3aMH1YblnpiXKdkQVMRLmMZ5/8G7vB4HAfLg7+izyHg=", + "ref": "refs/heads/master", + "rev": "360d6271e1a20d128430e52637d5d35f4c706ca5", + "revCount": 34, + "shallow": false, + "type": "git", + "url": "https://git.bwaaa.monster/beaker" + }, + "original": { + "shallow": false, + "type": "git", + "url": "https://git.bwaaa.monster/beaker" + } + }, "crane": { "locked": { "lastModified": 1781825982, @@ -52,6 +70,21 @@ "type": "github" } }, + "crane_2": { + "locked": { + "lastModified": 1781825982, + "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "davinci": { "inputs": { "nixpkgs": "nixpkgs", @@ -159,6 +192,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_8" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -861,6 +912,27 @@ "url": "https://git.voidarc.co.uk/voidarc/nvim" } }, + "omnisearch": { + "inputs": { + "beaker-src": "beaker-src", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780508528, + "narHash": "sha256-0OkItQH4D8KcS+mIxgrzGHTHMl7Eb6ZHzTN3UmZbtWI=", + "ref": "refs/heads/master", + "rev": "e48c6366d07e0357afa379dff7b73328589164e5", + "revCount": 131, + "type": "git", + "url": "https://git.voidarc.co.uk/voidarc/omnisearch" + }, + "original": { + "type": "git", + "url": "https://git.voidarc.co.uk/voidarc/omnisearch" + } + }, "otter-launcher": { "inputs": { "flake-parts": "flake-parts_2", @@ -957,10 +1029,13 @@ "import-tree": "import-tree", "nixpkgs": "nixpkgs_5", "nvim": "nvim", + "omnisearch": "omnisearch", "otter-launcher": "otter-launcher_2", "quickshell": "quickshell", "sls-steam": "sls-steam", - "wrappers": "wrappers_3" + "woomer": "woomer_2", + "wrappers": "wrappers_3", + "wshowkeys": "wshowkeys_2" } }, "sls-steam": { @@ -1071,6 +1146,36 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" @@ -1109,6 +1214,28 @@ "type": "github" } }, + "woomer_2": { + "inputs": { + "crane": "crane_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_7" + }, + "locked": { + "lastModified": 1782685056, + "narHash": "sha256-WJasTKjf1hcxdCc+jKL3dU5RIL2zdYJ/OBFTmIUbuXc=", + "owner": "coffeeispower", + "repo": "woomer", + "rev": "a7a0b288f70b98d168eaa0e8714816d3583c33b1", + "type": "github" + }, + "original": { + "owner": "coffeeispower", + "repo": "woomer", + "type": "github" + } + }, "wrappers": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -1185,6 +1312,27 @@ "type": "github" } }, + "wshowkeys_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781708685, + "narHash": "sha256-NH5b736WoI9LodJKPlonO1X+Lxg8URMLLRkT5to61Zg=", + "owner": "voidarclabs", + "repo": "wshowkeys", + "rev": "47dfb7a0237acbf847ca28cbb88000b33929f50a", + "type": "github" + }, + "original": { + "owner": "voidarclabs", + "repo": "wshowkeys", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 3ab9d8f..a4660e4 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,10 @@ url = "github:coffeeispower/woomer"; inputs.nixpkgs.follows = "nixpkgs"; }; + wshowkeys = { + url = "github:voidarclabs/wshowkeys"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Flake parts flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/modules/features/wshowkeys/default.nix b/modules/features/wshowkeys/default.nix new file mode 100644 index 0000000..d5aafd6 --- /dev/null +++ b/modules/features/wshowkeys/default.nix @@ -0,0 +1,32 @@ +{ + inputs, + moduleWithSystem, + ... +}: { + flake.nixosModules.wshowkeys = moduleWithSystem ({inputs', ...}: { + programs.wshowkeys = { + enable = true; + pacakge = inputs'.wshowkeys.packages.default; + }; + }); + perSystem = { + pkgs, + inputs', + ... + }: { + packages.wshowkeys = inputs.wrappers.lib.wrapPackage ({...}: { + inherit pkgs; + package = inputs'.wshowkeys.packages.default; + flags = { + "-a" = ["right" "top"]; + "-F" = "'FiraMono Nerd Font 35'"; + "-s" = "'#cba6f7ff'"; + "-f" = " '#cdd6f4ff'"; + "-b" = "'#45475a99'"; + "-m" = "70"; + "-l" = "60"; + "-t" = "1000"; + }; + }); + }; +}