From dac02d90fa3fbdf0d9e755c11da90fcc6c606523 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 10 Jan 2024 15:35:19 +0300 Subject: [PATCH] Remove dead code --- flake.nix | 12 ++++++------ lib/configuration.nix | 2 +- lib/default.nix | 4 ++-- modules/helix.nix | 2 +- modules/nix.nix | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index e7a76c3..c2bf94e 100644 --- a/flake.nix +++ b/flake.nix @@ -107,13 +107,13 @@ else users ++ [ "root" ]; - graphical = builtins.attrNames (lib.filterAttrs (name: value: builtins.elem "graphical" (value.extraGroups or [])) hostDefault.users.users); + graphical = builtins.attrNames (lib.filterAttrs (_: value: builtins.elem "graphical" (value.extraGroups or [])) hostDefault.users.users); }; system = hostDefault.nixpkgs.hostPlatform; lib = nixpkgs.lib; - ulib = import ./lib lib users; + ulib = import ./lib users; pkgs = import nixpkgs { inherit system; }; upkgs = let @@ -152,7 +152,7 @@ defaultConfiguration = { age.identityPaths = builtins.map (user: "/home/${user}/.ssh/id") users.all; - home-manager.users = lib.genAttrs users.all (user: {}); + home-manager.users = lib.genAttrs users.all (_: {}); home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -172,13 +172,13 @@ site.nixosModules.default defaultConfiguration - ] ++ (builtins.attrValues (builtins.mapAttrs (name: type: ./modules/${name}) (builtins.readDir ./modules))) - ++ (builtins.attrValues (builtins.mapAttrs (name: type: ./hosts/${host}/${name}) (builtins.readDir ./hosts/${host}))); + ] ++ (builtins.attrValues (builtins.mapAttrs (name: _: ./modules/${name}) (builtins.readDir ./modules))) + ++ (builtins.attrValues (builtins.mapAttrs (name: _: ./hosts/${host}/${name}) (builtins.readDir ./hosts/${host}))); }; hosts = (builtins.attrNames (nixpkgs.lib.filterAttrs - (name: value: value == "directory") + (_: value: value == "directory") (builtins.readDir ./hosts))); in { nixosConfigurations = nixpkgs.lib.genAttrs hosts importConfiguration; diff --git a/lib/configuration.nix b/lib/configuration.nix index 88872ea..bff22f7 100644 --- a/lib/configuration.nix +++ b/lib/configuration.nix @@ -1,4 +1,4 @@ -lib: users: let +users: let userHomeConfiguration = users: configuration: { home-manager.users = builtins.foldl' (final: user: final // { ${user} = configuration; diff --git a/lib/default.nix b/lib/default.nix index 96752b6..833e868 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,5 +1,5 @@ -lib: users: let - configuration = import ./configuration.nix lib users; +users: let + configuration = import ./configuration.nix users; merge = import ./merge.nix; values = import ./values.nix; in configuration // merge // values diff --git a/modules/helix.nix b/modules/helix.nix index 9c902ce..162e75e 100644 --- a/modules/helix.nix +++ b/modules/helix.nix @@ -125,7 +125,7 @@ render.tab = "all"; }; - settings.keys = lib.genAttrs [ "normal" "select" ] (name: { + settings.keys = lib.genAttrs [ "normal" "select" ] (_: { D = "extend_to_line_end"; }); }; diff --git a/modules/nix.nix b/modules/nix.nix index 12b372f..7a83ec6 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -16,9 +16,9 @@ systemConfiguration { package = upkgs.nixSuper; registry = (lib.filterAttrs - (name: value: value != {}) + (_: value: value != {}) (builtins.mapAttrs - (name: value: lib.optionalAttrs (value ? sourceInfo) { + (_: value: lib.optionalAttrs (value ? sourceInfo) { flake = value; }) inputs)) // { default.flake = inputs.nixpkgs; };