From 2d27b9c315c153c45288681852c2efd9547570c3 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 21 Jul 2023 12:04:14 +0200 Subject: [PATCH 1/4] nvfetcher: use version 0.6.1.0 from latest instead of flake --- flake.lock | 60 +----------------------------------------- flake.nix | 6 ----- overlays/overrides.nix | 1 + 3 files changed, 2 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index b591103b..3926e233 100644 --- a/flake.lock +++ b/flake.lock @@ -197,24 +197,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home": { "inputs": { "nixpkgs": [ @@ -299,30 +281,6 @@ "type": "github" } }, - "nvfetcher": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixos" - ] - }, - "locked": { - "lastModified": 1687440270, - "narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=", - "owner": "berberman", - "repo": "nvfetcher", - "rev": "44196458acc2c28c32e456c50277d6148e71e708", - "type": "github" - }, - "original": { - "owner": "berberman", - "repo": "nvfetcher", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -333,23 +291,7 @@ "home": "home", "latest": "latest", "nixos": "nixos", - "nixos-hardware": "nixos-hardware", - "nvfetcher": "nvfetcher" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixos-hardware": "nixos-hardware" } }, "utils": { diff --git a/flake.nix b/flake.nix index d6cf85a8..f6594667 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,6 @@ agenix.inputs.darwin.follows = "darwin"; nixos-hardware.url = "github:nixos/nixos-hardware"; - - nvfetcher.url = "github:berberman/nvfetcher"; - nvfetcher.inputs.nixpkgs.follows = "nixos"; - nvfetcher.inputs.flake-compat.follows = "flake-compat"; }; outputs = { @@ -48,7 +44,6 @@ nixos-hardware, agenix, deploy, - nvfetcher, ... } @ inputs: digga.lib.mkFlake @@ -86,7 +81,6 @@ }); }) agenix.overlays.default - nvfetcher.overlays.default (import ./pkgs) ]; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 37a8e0e8..7fa801d5 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -4,6 +4,7 @@ channels: final: prev: { inherit (channels.latest) nixd + nvfetcher ; haskellPackages = From 5a05079e17e2b140bea683f1fe14dbfabc42757c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 21 Jul 2023 11:55:23 +0200 Subject: [PATCH 2/4] graphical: fix network-manager-applet service description --- modules/graphical/network-manager-applet.service.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/graphical/network-manager-applet.service.nix b/modules/graphical/network-manager-applet.service.nix index 4252c065..a3214651 100644 --- a/modules/graphical/network-manager-applet.service.nix +++ b/modules/graphical/network-manager-applet.service.nix @@ -1,6 +1,6 @@ pkgs: { Unit = { - Description = "Lightweight Wayland notification daemon"; + Description = "Network Manager applet"; BindsTo = ["sway-session.target"]; After = ["sway-session.target"]; # ConditionEnvironment requires systemd v247 to work correctly From 88404be55b0cc10774d17f54aa0507467f5522f2 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 21 Jul 2023 11:55:09 +0200 Subject: [PATCH 3/4] Bump nvfetcher --- pkgs/_sources/generated.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 4a9c9654..eaf5b466 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -3,17 +3,17 @@ { blesh-nvfetcher = { pname = "blesh-nvfetcher"; - version = "1afc616b890e487926897e5b3e3a33e0ad833cb3"; + version = "4089c4e1cb411121472180189953664b978d8972"; src = fetchFromGitHub { owner = "akinomyoga"; repo = "ble.sh"; - rev = "1afc616b890e487926897e5b3e3a33e0ad833cb3"; + rev = "4089c4e1cb411121472180189953664b978d8972"; fetchSubmodules = true; deepClone = false; leaveDotGit = true; - sha256 = "sha256-gDxx7nDleS2HWIJWc208gcTzuRUEu/JCyepTuOJDAGo="; + sha256 = "sha256-ZLkiBm3vsRe42crLffM9Z8F5yzKvNRV2/AqK9RkuU+8="; }; - date = "2023-06-29"; + date = "2023-07-18"; }; instant-nvim-nvfetcher = { pname = "instant-nvim-nvfetcher"; From 5acbaa3dd5e28124c719692786748e7115d2da37 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 21 Jul 2023 12:12:11 +0200 Subject: [PATCH 4/4] flake: update nixos + latest inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'latest': 'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12) → 'github:nixos/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20) • Updated input 'nixos': 'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13) → 'github:nixos/nixpkgs/08700de174bc6235043cb4263b643b721d936bdb' (2023-07-18) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3926e233..b33b1197 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ }, "latest": { "locked": { - "lastModified": 1689192006, - "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixos": { "locked": { - "lastModified": 1689209875, - "narHash": "sha256-8AVcBV1DiszaZzHFd5iLc8HSLfxRAuqcU0QdfBEF3Ag=", + "lastModified": 1689680872, + "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fcc147b1e9358a8386b2c4368bd928e1f63a7df2", + "rev": "08700de174bc6235043cb4263b643b721d936bdb", "type": "github" }, "original": {