From 974b5634450a333d247c9126905dcb99eedac4bc Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sat, 10 Feb 2024 10:07:03 -0600 Subject: [PATCH] updates from makefile --- flake.lock | 113 +++++++++++++++++++++++++++++++++++++++---- flake.nix | 5 ++ home/gui/default.nix | 3 +- home/gui/sway.nix | 13 +++++ 4 files changed, 123 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 95ca04b..23db5ed 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707385478, - "narHash": "sha256-xwKXoBeiwfp+jqQxt3O0mUxrBXsNfdBn15teMMWbw0U=", + "lastModified": 1707524024, + "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", "owner": "nix-community", "repo": "disko", - "rev": "15b52c3c8a718253e66f1b92f595dc47873fdfea", + "rev": "d07de570ba05cec2807d058daaa044f6955720c7", "type": "github" }, "original": { @@ -34,6 +34,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -41,11 +59,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1707467182, + "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", "type": "github" }, "original": { @@ -79,11 +97,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1707418825, - "narHash": "sha256-94OgWBhmCw/5vsbbj2ZMJUvThiybI+HQolSXjAbya3I=", + "lastModified": 1707493142, + "narHash": "sha256-siGr7EMr6GwmE24NxSd4GdPBSo3nB4MMvGcQIkaHZVg=", "owner": "NixOS", "repo": "nix", - "rev": "1ba9780cf5a99eb610775ab3c938141e65682196", + "rev": "28a988bdde7b20abff9000162015500c44a5812b", "type": "github" }, "original": { @@ -123,6 +141,24 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -171,13 +207,70 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "nix": "nix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1704649711, + "narHash": "sha256-+qxqJrZwvZGilGiLQj3QbYssPdYCwl7ejwMImgH7VBQ=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "04f25d7bec9fb29d2c3bacaa48a3304840000d36", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "wayland-pipewire-idle-inhibit": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1707350846, + "narHash": "sha256-pnS6nNuwDAmxQfbQzJFvd1D9Yv1TPYG4UYfIjtuUzdk=", + "owner": "rafaelrc7", + "repo": "wayland-pipewire-idle-inhibit", + "rev": "a6d7f04dc2dec8ca307ba09b0773e1c0bbaf3690", + "type": "github" + }, + "original": { + "owner": "rafaelrc7", + "repo": "wayland-pipewire-idle-inhibit", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 60d9b01..a1db794 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + wayland-pipewire-idle-inhibit = { + url = "github:rafaelrc7/wayland-pipewire-idle-inhibit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ @@ -15,6 +19,7 @@ nix, nixos-hardware, home-manager, + wayland-pipewire-idle-inhibit, ... }: { nixosConfigurations = let diff --git a/home/gui/default.nix b/home/gui/default.nix index fa784a6..b51fcfa 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -1,7 +1,8 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { home-manager.users.don = { imports = [ + #inputs.wayland-pipewire-idle-inhibit.homeModules.default ./alacritty.nix ./autostart.nix ./fuzzel.nix diff --git a/home/gui/sway.nix b/home/gui/sway.nix index 1014c48..dcd1e40 100644 --- a/home/gui/sway.nix +++ b/home/gui/sway.nix @@ -13,6 +13,19 @@ #effect-blur = "3x10"; }; }; + # services.wayland-pipewire-idle-inhibit = { + # enable = true; + # systemdTarget = "sway-session.target"; + # settings = { + # verbosity = "INFO"; + # media_minimum_duration = 10; + # sink_whitelist = [ + # ]; + # node_blacklist = [ + # { media_class = "[Ss]onixd"; } + # ]; + # }; + # }; programs.waybar = { enable = true; settings = {