From 5bc90ce7d03fd906c3be1944ed6f68a92458a01b Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Wed, 1 May 2024 20:12:59 -0700 Subject: [PATCH] Add `comin` Closes #28 --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 11 ++++++++--- lib/default.nix | 3 ++- nixos/comin/default.nix | 11 +++++++++++ nixos/default.nix | 1 + 5 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 nixos/comin/default.nix diff --git a/flake.lock b/flake.lock index 87dd464..51c6fde 100644 --- a/flake.lock +++ b/flake.lock @@ -166,6 +166,26 @@ "type": "github" } }, + "comin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714572285, + "narHash": "sha256-PMFWiQTcbu/HqCsL4zRPN7hscPRlNEk1hFawowQqHlU=", + "owner": "nlewo", + "repo": "comin", + "rev": "425c747ab2fca90db10dc498acfc94f5caaeba52", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "comin", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -366,6 +386,7 @@ "inputs": { "bitwarden-dmenu": "bitwarden-dmenu", "catppuccin-base16": "catppuccin-base16", + "comin": "comin", "home-manager": "home-manager", "mac-app-util": "mac-app-util", "nix-craftos-pc": "nix-craftos-pc", diff --git a/flake.nix b/flake.nix index dfd5abc..db6eb98 100644 --- a/flake.nix +++ b/flake.nix @@ -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; @@ -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 { diff --git a/lib/default.nix b/lib/default.nix index b93e23e..6652857 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -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}"; @@ -30,6 +30,7 @@ rec { (../hosts + "/${hostname}") home-manager.nixosModules.home-manager stylix.nixosModules.stylix + comin.nixosModules.comin ] ++ extraModules; }; diff --git a/nixos/comin/default.nix b/nixos/comin/default.nix new file mode 100644 index 0000000..d58d090 --- /dev/null +++ b/nixos/comin/default.nix @@ -0,0 +1,11 @@ +{ + services.comin = { + enable = true; + remotes = [ + { + name = "origin"; + url = "https://github.com/tomodachi94/dotfiles"; + } + ]; + }; +} diff --git a/nixos/default.nix b/nixos/default.nix index 13869ca..be5573a 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -2,6 +2,7 @@ imports = [ ./battery ./bluetooth + ./comin ./bootloader ./filesystems ./graphics