diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/flake/hosts.nix | 11 | ||||
| -rw-r--r-- | nix/flake/packages.nix | 3 | ||||
| -rw-r--r-- | nix/profiles/home-manager/personal.nix | 37 | ||||
| -rw-r--r-- | nix/profiles/home-manager/shell.nix | 49 | ||||
| -rw-r--r-- | nix/profiles/home-manager/work.nix | 46 |
5 files changed, 66 insertions, 80 deletions
diff --git a/nix/flake/hosts.nix b/nix/flake/hosts.nix index 8e9316a..c2ba71b 100644 --- a/nix/flake/hosts.nix +++ b/nix/flake/hosts.nix @@ -7,7 +7,16 @@ let darwin.lib.darwinSystem { inherit system; modules = [ - home-manager.darwinModule + home-manager.darwinModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit self; + }; + }; + } ../../hosts/common/darwin/homebrew.nix ../../hosts/common/darwin/macos.nix path diff --git a/nix/flake/packages.nix b/nix/flake/packages.nix index 39bb874..1d310d3 100644 --- a/nix/flake/packages.nix +++ b/nix/flake/packages.nix @@ -11,6 +11,9 @@ packages = { seqstat = pkgs.callPackage "${self}/packages/seqstat" { }; + git-blame-stats = pkgs.callPackage "${self}/packages/git-blame-stats" { }; + git-broom = pkgs.callPackage "${self}/packages/git-broom" { }; + ipconverter = pkgs.callPackage "${self}/packages/ipconverter" { }; }; }; } diff --git a/nix/profiles/home-manager/personal.nix b/nix/profiles/home-manager/personal.nix index 165edcf..dd4c9f9 100644 --- a/nix/profiles/home-manager/personal.nix +++ b/nix/profiles/home-manager/personal.nix @@ -1,4 +1,4 @@ -{ pkgs, self, ... }: { +{ ... }: { home.stateVersion = "23.05"; @@ -6,6 +6,7 @@ ./dev.nix ./firefox.nix ./git.nix + ./shell.nix ./ssh.nix ./zsh.nix ]; @@ -13,38 +14,4 @@ programs.git = { userEmail = "franck@fcuny.net"; }; - - home.packages = with pkgs; [ - direnv - jless - jq - nixd - nix-direnv - nixfmt - nixpkgs-fmt - ripgrep - rnix-lsp - tree - self.packages.${pkgs.system}.seqstat - ]; - - home.sessionVariables = { - EDITOR = "emacsclient -a="; - VISUAL = "emacsclient -a="; - LESS = "-FRSXM"; - LESSCHARSET = "utf-8"; - PAGER = "less"; - }; - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - config = { - global.disable_stdin = true; - global.strict_env = true; - }; - }; - }; } diff --git a/nix/profiles/home-manager/shell.nix b/nix/profiles/home-manager/shell.nix new file mode 100644 index 0000000..3869d9b --- /dev/null +++ b/nix/profiles/home-manager/shell.nix @@ -0,0 +1,49 @@ +{ pkgs, self, ... }: { + + home.packages = with pkgs; [ + # shell utils + direnv + ripgrep + tree + wget + + # data manipulation + jless + jq + yq + + # nix related + nil + nix-direnv + nixd + nixfmt + nixpkgs-fmt + rnix-lsp + + # my own stuff + self.packages.${pkgs.system}.git-blame-stats + self.packages.${pkgs.system}.git-broom + self.packages.${pkgs.system}.ipconverter + self.packages.${pkgs.system}.seqstat + ]; + + home.sessionVariables = { + EDITOR = "emacsclient -a="; + VISUAL = "emacsclient -a="; + LESS = "-FRSXM"; + LESSCHARSET = "utf-8"; + PAGER = "less"; + }; + + programs = { + direnv = { + enable = true; + nix-direnv.enable = true; + enableZshIntegration = true; + config = { + global.disable_stdin = true; + global.strict_env = true; + }; + }; + }; +} diff --git a/nix/profiles/home-manager/work.nix b/nix/profiles/home-manager/work.nix index 4933865..a9800cd 100644 --- a/nix/profiles/home-manager/work.nix +++ b/nix/profiles/home-manager/work.nix @@ -1,4 +1,4 @@ -{ self, pkgs, ... }: { +{ ... }: { home.stateVersion = "23.05"; @@ -6,6 +6,7 @@ ./dev.nix ./firefox.nix ./git.nix + ./shell.nix ./ssh.nix ./zsh.nix ]; @@ -13,47 +14,4 @@ programs.git = { userEmail = "fcuny@roblox.com"; }; - - home.packages = with pkgs; [ - # general shell utils - direnv - ripgrep - tree - wget - - # data manipulation - jless - jq - yq - - # nix related - nil - nix-direnv - nixd - nixfmt - nixpkgs-fmt - rnix-lsp - - self.packages.${pkgs.system}.seqstat - ]; - - home.sessionVariables = { - EDITOR = "emacsclient -a="; - VISUAL = "emacsclient -a="; - LESS = "-FRSXM"; - LESSCHARSET = "utf-8"; - PAGER = "less"; - }; - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - config = { - global.disable_stdin = true; - global.strict_env = true; - }; - }; - }; } |