From 0e72f2fab553ee0a2e07cdb8d188b439a43382dc Mon Sep 17 00:00:00 2001 From: cnst Date: Sat, 29 Jun 2024 23:30:44 +0200 Subject: [PATCH] pavucontrol and waybar fixes --- flake.lock | 63 ++++-------------------------------------- flake.nix | 2 -- home/extra/adam.nix | 2 +- home/extra/cnst.nix | 3 +- hosts/core/default.nix | 1 + 5 files changed, 9 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index aefab60c..4c77b150 100644 --- a/flake.lock +++ b/flake.lock @@ -87,22 +87,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -316,11 +300,11 @@ ] }, "locked": { - "lastModified": 1719467057, - "narHash": "sha256-8gQ0txwuLoBpBeIhTAkl+/7Hi/AD4KE5m4YhOn1OA3E=", + "lastModified": 1719683797, + "narHash": "sha256-sfE3ACZSo7I2ahByRsU66X+xmzAz4qSxl4IipSD7ObM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "bb6bea003dc464a4248a173e71a007d368691092", + "rev": "48f92fd7f42dd4b01e55dbe0baaf21c4a270a076", "type": "github" }, "original": { @@ -332,11 +316,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719414226, - "narHash": "sha256-h/qJ+1R+BtY+mX02UsqYW82hEl78mrHTGAs9yjpFEzU=", + "lastModified": 1719676676, + "narHash": "sha256-97hP/z7sH4GUBBVi2Z7QiJsgIOO6a+AFYf4MvTU2p0Y=", "owner": "neovim", "repo": "neovim", - "rev": "fc9b70826ec88ca2e6c0624c522b872e87aa7ac1", + "rev": "435d0182d293e70b14a5655c976c3c6daa6ea765", "type": "github" }, "original": { @@ -392,22 +376,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1707650010, - "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "firefox-nightly": "firefox-nightly", @@ -416,28 +384,9 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "solaar": "solaar", "systems": "systems_2" } }, - "solaar": { - "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1715955760, - "narHash": "sha256-XM9hLLKwEoQvwXZHbBSqYnra2xScO3YQ19Cv4KmO+0A=", - "path": "/nix/store/0v335cfrw22d89addl7ymamsf56kad59-source", - "rev": "1564bf36b610f25468284c1bdb6e6e6325d21226", - "revCount": 35, - "type": "path" - }, - "original": { - "id": "solaar", - "type": "indirect" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index b07c33db..79ccd130 100644 --- a/flake.nix +++ b/flake.nix @@ -20,14 +20,12 @@ url = "github:nix-community/flake-firefox-nightly"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Home manager }; outputs = { self, nixpkgs, home-manager, systems, - solaar, ... } @ inputs: let inherit (self) outputs; diff --git a/home/extra/adam.nix b/home/extra/adam.nix index 148bc144..0069563a 100644 --- a/home/extra/adam.nix +++ b/home/extra/adam.nix @@ -20,7 +20,7 @@ xfce.thunar-archive-plugin gnome.file-roller pamixer - pwvucontrol + pavucontrol virt-manager fastfetch waybar diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix index 7c7355ad..052b81f3 100644 --- a/home/extra/cnst.nix +++ b/home/extra/cnst.nix @@ -21,7 +21,7 @@ xfce.thunar-archive-plugin gnome.file-roller pamixer - pwvucontrol + pavucontrol virt-manager fastfetch waybar @@ -35,7 +35,6 @@ wpa_supplicant # SYSTEM - kdePackages.polkit-kde-agent-1 ntfs3g btop htop diff --git a/hosts/core/default.nix b/hosts/core/default.nix index 4dad8b72..6392a536 100644 --- a/hosts/core/default.nix +++ b/hosts/core/default.nix @@ -54,6 +54,7 @@ pkgs.xdg-user-dirs pkgs.udiskie pkgs.wlroots + pkgs.fzf ]; }; }