From 10380a53b532aac0b0c2ed1529c601902dd360dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 31 May 2023 20:42:55 -0300 Subject: [PATCH] sway: add wl-crosshair --- flake.lock | 71 +++++++++++++++++++++++++++++++++++++++- flake.nix | 1 + overlays/default.nix | 1 + user/sway/default.nix | 1 + user/sway/sway-binds.nix | 1 + 5 files changed, 74 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index f8572d5..091ab0a 100644 --- a/flake.lock +++ b/flake.lock @@ -371,6 +371,24 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -624,6 +642,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1684242266, + "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1684247644, @@ -709,7 +743,8 @@ "ranger-sixel": "ranger-sixel", "sea-orm-cli": "sea-orm-cli", "tlauncher": "tlauncher", - "wegank": "wegank" + "wegank": "wegank", + "wl-crosshair": "wl-crosshair" } }, "rust-analyzer-src": { @@ -844,6 +879,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tlauncher": { "inputs": { "flake-utils": "flake-utils_6", @@ -898,6 +948,25 @@ "type": "github" } }, + "wl-crosshair": { + "inputs": { + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1685576039, + "narHash": "sha256-WMkWurJsZZG7YkWzW/k2SNquYLsAZjzFs7CFswSjDew=", + "owner": "lelgenio", + "repo": "wl-crosshair", + "rev": "57d0908e10d9f58fc37fe866404cc8b66be1f0d9", + "type": "github" + }, + "original": { + "owner": "lelgenio", + "repo": "wl-crosshair", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 9829e51..ca325a3 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,7 @@ dhist.url = "github:lelgenio/dhist"; demoji.url = "github:lelgenio/demoji"; maildir-notify-daemon.url = "github:lelgenio/maildir-notify-daemon"; + wl-crosshair.url = "github:lelgenio/wl-crosshair"; }; outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager, nur, ... }: let diff --git a/overlays/default.nix b/overlays/default.nix index 65e385a..b824a93 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -49,6 +49,7 @@ demoji = inputs.demoji.packages.${prev.system}.default; tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; + wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli; diff --git a/user/sway/default.nix b/user/sway/default.nix index e729b77..ee1aed8 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -116,6 +116,7 @@ in wf-recorder wl-clipboard wtype + wl-crosshair grim swappy diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 389d871..c87055a 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -150,6 +150,7 @@ let "${mod}+Shift+s" = "exec grim - | swappy -f -"; "${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy"; "${mod}+k" = "exec showkeys"; + "${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair"; "${mod}+x" = "kill"; "${mod}+m" = "mode audio"; "${mod}+escape" =