diff --git a/flake.lock b/flake.lock index 7b2733e..cdab8fa 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1710062421, - "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", + "lastModified": 1710164657, + "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", + "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index b03b091..cf0a521 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,11 +3,10 @@ let inherit (prev) callPackage; inherit (prev) fetchFromGitHub; inherit (prev) fetchPypi; - inherit (prev) fetchpatch; inherit (prev) makeWrapper; inherit (prev) python3Packages; in -rec { +{ pww = callPackage ../pkgs/pww { }; ianny = callPackage ../pkgs/ianny { }; diff --git a/users/rouven/modules/git/default.nix b/users/rouven/modules/git/default.nix index d446667..8bdd0de 100644 --- a/users/rouven/modules/git/default.nix +++ b/users/rouven/modules/git/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.git = { enable = true; diff --git a/users/rouven/modules/wayland/river.nix b/users/rouven/modules/wayland/river.nix index dd45a83..9a4da4a 100644 --- a/users/rouven/modules/wayland/river.nix +++ b/users/rouven/modules/wayland/river.nix @@ -39,11 +39,11 @@ K = ''send-layout-cmd rivertile "main-count +1"''; L = ''send-layout-cmd rivertile "main-ratio +0.05"''; }; - "Alt" = builtins.mapAttrs (key: bind: "spawn " + bind) { + "Alt" = builtins.mapAttrs (_key: bind: "spawn " + bind) { Space = "${pkgs.fuzzel}/bin/fuzzel"; A = "${pkgs.wofi-emoji}/bin/wofi-emoji"; }; - "None" = builtins.mapAttrs (key: bind: "spawn \"" + bind + "\"") { + "None" = builtins.mapAttrs (_key: bind: "spawn \"" + bind + "\"") { Print = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area"; XF86Launch2 = "${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${pkgs.swappy}/bin/swappy -f -"; XF86MonBrightnessUp = "${pkgs.light}/bin/light -A 10"; @@ -56,7 +56,7 @@ XF86Messenger = "${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel"; Cancel = "${pkgs.swaynotificationcenter}/bin/swaync-client --hide-latest"; }; - "Shift" = builtins.mapAttrs (key: bind: "spawn \"" + bind + "\"") { + "Shift" = builtins.mapAttrs (_key: bind: "spawn \"" + bind + "\"") { XF86AudioRaiseVolume = "${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ +5%"; XF86AudioLowerVolume = "${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ -5%"; Cancel = "${pkgs.swaynotificationcenter}/bin/swaync-client --cloes-all"; @@ -64,7 +64,7 @@ } # fuckery. Encodes https://github.com/riverwm/river/blob/c474be1537c833da35682ef54194c3d6ddf1eee0/example/init#L77 in nix (lib.attrsets.mapAttrs - (mod: value: lib.attrsets.genAttrs (lib.lists.forEach (lib.lists.range 1 9) (num: toString num)) + (_mod: value: lib.attrsets.genAttrs (lib.lists.forEach (lib.lists.range 1 9) (num: toString num)) (tag: value + builtins.replaceStrings [ "TAG" ] [ tag ] " $((1 << (TAG - 1)))")) { "Super" = "set-focused-tags"; diff --git a/users/rouven/modules/wayland/waybar.nix b/users/rouven/modules/wayland/waybar.nix index cc4fe9a..579dd31 100644 --- a/users/rouven/modules/wayland/waybar.nix +++ b/users/rouven/modules/wayland/waybar.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: { systemd.user.services.waybar.Service.Environment = "PATH=${pkgs.swaynotificationcenter}/bin"; programs.waybar = {