From c2911a9080e51da898ee934e05027eec9d5403a7 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Sun, 1 Jan 2023 19:27:11 -0500 Subject: [PATCH] grr --- flake.lock | 5 ++-- flake.nix | 15 +++++------- hosts/ts-tl-mbp/default.nix | 48 ++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index dc1e191..dd02718 100644 --- a/flake.lock +++ b/flake.lock @@ -16,7 +16,6 @@ }, "original": { "owner": "lnl7", - "ref": "master", "repo": "nix-darwin", "type": "github" } @@ -46,13 +45,13 @@ "locked": { "lastModified": 1672441599, "narHash": "sha256-5s/aa/0cpw6MNXQSiUedDnnMVleL/WThL8Q8jYNcc+g=", - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", "rev": "0c5a734cdeadc39d253018ad0f83fb77eac7ab08", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" diff --git a/flake.nix b/flake.nix index 338a21c..6806bb5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,12 @@ description = "Tyrel Nix"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.05-darwin"; - darwin.url = "github:lnl7/nix-darwin/master"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; - - - 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 - + 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 }: { diff --git a/hosts/ts-tl-mbp/default.nix b/hosts/ts-tl-mbp/default.nix index d69baf3..874e6f2 100644 --- a/hosts/ts-tl-mbp/default.nix +++ b/hosts/ts-tl-mbp/default.nix @@ -8,30 +8,30 @@ home-manager.useUserPackages = true; home-manager.users.tyrel = { pkgs, ... }: { home.stateVersion = "22.05"; - programs.tmux = { # my tmux configuration, for example - enable = true; - keyMode = "vi"; - clock24 = true; - historyLimit = 10000; - plugins = with pkgs.tmuxPlugins; [ - vim-tmux-navigator - gruvbox - ]; - extraConfig = '' - new-session -s main - bind-key -n C-a send-prefix - ''; - }; - }; - 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" - ]; + #programs.tmux = { # my tmux configuration, for example + # enable = true; + # keyMode = "vi"; + # clock24 = true; + # historyLimit = 10000; + # plugins = with pkgs.tmuxPlugins; [ + # vim-tmux-navigator + # gruvbox + # ]; + # extraConfig = '' + # new-session -s main + # bind-key -n C-a send-prefix + # ''; + #}; }; + #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" + # ]; + #}; }