From 3a359ff2daa5afb8ae1948eec12d39228e4193bb Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 15 Dec 2023 07:50:52 -0800 Subject: various fixes for errors reported by deadnix --- flake/hosts.nix | 2 +- flake/mba.nix | 20 -------------------- home/zsh.nix | 2 +- templates/go/flake.nix | 2 +- tools/dnsmasq-leases-html/default.nix | 2 +- tools/git-blame-stats/default.nix | 2 +- tools/git-broom/default.nix | 2 +- tools/perf-flamegraph-pid/default.nix | 2 +- tools/seqstat/default.nix | 2 +- tools/waybar-systemd-units/default.nix | 2 +- 10 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 flake/mba.nix diff --git a/flake/hosts.nix b/flake/hosts.nix index b0bc74c..9ec9d1b 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -1,6 +1,6 @@ { inputs, ... }: let - inherit (inputs) self nixpkgs darwin home-manager; + inherit (inputs) nixpkgs darwin home-manager; inherit (nixpkgs.lib) mkMerge; mkDarwinConfig = system: path: diff --git a/flake/mba.nix b/flake/mba.nix deleted file mode 100644 index 60ac876..0000000 --- a/flake/mba.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ nixpkgs, home-manager, darwin, inputs, ... }: - -let - default-system = "aarch64-darwin"; - - nixpkgsConfig = { - config = { - allowUnfree = true; - }; - }; -in -{ - system = darwin.lib.darwinSystem { - system = default-system; - modules = [ - ../hosts/mba - home-manager.darwinModules.home-manager - ]; - }; -} diff --git a/home/zsh.nix b/home/zsh.nix index 0cc20eb..80a1ab8 100644 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: { home.packages = with pkgs; [ zsh-completions ]; diff --git a/templates/go/flake.nix b/templates/go/flake.nix index 9038975..ce7fa0d 100644 --- a/templates/go/flake.nix +++ b/templates/go/flake.nix @@ -76,7 +76,7 @@ }; }) // { - overlay = final: prev: { + overlay = _: prev: { XXX = self.defaultPackage.${prev.system}; }; }; diff --git a/tools/dnsmasq-leases-html/default.nix b/tools/dnsmasq-leases-html/default.nix index 4848ea7..478c4cc 100644 --- a/tools/dnsmasq-leases-html/default.nix +++ b/tools/dnsmasq-leases-html/default.nix @@ -1,4 +1,4 @@ -{ self, lib, stdenvNoCC, pkgs }: +{ lib, stdenvNoCC, pkgs }: stdenvNoCC.mkDerivation rec { pname = "dnsmasq-leases-html"; diff --git a/tools/git-blame-stats/default.nix b/tools/git-blame-stats/default.nix index a18c086..aab7cfb 100644 --- a/tools/git-blame-stats/default.nix +++ b/tools/git-blame-stats/default.nix @@ -1,4 +1,4 @@ -{ self, lib, python3, stdenvNoCC, pkgs }: +{ lib, python3, stdenvNoCC, pkgs }: stdenvNoCC.mkDerivation rec { pname = "git-blame-stats"; diff --git a/tools/git-broom/default.nix b/tools/git-broom/default.nix index 7349731..fea555f 100644 --- a/tools/git-broom/default.nix +++ b/tools/git-broom/default.nix @@ -1,4 +1,4 @@ -{ self, lib, python3, stdenvNoCC, pkgs }: +{ lib, python3, stdenvNoCC, pkgs }: stdenvNoCC.mkDerivation rec { pname = "git-broom"; diff --git a/tools/perf-flamegraph-pid/default.nix b/tools/perf-flamegraph-pid/default.nix index 8fedba3..0cd0a1b 100644 --- a/tools/perf-flamegraph-pid/default.nix +++ b/tools/perf-flamegraph-pid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, pkgs, config }: +{ lib, stdenvNoCC, pkgs }: stdenvNoCC.mkDerivation rec { pname = "perf-flamegraph-pid"; diff --git a/tools/seqstat/default.nix b/tools/seqstat/default.nix index 274eba8..d7bd169 100644 --- a/tools/seqstat/default.nix +++ b/tools/seqstat/default.nix @@ -1,4 +1,4 @@ -{ self, lib, python3, stdenvNoCC, pkgs }: +{ lib, python3, stdenvNoCC, pkgs }: stdenvNoCC.mkDerivation rec { pname = "seqstat"; diff --git a/tools/waybar-systemd-units/default.nix b/tools/waybar-systemd-units/default.nix index 70cac84..086fba1 100644 --- a/tools/waybar-systemd-units/default.nix +++ b/tools/waybar-systemd-units/default.nix @@ -1,4 +1,4 @@ -{ self, lib, python3, stdenvNoCC, pkgs }: +{ lib, stdenvNoCC, pkgs }: stdenvNoCC.mkDerivation rec { pname = "waybar-systemd-units"; -- cgit 1.4.1