Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
takeokunn committed Nov 29, 2024
1 parent b574f6b commit 5ec8817
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 6 deletions.
4 changes: 3 additions & 1 deletion home-manager/advanced.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down
2 changes: 2 additions & 0 deletions home-manager/basic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };

Expand Down
4 changes: 4 additions & 0 deletions home-manager/overlay/advanced.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{ emacs-overlay }:
[
(import emacs-overlay)
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{ emacs-overlay }:
let
lnav-overlay = (
self: super: {
Expand All @@ -17,7 +16,4 @@ let
);

in
[
(import emacs-overlay)
lnav-overlay
]
[ lnav-overlay ]
2 changes: 2 additions & 0 deletions home-manager/programs/advanced.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand All @@ -25,6 +26,7 @@ in
[
emacs
gh
gh-dash
git
nix-index
nyxt
Expand Down
5 changes: 5 additions & 0 deletions home-manager/programs/gh-dash/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
programs.gh-dash = {
enable = true;
};
}
4 changes: 4 additions & 0 deletions home-manager/programs/gh/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
programs.gh = {
enable = true;
settings = {
git_protocol = "ssh";
prompt = "enabled";
};
};

programs.fish = {
Expand Down

0 comments on commit 5ec8817

Please sign in to comment.