diff --git a/.gitignore b/.gitignore index ce01359..25470fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +result vim/bundle/ tags* vim/view diff --git a/flake.lock b/flake.lock index dd02718..9534ee3 100644 --- a/flake.lock +++ b/flake.lock @@ -43,16 +43,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672441599, - "narHash": "sha256-5s/aa/0cpw6MNXQSiUedDnnMVleL/WThL8Q8jYNcc+g=", + "lastModified": 1672500394, + "narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5a734cdeadc39d253018ad0f83fb77eac7ab08", + "rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", + "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 6806bb5..1ad894a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,19 @@ { - description = "Tyrel Nix"; + description = "Tyrel Nix"; -inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - # nix will normally use the nixpkgs defined in home-managers inputs, we only want one copy of nixpkgs though - darwin.url = "github:lnl7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; -}; - -outputs = { self, nixpkgs, home-manager, darwin }: { - darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem { - system = "x86_64-darwin"; - modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ]; # will be important later + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + darwin.url = "github:lnl7/nix-darwin"; + darwin.inputs.nixpkgs.follows = "nixpkgs"; + }; + + outputs = { self, nixpkgs, home-manager, darwin }: { + darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem { + system = "x86_64-darwin"; + modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ]; + }; }; -}; } diff --git a/hosts/ts-tl-mbp/default.nix b/hosts/ts-tl-mbp/default.nix index 874e6f2..3ace239 100644 --- a/hosts/ts-tl-mbp/default.nix +++ b/hosts/ts-tl-mbp/default.nix @@ -23,15 +23,16 @@ # ''; #}; }; - #homebrew = { - # enable = true; - # autoUpdate = true; - # # updates homebrew packages on activation, - # # can make darwin-rebuild much slower (otherwise i'd forget to do it ever though) - # casks = [ - # "alfred" - # "discord" - # ]; - #}; + homebrew = { + enable = true; + autoUpdate = true; + # updates homebrew packages on activation, + # can make darwin-rebuild much slower (otherwise i'd forget to do it ever though) + casks = [ + "alfred" + "discord" + "neovim" + ]; + }; }