diff --git a/flake.lock b/flake.lock index d0332f8..2ef3def 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1680729003, - "narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=", + "lastModified": 1689473676, + "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0", + "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789", "type": "github" }, "original": { @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1694643084, - "narHash": "sha256-t3BBrWnaoZn/iRnEPCr7jsHgv+RhRiwGQlwNGJ36aO0=", + "lastModified": 1697840369, + "narHash": "sha256-BOXjb3oVicNaH+NyoyjyZFuQUnqVTyGQvEo5aaVzq5E=", "owner": "rycee", "repo": "nur-expressions", - "rev": "03b1d923dad88c6f76638d82dd8629a5b40d18b7", + "rev": "82e0e3c56e0469b9bc71e12120ee71e4366e2974", "type": "gitlab" }, "original": { @@ -56,11 +56,11 @@ }, "hardware": { "locked": { - "lastModified": 1694710316, - "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", + "lastModified": 1697748412, + "narHash": "sha256-5VSB63UE/O191cuZiGHbCJ9ipc7cGKB8cHp0cfusuyo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", + "rev": "72d53d51704295f1645d20384cd13aecc182f624", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1694643239, - "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", + "lastModified": 1697838989, + "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", + "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1694703353, - "narHash": "sha256-4zE6asZoWo7V0HRUNDDE+kX/RT/ofkvK/NXq/rwqCr8=", + "lastModified": 1697851714, + "narHash": "sha256-Ol2RKWrt1h/L3qkOmPYssYFUy0nQ9snyGvKap4wR9No=", "owner": "hyprwm", "repo": "hyprland", - "rev": "f8008e4b3beb4aae2365973879a46fe0f15c79b4", + "rev": "af72404259f7a39069d1449bedbc49b3e6ae4fbc", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1693997747, - "narHash": "sha256-W23nMGmDnyBgxO8O/9jcZtiSpa0taMNcRAD1das/ttw=", + "lastModified": 1696339530, + "narHash": "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=", "owner": "hyprwm", "repo": "contrib", - "rev": "5b67181fced4fb06d26afcf9614b35765c576168", + "rev": "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542", "type": "github" }, "original": { @@ -164,11 +164,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1682108218, - "narHash": "sha256-tMr7BbxualFQlN+XopS8rMMgf2XR9ZfRuwIZtjsWmfI=", + "lastModified": 1695388192, + "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=", "owner": "misterio77", "repo": "nix-colors", - "rev": "b92df8f5eb1fa20d8e09810c03c9dc0d94ef2820", + "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694422566, - "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1680397293, - "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", + "lastModified": 1694911725, + "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", + "rev": "819180647f428a3826bfc917a54449da1e532ce0", "type": "github" }, "original": { @@ -238,18 +238,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1694302348, - "narHash": "sha256-S9NOc88L/1jpNKJqBu2Hihvn0V1HHCK2hXE4bNBAStg=", + "lastModified": 1696410538, + "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", "owner": "wlroots", "repo": "wlroots", - "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" } }, @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1694363988, - "narHash": "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=", + "lastModified": 1694628480, + "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "aca51609d4c415b30e88b96c6f49f0142cbcdae7", + "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", "type": "github" }, "original": { diff --git a/home/ooks/opt/desktop/hyprland/default.nix b/home/ooks/opt/desktop/hyprland/default.nix index fbdc28e..9741334 100644 --- a/home/ooks/opt/desktop/hyprland/default.nix +++ b/home/ooks/opt/desktop/hyprland/default.nix @@ -84,7 +84,8 @@ "${pkgs.swaybg}/bin/swaybg -i ~/.dotfiles/nix/walls/gruvbox/gruvbox-blank.png --mode fill" ]; exec-once = [ - "${pkgs._1password-gui}/bin/1password --silent --enable-features=UseOzonePlatform --ozone-platform=wayland" + "${pkgs._1password-gui}/bin/1password --silent" + "earbuds -d" ]; }; }; diff --git a/home/ooks/opt/desktop/hyprland/systemd-fix.nix b/home/ooks/opt/desktop/hyprland/systemd-fix.nix index f2b5e9b..b082aa1 100644 --- a/home/ooks/opt/desktop/hyprland/systemd-fix.nix +++ b/home/ooks/opt/desktop/hyprland/systemd-fix.nix @@ -3,7 +3,7 @@ let cfg = config.wayland.windowManager.hyprland; in { - config = lib.mkIf (cfg.enable && cfg.systemdIntegration) { + config = lib.mkIf (cfg.enable && cfg.systemd.enable) { # Stolen from https://github.com/alebastr/sway-systemd/commit/0fdb2c4b10beb6079acd6073c5b3014bd58d3b74 systemd.user.targets.hyprland-session-shutdown = { Unit = { diff --git a/pkgs/live-buds-cli/default.nix b/pkgs/live-buds-cli/default.nix index 9ba9cd6..3c61e4f 100644 --- a/pkgs/live-buds-cli/default.nix +++ b/pkgs/live-buds-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, pkgconfig, dbus, libpulseaudio, bluez }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, pkg-config, dbus, libpulseaudio, bluez }: rustPlatform.buildRustPackage rec { pname = "live-buds-cli"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ="; # you will need to determine this hash - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpulseaudio bluez dbus ]; meta = with lib; {