From 09a26fd7b02a5b8a976555ced1f7972c5948c2c0 Mon Sep 17 00:00:00 2001 From: macronova Date: Thu, 9 Nov 2023 16:24:40 -0800 Subject: [PATCH] Cleanup plugin --- flake.lock | 42 +++++++++++++++++++++--------------------- linux/blitzar/gui.nix | 11 +++-------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 2d62db4..b351080 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1698429334, - "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", + "lastModified": 1699569089, + "narHash": "sha256-MdOnyXrmMdVU9o7GpcbWKgehoK9L76ihp8rTikPcC1k=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", + "rev": "c8f385766ba076a096caa794309c40f89894d88a", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1699099781, - "narHash": "sha256-2WAs839yL6xmIPBLNVwbft46BDh0/RAjq1bAKNRqeR4=", + "lastModified": 1699483000, + "narHash": "sha256-zWEj1e6r2KNJFTdj4/vpnpoJc2l+v3JHwlQCzrtkojU=", "owner": "nix-community", "repo": "disko", - "rev": "548962c50b8afad7b8c820c1d6e21dc8394d6e65", + "rev": "72bc1526268fda374cd17315e37b64ba340c5bf2", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", + "lastModified": 1699368917, + "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", + "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", "type": "github" }, "original": { @@ -146,15 +146,15 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_5", - "wallpaper-engine-kde-plugin-lib": "wallpaper-engine-kde-plugin-lib", + "wallpaper-engine-kde-plugin": "wallpaper-engine-kde-plugin", "yorha-grub-theme": "yorha-grub-theme" }, "locked": { - "lastModified": 1698444924, - "narHash": "sha256-HPj0bSe/Wo90J04nqmTsaGSUEnjTgYcUP+hS7wftETQ=", + "lastModified": 1699575734, + "narHash": "sha256-Gbm4p7JYd7yWq9WHE7Nlgrrgo0vCckXCjjMuXT162fE=", "ref": "refs/heads/main", - "rev": "69de97b39e13a9c12b8a41abc41b6950519706af", - "revCount": 5, + "rev": "f528a8f4f0dbff8ca1a4e8c9dd0fe613fc4fc540", + "revCount": 6, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -271,11 +271,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1699153251, - "narHash": "sha256-CGx98mbAy9svKTa1dzlrVmkJwgGSXpAQUdMh7U0szts=", + "lastModified": 1699311858, + "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5bc2cde6e53241e7df0e8f5df5872223983efa72", + "rev": "664187539871f63857bda2d498f452792457b998", "type": "github" }, "original": { @@ -378,7 +378,7 @@ "type": "github" } }, - "wallpaper-engine-kde-plugin-lib": { + "wallpaper-engine-kde-plugin": { "flake": false, "locked": { "lastModified": 1697944637, diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index ca2fa5d..0c115e2 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -3,27 +3,22 @@ home.packages = with pkgs; [ exactaudiocopy haruna + libsForQt5.qt5.qtwebsockets lutris nvtop-amd mono picard - (python3.withPackages (ps: with ps; [ - websockets - ])) qbittorrent sweet sweet-nova tauon telegram-desktop thunderbird - wallpaper-engine-kde-plugin-lib + wallpaper-engine-kde-plugin wineWowPackages.waylandFull winetricks yuzu-mainline - ] ++ (with pkgs.libsForQt5; [ - kirigami-addons - qt5.qtwebsockets - ]); + ]; programs = { firefox.enable = true; kitty = {