diff --git a/flake.lock b/flake.lock index f3f8116..9143217 100644 --- a/flake.lock +++ b/flake.lock @@ -94,6 +94,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1676283394, @@ -468,6 +484,7 @@ "rnix-lsp": "rnix-lsp", "secrets": "secrets", "sops-nix": "sops-nix", + "swayfx": "swayfx", "youmubot": "youmubot" } }, @@ -553,6 +570,27 @@ "type": "github" } }, + "swayfx": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1679331631, + "narHash": "sha256-tMoiwFO/AVTV7GoGMSu3XQimFnK8vv3yzf+D41kTJoE=", + "owner": "WillPower3309", + "repo": "swayfx", + "rev": "7d5d7a3022eb17835cea7af7290b1a5d2fe4b03a", + "type": "github" + }, + "original": { + "owner": "WillPower3309", + "repo": "swayfx", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 195d11f..eb5f096 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,10 @@ youmubot.url = "github:natsukagami/youmubot"; youmubot.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = github:fufexan/nix-gaming; + swayfx = { + url = github:WillPower3309/swayfx; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; # --- Sources kakoune.url = github:mawww/kakoune; diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix index 3edcb1a..4d359f4 100644 --- a/home/modules/programs/my-sway/default.nix +++ b/home/modules/programs/my-sway/default.nix @@ -109,7 +109,7 @@ in config.wayland.windowManager.sway = mkIf cfg.enable { enable = true; - package = pkgs.unstable.sway; + package = pkgs.swayfx; systemdIntegration = true; config = { @@ -319,7 +319,16 @@ in (if cfg.enableLaptopBars then '' # Lock screen on lid close bindswitch lid:off exec ${cfg.lockCmd} - '' else ""); + '' else "") + '' + # swayfx stuff + corner_radius 5 + smart_corner_radius on + shadows on + shadow_blur_radius 5 + default_dim_inactive 0.0 + for_window [app_id="kitty"] dim_inactive 0.05 + titlebar_separator enable + ''; }; config.services.swayidle = mkIf cfg.enable { diff --git a/overlay.nix b/overlay.nix index 1eedbfa..df36c8b 100644 --- a/overlay.nix +++ b/overlay.nix @@ -9,7 +9,8 @@ let nix-direnv = prev.unstable.nix-direnv; }; overlay-imported = final: prev: { - rnix-lsp = inputs.rnix-lsp.defaultPackage."${prev.system}"; + rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}"; + swayfx = inputs.swayfx.packages."${final.system}".default; # A list of source-style inputs. sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs;