Skip to content

Commit

Permalink
Add comin
Browse files Browse the repository at this point in the history
Closes #28
  • Loading branch information
tomodachi94 committed May 2, 2024
1 parent c1a8e92 commit 5bc90ce
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 4 deletions.
21 changes: 21 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,16 @@
url = "github:pltanton/bitwarden-dmenu";
inputs.nixpkgs.follows = "nixpkgs";
};

comin = {
url = "github:nlewo/comin";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs = { nixpkgs, nixos-hardware, home-manager, tomodachi94, mac-app-util, stylix, catppuccin-base16, zsh-craftos-select, bitwarden-dmenu, ... }:
outputs = { nixpkgs, nixos-hardware, home-manager, tomodachi94, mac-app-util, stylix, catppuccin-base16, zsh-craftos-select, bitwarden-dmenu, comin, ... }:
let
tomolib = import ./lib { inherit nixpkgs home-manager stylix; };
tomolib = import ./lib { inherit nixpkgs home-manager stylix comin; };

vars = import ./lib/vars.nix;

Expand All @@ -66,7 +71,7 @@
homeDarwinInputs = homeCommonInputs // { inherit mac-app-util; };

systemCommonInputs = commonInputs // { };
systemLinuxInputs = systemCommonInputs // { nixos-hardware = nixos-hardware.nixosModules; homeInputs = homeCommonInputs; inherit catppuccin-base16; };
systemLinuxInputs = systemCommonInputs // { nixos-hardware = nixos-hardware.nixosModules; homeInputs = homeCommonInputs; inherit catppuccin-base16 comin; };

in
rec {
Expand Down
3 changes: 2 additions & 1 deletion lib/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ nixpkgs, home-manager, stylix }:
{ nixpkgs, home-manager, stylix, comin }:
rec {
mkHMImports = systemType: [ ../home/common (../. + "home/${systemType}") ];
mkNixpkgs = { systemType, systemArch }: nixpkgs.legacyPackages."${systemArch}-${systemType}";
Expand Down Expand Up @@ -30,6 +30,7 @@ rec {
(../hosts + "/${hostname}")
home-manager.nixosModules.home-manager
stylix.nixosModules.stylix
comin.nixosModules.comin
] ++ extraModules;
};

Expand Down
11 changes: 11 additions & 0 deletions nixos/comin/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
services.comin = {
enable = true;
remotes = [
{
name = "origin";
url = "https://github.com/tomodachi94/dotfiles";
}
];
};
}
1 change: 1 addition & 0 deletions nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
imports = [
./battery
./bluetooth
./comin
./bootloader
./filesystems
./graphics
Expand Down

0 comments on commit 5bc90ce

Please sign in to comment.