From 7e52b0d586cc743312918121a9884c54453d037a Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 31 Jul 2022 20:48:49 +0200 Subject: [PATCH] sail: home-manager setup --- flake.nix | 1 + home/hosts/sail.nix | 32 ++++++++++++++++++++++++++++++++ system/flakes/sail.nix | 17 ++++++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 home/hosts/sail.nix diff --git a/flake.nix b/flake.nix index 108a854..864a635 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,7 @@ config-sail = import ./system/flakes/sail.nix { inherit (inputs) nixpkgs; + inherit (inputs) home-manager; inherit (inputs) arion; }; in diff --git a/home/hosts/sail.nix b/home/hosts/sail.nix new file mode 100644 index 0000000..eb43616 --- /dev/null +++ b/home/hosts/sail.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: + +{ + imports = [ + ../programs/nvim + + ../programs/git.nix + + ../programs/bat.nix + + ../programs/fzf.nix + + ../programs/jq.nix + ]; + + home = { + stateVersion = "22.11"; + + packages = with pkgs; [ + curlFull + lnav + mtr + parallel + q + ripgrep + ]; + }; + + programs = { + zoxide.enable = true; + }; +} diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix index 5e9ec2d..9703a99 100644 --- a/system/flakes/sail.nix +++ b/system/flakes/sail.nix @@ -1,11 +1,17 @@ -{ nixpkgs, arion, ... }: +{ nixpkgs, home-manager, arion, ... }: let overlay-arion = arion.overlay; + overlay-neovim = inputs.neovim-nightly-overlay.overlay; + overlay-zig = _: prev: { zigpkgs = inputs.zig-overlay.packages.${prev.system}; }; + overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-arion + overlay-neovim + overlay-zig + overlay-nifoc ]; config = { @@ -26,6 +32,15 @@ in arion.nixosModules.arion ../hosts/sail.nix + + home-manager.darwinModules.home-manager + { + nixpkgs = nixpkgsConfig; + nix.nixPath = { nixpkgs = "${nixpkgs}"; }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.daniel = import ../../home/hosts/sail.nix; + } ]; }; }