Compare commits

...

2 Commits

Author SHA1 Message Date
Tyrel Souza
82334e825e works 2023-01-01 19:47:41 -05:00
Tyrel Souza
c2911a9080 grr 2023-01-01 19:27:11 -05:00
4 changed files with 34 additions and 37 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
result
vim/bundle/ vim/bundle/
tags* tags*
vim/view vim/view

View File

@ -16,7 +16,6 @@
}, },
"original": { "original": {
"owner": "lnl7", "owner": "lnl7",
"ref": "master",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -44,16 +43,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1672441599, "lastModified": 1672500394,
"narHash": "sha256-5s/aa/0cpw6MNXQSiUedDnnMVleL/WThL8Q8jYNcc+g=", "narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c5a734cdeadc39d253018ad0f83fb77eac7ab08", "rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixpkgs-22.05-darwin", "ref": "nixpkgs-22.11-darwin",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -1,23 +1,19 @@
{ {
description = "Tyrel Nix"; description = "Tyrel Nix";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.05-darwin"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin";
darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; 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 }: {
outputs = { self, nixpkgs, home-manager, darwin }: {
darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem { darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ]; # will be important later modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ];
};
}; };
};
} }

View File

@ -8,20 +8,20 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.tyrel = { pkgs, ... }: { home-manager.users.tyrel = { pkgs, ... }: {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.tmux = { # my tmux configuration, for example #programs.tmux = { # my tmux configuration, for example
enable = true; # enable = true;
keyMode = "vi"; # keyMode = "vi";
clock24 = true; # clock24 = true;
historyLimit = 10000; # historyLimit = 10000;
plugins = with pkgs.tmuxPlugins; [ # plugins = with pkgs.tmuxPlugins; [
vim-tmux-navigator # vim-tmux-navigator
gruvbox # gruvbox
]; # ];
extraConfig = '' # extraConfig = ''
new-session -s main # new-session -s main
bind-key -n C-a send-prefix # bind-key -n C-a send-prefix
''; # '';
}; #};
}; };
homebrew = { homebrew = {
enable = true; enable = true;
@ -31,6 +31,7 @@
casks = [ casks = [
"alfred" "alfred"
"discord" "discord"
"neovim"
]; ];
}; };