diff --git a/flake/pkgs.nix b/flake/pkgs.nix index 88f4ae4..77b68b7 100644 --- a/flake/pkgs.nix +++ b/flake/pkgs.nix @@ -1,4 +1,4 @@ -{ self, lib, inputs, ... }: +{ self, inputs, ... }: let config = { @@ -14,7 +14,7 @@ in inherit system config; overlays = overlays ++ [ - (final: prev: { + (_final: _prev: { unstable = import inputs.nixpkgs-unstable { inherit system config overlays; }; diff --git a/hosts/nixos/desktop.nix b/hosts/nixos/desktop.nix index 4e1e0e9..88800c9 100755 --- a/hosts/nixos/desktop.nix +++ b/hosts/nixos/desktop.nix @@ -1,4 +1,4 @@ -{ config, lib, inputs, ... }: +{ inputs, ... }: { imports = with inputs.hardware.nixosModules; [ diff --git a/modules/config.nix b/modules/config.nix index c2a15f2..e6d8074 100644 --- a/modules/config.nix +++ b/modules/config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.d; diff --git a/modules/programs/chrome/default.nix b/modules/programs/chrome/default.nix index 024f22f..f50760e 100644 --- a/modules/programs/chrome/default.nix +++ b/modules/programs/chrome/default.nix @@ -1,8 +1,4 @@ -{ config, pkgs, lib, ... }: - -let - cfg = config.d.programs.chrome; -in +{ lib, ... }: { options.d.programs.chrome = with lib; { diff --git a/modules/programs/direnv/default.nix b/modules/programs/direnv/default.nix index 20d268b..141d7bf 100644 --- a/modules/programs/direnv/default.nix +++ b/modules/programs/direnv/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.d.programs.direnv; diff --git a/modules/programs/docker/_darwin.nix b/modules/programs/docker/_darwin.nix index ad82bf1..5ccc284 100644 --- a/modules/programs/docker/_darwin.nix +++ b/modules/programs/docker/_darwin.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.d.programs.docker; diff --git a/modules/programs/docker/_nixos.nix b/modules/programs/docker/_nixos.nix index 9a7aebb..18287e9 100644 --- a/modules/programs/docker/_nixos.nix +++ b/modules/programs/docker/_nixos.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.d.programs.docker; diff --git a/modules/programs/helix/settings.nix b/modules/programs/helix/settings.nix index e748135..04963f1 100644 --- a/modules/programs/helix/settings.nix +++ b/modules/programs/helix/settings.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, theme, ... }: +{ config, lib, theme, ... }: let cfg = config.d.programs.helix; diff --git a/modules/programs/vscode/support/theme.nix b/modules/programs/vscode/support/theme.nix index b5c92bb..cb3e256 100644 --- a/modules/programs/vscode/support/theme.nix +++ b/modules/programs/vscode/support/theme.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, theme, ... }: +{ pkgs, theme, ... }: let themeMapping = { diff --git a/modules/system/activation.nix b/modules/system/activation.nix index b5e12e0..3c7906e 100644 --- a/modules/system/activation.nix +++ b/modules/system/activation.nix @@ -13,7 +13,7 @@ in config = { my.user = { lib, ... }: { home.activation = lib.mapAttrs - (name: script: lib.hm.dag.entryAfter [ "writeBoundary" ] script) + (_name: script: lib.hm.dag.entryAfter [ "writeBoundary" ] script) cfg; }; }; diff --git a/modules/system/homebrew/_darwin.nix b/modules/system/homebrew/_darwin.nix index ab6d130..4ec0bc1 100644 --- a/modules/system/homebrew/_darwin.nix +++ b/modules/system/homebrew/_darwin.nix @@ -1,5 +1,3 @@ -{ config, lib, ... }: - let prefix = "/opt/homebrew"; in diff --git a/modules/system/users/default.nix b/modules/system/users/default.nix index 0146aef..97b09ff 100644 --- a/modules/system/users/default.nix +++ b/modules/system/users/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, theme, ... }: +{ config, pkgs, lib, ... }: let cfg = config.d.user; diff --git a/system/darwin/default.nix b/system/darwin/default.nix index f37d602..449d372 100755 --- a/system/darwin/default.nix +++ b/system/darwin/default.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { imports = [ ../. diff --git a/system/default.nix b/system/default.nix index 219040a..97f6151 100755 --- a/system/default.nix +++ b/system/default.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { imports = [ ./pkgs.nix diff --git a/system/nixos/boot.nix b/system/nixos/boot.nix index 1eaa5d2..b1247b0 100755 --- a/system/nixos/boot.nix +++ b/system/nixos/boot.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { boot = { loader = { diff --git a/system/nixos/default.nix b/system/nixos/default.nix index 1bde727..1f802b4 100755 --- a/system/nixos/default.nix +++ b/system/nixos/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: { imports = [ diff --git a/system/nixos/gnome/settings/wallpaper.nix b/system/nixos/gnome/settings/wallpaper.nix index 88f85b8..05ec3ce 100644 --- a/system/nixos/gnome/settings/wallpaper.nix +++ b/system/nixos/gnome/settings/wallpaper.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - let wallpaper = "${../../assets/wallpaper.jpg}"; avatar = "${../../assets/avatar.png}"; diff --git a/system/nixos/network.nix b/system/nixos/network.nix index 5df4d48..74430b6 100755 --- a/system/nixos/network.nix +++ b/system/nixos/network.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { my.osUser.extraGroups = [ "networkmanager" ]; diff --git a/system/nixos/pkgs.nix b/system/nixos/pkgs.nix index 27feba8..14044d5 100755 --- a/system/nixos/pkgs.nix +++ b/system/nixos/pkgs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/system/nixos/sound.nix b/system/nixos/sound.nix index e659549..9a15cbe 100755 --- a/system/nixos/sound.nix +++ b/system/nixos/sound.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { sound.enable = true; xdg.portal.enable = true; diff --git a/system/nixos/tmpfs.nix b/system/nixos/tmpfs.nix index 4a87b35..f38ecca 100644 --- a/system/nixos/tmpfs.nix +++ b/system/nixos/tmpfs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; diff --git a/system/shells.nix b/system/shells.nix index 6c0bc7c..d6bc446 100755 --- a/system/shells.nix +++ b/system/shells.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs = { bash.enableCompletion = true;