diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index f61d307..b97ca5e 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -51,7 +51,7 @@ config = {allowUnfree = true;}; overlays = [ nixneovim.overlays.default - (final: prev: { + (_final: prev: { zjstatus = zjstatus.packages.${prev.system}.default; }) # emacs-overlay.overlays.default diff --git a/nix/home-manager/modules/environment.nix b/nix/home-manager/modules/environment.nix index 40397bd..324c61a 100644 --- a/nix/home-manager/modules/environment.nix +++ b/nix/home-manager/modules/environment.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - config, - ... -}: { +{...}: { home.sessionVariables = { EDITOR = "nvim"; PAGE = "page -q 90000 -z 90000"; diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index 546b593..340b587 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -1,10 +1,5 @@ -{ - pkgs, - lib, - config, - ... -}: let - inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; +{pkgs, ...}: let + inherit (pkgs.stdenv.hostPlatform) isLinux; systemSpecificPackages = if isLinux # include gping because of open bug diff --git a/nix/home-manager/modules/packages/emacs.nix b/nix/home-manager/modules/packages/emacs.nix index 837b935..9278454 100644 --- a/nix/home-manager/modules/packages/emacs.nix +++ b/nix/home-manager/modules/packages/emacs.nix @@ -1,10 +1,4 @@ -{ - config, - lib, - pkgs, - system, - ... -}: { +{...}: { home.file.".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el; home.file.".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el; home.file.".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el; diff --git a/nix/home-manager/modules/packages/git.nix b/nix/home-manager/modules/packages/git.nix index 68c9f61..ad305d8 100644 --- a/nix/home-manager/modules/packages/git.nix +++ b/nix/home-manager/modules/packages/git.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{pkgs, ...}: { programs.git = { enable = true; # Don't use difftastic on git-diff by default diff --git a/nix/home-manager/modules/packages/mise.nix b/nix/home-manager/modules/packages/mise.nix index e066811..b9d32e0 100644 --- a/nix/home-manager/modules/packages/mise.nix +++ b/nix/home-manager/modules/packages/mise.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { programs.mise = { enable = true; enableZshIntegration = true; diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix index 7a9dbf5..eb1547d 100644 --- a/nix/home-manager/modules/packages/neovim.nix +++ b/nix/home-manager/modules/packages/neovim.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{pkgs, ...}: { programs.nixneovim = { enable = true; defaultEditor = true; diff --git a/nix/home-manager/modules/packages/ssh.nix b/nix/home-manager/modules/packages/ssh.nix index 1b7a815..8eecda9 100644 --- a/nix/home-manager/modules/packages/ssh.nix +++ b/nix/home-manager/modules/packages/ssh.nix @@ -1,10 +1,9 @@ { config, - lib, pkgs, ... }: let - inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; + inherit (pkgs.stdenv.hostPlatform) isDarwin; _1pass_socket = if isDarwin then "${config.home.homeDirectory}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" diff --git a/nix/home-manager/modules/packages/starship.nix b/nix/home-manager/modules/packages/starship.nix index 7d875ff..76dfab7 100644 --- a/nix/home-manager/modules/packages/starship.nix +++ b/nix/home-manager/modules/packages/starship.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { programs.starship = { enable = true; enableZshIntegration = true;