diff --git a/hosts/manwe/default.nix b/hosts/manwe/default.nix index 745839f..9bbc29b 100644 --- a/hosts/manwe/default.nix +++ b/hosts/manwe/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { fileSystems."/home/chris/games" = { device = "/dev/disk/by-label/games"; diff --git a/hosts/orome/default.nix b/hosts/orome/default.nix index 480e796..be2ce0c 100644 --- a/hosts/orome/default.nix +++ b/hosts/orome/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { modules = { system.audio.enable = true; diff --git a/hosts/ulmo/default.nix b/hosts/ulmo/default.nix index 6a3083f..ea76e2a 100644 --- a/hosts/ulmo/default.nix +++ b/hosts/ulmo/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { imports = [ ./hardware.nix ]; diff --git a/lib/windows.nix b/lib/windows.nix index f1a8cfe..45faace 100644 --- a/lib/windows.nix +++ b/lib/windows.nix @@ -1,6 +1,4 @@ -{ lib, self, ... }: -let -in +{ ... }: { mkWinApp = { }: { diff --git a/modules/home/desktop/applications/studio.nix b/modules/home/desktop/applications/studio.nix index e8f77ee..7bd0f8b 100644 --- a/modules/home/desktop/applications/studio.nix +++ b/modules/home/desktop/applications/studio.nix @@ -1,7 +1,7 @@ -{ config, lib, pkgs, user, ... }: +{ config, lib, user, ... }: let inherit (lib) mkIf; - inherit (lib.my) mkWinApp; + # inherit (lib.my) mkWinApp; cfg = config.modules.${user}.desktop.applications.studio; in diff --git a/modules/home/desktop/editors/nvim.nix b/modules/home/desktop/editors/nvim.nix index dd33342..f335565 100644 --- a/modules/home/desktop/editors/nvim.nix +++ b/modules/home/desktop/editors/nvim.nix @@ -1,6 +1,5 @@ -{ inputs, config, options, lib, pkgs, user, ... }: +{ config, lib, user, ... }: let - inherit (lib.meta) getExe; inherit (lib.modules) mkIf; cfg = config.modules.${user}.desktop.editors.nvim; diff --git a/modules/home/desktop/editors/vscodium.nix b/modules/home/desktop/editors/vscodium.nix index 3bbc0c2..93524bc 100644 --- a/modules/home/desktop/editors/vscodium.nix +++ b/modules/home/desktop/editors/vscodium.nix @@ -1,6 +1,5 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, ... }: let - inherit (lib.meta) getExe; inherit (lib.modules) mkIf; inherit (lib.attrsets) attrValues; diff --git a/modules/home/desktop/editors/zed.nix b/modules/home/desktop/editors/zed.nix index a27d932..685ec9f 100644 --- a/modules/home/desktop/editors/zed.nix +++ b/modules/home/desktop/editors/zed.nix @@ -1,6 +1,5 @@ -{ config, options, lib, pkgs, user, ... }: let +{ config, lib, pkgs, user, ... }: let inherit (lib.modules) mkIf; - inherit (lib.attrsets) attrValues; cfg = config.modules.${user}.desktop.editors.zed; in { diff --git a/modules/home/develop/default.nix b/modules/home/develop/default.nix index ddc886a..ecb8664 100644 --- a/modules/home/develop/default.nix +++ b/modules/home/develop/default.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, user, ... }: let inherit (lib.modules) mkIf; in diff --git a/modules/home/shell/toolset/eza.nix b/modules/home/shell/toolset/eza.nix index e61f964..3e2da9b 100644 --- a/modules/home/shell/toolset/eza.nix +++ b/modules/home/shell/toolset/eza.nix @@ -1,7 +1,6 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, ... }: let inherit (lib.modules) mkIf; - inherit (lib.strings) concatStringsSep; inherit (lib.options) mkEnableOption; cfg = config.modules.${user}.shell.toolset.eza; diff --git a/modules/home/shell/toolset/fzf.nix b/modules/home/shell/toolset/fzf.nix index 501dea1..3e99666 100644 --- a/modules/home/shell/toolset/fzf.nix +++ b/modules/home/shell/toolset/fzf.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, ... }: let inherit (lib) mkIf mkEnableOption; diff --git a/modules/home/shell/toolset/git.nix b/modules/home/shell/toolset/git.nix index 6134bd8..3b7ad25 100644 --- a/modules/home/shell/toolset/git.nix +++ b/modules/home/shell/toolset/git.nix @@ -1,6 +1,5 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, ... }: let - inherit (builtins) readFile; inherit (lib.attrsets) attrValues; inherit (lib.modules) mkIf; in diff --git a/modules/home/shell/toolset/gnupg.nix b/modules/home/shell/toolset/gnupg.nix index accab12..33c4765 100644 --- a/modules/home/shell/toolset/gnupg.nix +++ b/modules/home/shell/toolset/gnupg.nix @@ -1,6 +1,5 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, ... }: let - inherit (builtins) getEnv; inherit (lib.modules) mkIf; cfg = config.modules.${user}.shell.toolset.gnupg; diff --git a/modules/home/shell/toolset/tmux.nix b/modules/home/shell/toolset/tmux.nix index 3ccf67a..137b600 100644 --- a/modules/home/shell/toolset/tmux.nix +++ b/modules/home/shell/toolset/tmux.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, ... }: let inherit (lib.modules) mkIf; in diff --git a/modules/system/authentication/himmelblau.nix b/modules/system/authentication/himmelblau.nix index caaf86a..7817335 100644 --- a/modules/system/authentication/himmelblau.nix +++ b/modules/system/authentication/himmelblau.nix @@ -1,4 +1,4 @@ -{ inputs, lib, pkgs, config, ... }: let +{ inputs, lib, config, ... }: let inherit (lib) mkEnableOption mkIf; cfg = config.modules.authentication.himmelblau; diff --git a/modules/system/services/games/minecraft.nix b/modules/system/services/games/minecraft.nix index d92441a..c414881 100644 --- a/modules/system/services/games/minecraft.nix +++ b/modules/system/services/games/minecraft.nix @@ -1,4 +1,4 @@ -{ inputs, config, options, lib, pkgs, ... }: +{ inputs, config, lib, pkgs, ... }: let inherit (lib.modules) mkIf; in @@ -132,10 +132,8 @@ in }; files = let - inherit (builtins) readFile listToAttrs attrNames readDir mapAttrs; - inherit (lib.attrsets) nameValuePair; + inherit (builtins) readDir; inherit (lib) concatMapAttrs; - inherit (lib.my) mapFilterAttrs; readDirRec = src: dir: fn: concatMapAttrs (name: type: if type == "directory" diff --git a/modules/system/shell/default.nix b/modules/system/shell/default.nix index c46c002..c1a3a90 100644 --- a/modules/system/shell/default.nix +++ b/modules/system/shell/default.nix @@ -1,6 +1,5 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, ... }: let - inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf; cfg = config.modules.shell; diff --git a/modules/system/shell/zsh.nix b/modules/system/shell/zsh.nix index d459cff..8884331 100644 --- a/modules/system/shell/zsh.nix +++ b/modules/system/shell/zsh.nix @@ -1,6 +1,5 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, ... }: let - inherit (lib.attrsets) attrValues; inherit (lib.modules) mkIf; cfg = config.modules.shell.zsh;