diff --git a/home-manager/advanced.nix b/home-manager/advanced.nix index 38917bd..097b05f 100644 --- a/home-manager/advanced.nix +++ b/home-manager/advanced.nix @@ -9,10 +9,12 @@ let sources = pkgs.callPackage ../_sources/generated.nix { }; # packages + basicOverlay = import ./overlay/basic.nix; + advancedOverlay = import ./overlay/advanced.nix { inherit emacs-overlay; }; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; - overlays = import ./overlay { inherit emacs-overlay; }; + overlays = basicOverlay ++ advancedOverlay; }; basicPkgs = import ./packages/basic.nix { inherit pkgs; }; advancedPkgs = import ./packages/advanced.nix { inherit pkgs; }; diff --git a/home-manager/basic.nix b/home-manager/basic.nix index 0dcabee..e0f1710 100644 --- a/home-manager/basic.nix +++ b/home-manager/basic.nix @@ -4,9 +4,11 @@ let sources = pkgs.callPackage ../_sources/generated.nix { }; # packages + basicOverlay = import ./overlay/basic.nix; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; + overlays = basicOverlay; }; basicPkgs = import ./packages/basic.nix { inherit pkgs; }; diff --git a/home-manager/overlay/advanced.nix b/home-manager/overlay/advanced.nix new file mode 100644 index 0000000..02b410f --- /dev/null +++ b/home-manager/overlay/advanced.nix @@ -0,0 +1,4 @@ +{ emacs-overlay }: +[ + (import emacs-overlay) +] diff --git a/home-manager/overlay/default.nix b/home-manager/overlay/basic.nix similarity index 81% rename from home-manager/overlay/default.nix rename to home-manager/overlay/basic.nix index dc8846f..949ddca 100644 --- a/home-manager/overlay/default.nix +++ b/home-manager/overlay/basic.nix @@ -1,4 +1,3 @@ -{ emacs-overlay }: let lnav-overlay = ( self: super: { @@ -17,7 +16,4 @@ let ); in -[ - (import emacs-overlay) - lnav-overlay -] +[ lnav-overlay ] diff --git a/home-manager/programs/advanced.nix b/home-manager/programs/advanced.nix index 3d6d5da..d8a6e76 100644 --- a/home-manager/programs/advanced.nix +++ b/home-manager/programs/advanced.nix @@ -7,6 +7,7 @@ let emacs = import ./emacs { inherit pkgs org-babel sources; }; gh = import ./gh; + gh-dash = import ./gh-dash; git = import ./git { inherit pkgs; }; nix-index = import ./nix-index; nyxt = import ./nyxt { inherit pkgs; }; @@ -25,6 +26,7 @@ in [ emacs gh + gh-dash git nix-index nyxt diff --git a/home-manager/programs/gh-dash/default.nix b/home-manager/programs/gh-dash/default.nix new file mode 100644 index 0000000..e19c243 --- /dev/null +++ b/home-manager/programs/gh-dash/default.nix @@ -0,0 +1,5 @@ +{ + programs.gh-dash = { + enable = true; + }; +} diff --git a/home-manager/programs/gh/default.nix b/home-manager/programs/gh/default.nix index d7e8c06..57aef0e 100644 --- a/home-manager/programs/gh/default.nix +++ b/home-manager/programs/gh/default.nix @@ -1,6 +1,10 @@ { programs.gh = { enable = true; + settings = { + git_protocol = "ssh"; + prompt = "enabled"; + }; }; programs.fish = {