From 89d92d10f3a6b5ed90957e19e5e3c617e4d59650 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Thu, 5 Sep 2024 10:44:38 +0100 Subject: [PATCH] remove unneeded inputs to allow deadnix --- home/default.nix | 1 - home/programs/alacritty/default.nix | 7 +------ home/programs/default.nix | 7 +------ home/programs/direnv/default.nix | 7 +------ home/programs/firefox/default.nix | 7 +------ home/programs/fish/default.nix | 7 +------ home/programs/git/default.nix | 7 +------ home/programs/hypr/default.nix | 7 +------ home/programs/nvim/default.nix | 1 - home/programs/rbw/default.nix | 7 +------ home/programs/rofi/default.nix | 7 +------ home/programs/tmux/default.nix | 7 +------ home/programs/waybar/default.nix | 7 +------ home/services/default.nix | 7 +------ home/services/mako/default.nix | 7 +------ hosts/artemis/configuration.nix | 6 +----- hosts/artemis/default.nix | 2 +- hosts/artemis/networking.nix | 2 +- hosts/default.nix | 1 - hosts/hermes/configuration.nix | 7 +------ hosts/hermes/default.nix | 2 +- hosts/hermes/hardware-configuration.nix | 1 - hosts/hermes/media.nix | 1 - hosts/hermes/networking.nix | 7 +------ modules/hm.nix | 2 +- modules/pinentry-fix.nix | 7 +------ 26 files changed, 21 insertions(+), 110 deletions(-) diff --git a/home/default.nix b/home/default.nix index 794f8ce..d7e7aa2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,6 +1,5 @@ { inputs, - config, pkgs, ... }: { diff --git a/home/programs/alacritty/default.nix b/home/programs/alacritty/default.nix index 2c511e5..0c36cf3 100644 --- a/home/programs/alacritty/default.nix +++ b/home/programs/alacritty/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{...}: { programs.alacritty = { enable = true; settings = { diff --git a/home/programs/default.nix b/home/programs/default.nix index e2cceb3..dc7a3f4 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,9 +1,4 @@ -{ - inputs, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./hypr ./waybar diff --git a/home/programs/direnv/default.nix b/home/programs/direnv/default.nix index 121d096..6409914 100644 --- a/home/programs/direnv/default.nix +++ b/home/programs/direnv/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{config, ...}: { programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix index 660c2e7..149322a 100644 --- a/home/programs/firefox/default.nix +++ b/home/programs/firefox/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{inputs, ...}: { programs.firefox = { enable = true; policies = { diff --git a/home/programs/fish/default.nix b/home/programs/fish/default.nix index 27d69f4..e6244c1 100644 --- a/home/programs/fish/default.nix +++ b/home/programs/fish/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { programs.fish = { enable = true; diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix index 544b818..c10a2b2 100644 --- a/home/programs/git/default.nix +++ b/home/programs/git/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{...}: { programs.git = { enable = true; diff --git a/home/programs/hypr/default.nix b/home/programs/hypr/default.nix index 8476073..1d2114d 100644 --- a/home/programs/hypr/default.nix +++ b/home/programs/hypr/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{...}: { services = { blueman-applet.enable = true; network-manager-applet.enable = true; diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 86139ef..000a085 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -1,6 +1,5 @@ { config, - inputs, pkgs, lib, ... diff --git a/home/programs/rbw/default.nix b/home/programs/rbw/default.nix index bd91384..a95f30a 100644 --- a/home/programs/rbw/default.nix +++ b/home/programs/rbw/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { programs.rbw = { enable = true; settings = { diff --git a/home/programs/rofi/default.nix b/home/programs/rofi/default.nix index 81c3f4e..71b92f8 100644 --- a/home/programs/rofi/default.nix +++ b/home/programs/rofi/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { programs.rofi = { enable = true; package = pkgs.rofi-wayland; diff --git a/home/programs/tmux/default.nix b/home/programs/tmux/default.nix index c863ad8..f39d845 100644 --- a/home/programs/tmux/default.nix +++ b/home/programs/tmux/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { programs.tmux = { enable = true; shortcut = "x"; diff --git a/home/programs/waybar/default.nix b/home/programs/waybar/default.nix index cb166d2..e5c5bfe 100644 --- a/home/programs/waybar/default.nix +++ b/home/programs/waybar/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { programs.waybar = { enable = true; package = pkgs.waybar.override { diff --git a/home/services/default.nix b/home/services/default.nix index 32b8a3b..6e0f8aa 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -1,9 +1,4 @@ -{ - inputs, - config, - pkgs, - ... -}: { +{...}: { imports = [./mako]; services = { network-manager-applet.enable = true; diff --git a/home/services/mako/default.nix b/home/services/mako/default.nix index 14b9ca9..cb6b0e2 100644 --- a/home/services/mako/default.nix +++ b/home/services/mako/default.nix @@ -1,9 +1,4 @@ -{ - config, - inputs, - pkgs, - ... -}: { +{...}: { services.mako = { enable = true; defaultTimeout = 7000; diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index 7a29ee6..2021cd0 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -1,12 +1,8 @@ { config, pkgs, - inputs, - self, ... -}: let - #inherit (self.nixosModules) keys; -in { +}: { nixpkgs.hostPlatform = "x86_64-linux"; c.services.mesh = { enable = true; diff --git a/hosts/artemis/default.nix b/hosts/artemis/default.nix index ec8af0e..250394f 100644 --- a/hosts/artemis/default.nix +++ b/hosts/artemis/default.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +{...}: { imports = [ ./hardware-configuration.nix ./configuration.nix diff --git a/hosts/artemis/networking.nix b/hosts/artemis/networking.nix index 351432d..8e645f7 100644 --- a/hosts/artemis/networking.nix +++ b/hosts/artemis/networking.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { networking = { hostName = "artemis"; networkmanager.enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index 9fcbfe4..1befb70 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,7 +1,6 @@ { inputs, mods, - self, ... }: let sharedModules = [inputs.home-manager.nixosModules.home-manager inputs.stylix.nixosModules.stylix inputs.agenix.nixosModules.default] ++ mods.sharedModules; diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix index 44f7bdb..d9e1e6f 100644 --- a/hosts/hermes/configuration.nix +++ b/hosts/hermes/configuration.nix @@ -1,13 +1,8 @@ { config, - lib, pkgs, - inputs, - self, ... -}: let - #inherit (self.nixosModules) keys; -in { +}: { nixpkgs.hostPlatform = "x86_64-linux"; c.services.mesh = { enable = true; diff --git a/hosts/hermes/default.nix b/hosts/hermes/default.nix index 94aef04..1c45a90 100644 --- a/hosts/hermes/default.nix +++ b/hosts/hermes/default.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +{...}: { imports = [ ./hardware-configuration.nix ./configuration.nix diff --git a/hosts/hermes/hardware-configuration.nix b/hosts/hermes/hardware-configuration.nix index 18edee1..07b9560 100644 --- a/hosts/hermes/hardware-configuration.nix +++ b/hosts/hermes/hardware-configuration.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index 8280489..694a787 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -1,7 +1,6 @@ { pkgs, config, - lib, ... }: let mediaDir = "/var/lib/media"; diff --git a/hosts/hermes/networking.nix b/hosts/hermes/networking.nix index 7ddb42b..78004e7 100644 --- a/hosts/hermes/networking.nix +++ b/hosts/hermes/networking.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{config, ...}: { networking = { hostName = "hermes"; enableIPv6 = false; diff --git a/modules/hm.nix b/modules/hm.nix index ea61073..591a582 100644 --- a/modules/hm.nix +++ b/modules/hm.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } diff --git a/modules/pinentry-fix.nix b/modules/pinentry-fix.nix index ff4fe57..167a03f 100644 --- a/modules/pinentry-fix.nix +++ b/modules/pinentry-fix.nix @@ -1,8 +1,3 @@ -{ - config, - pkgs, - lib, - ... -}: { +{pkgs, ...}: { services.dbus.packages = [pkgs.gcr]; }