Compare commits
No commits in common. "82334e825e7c2c5f1082302229acb816937b5a67" and "3b1475fefca4f16ff60d8037e949b5d906068e02" have entirely different histories.
82334e825e
...
3b1475fefc
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,4 +1,3 @@
|
||||||
result
|
|
||||||
vim/bundle/
|
vim/bundle/
|
||||||
tags*
|
tags*
|
||||||
vim/view
|
vim/view
|
||||||
|
|
13
flake.lock
13
flake.lock
|
@ -16,6 +16,7 @@
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
|
"ref": "master",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -43,16 +44,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672500394,
|
"lastModified": 1672441599,
|
||||||
"narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=",
|
"narHash": "sha256-5s/aa/0cpw6MNXQSiUedDnnMVleL/WThL8Q8jYNcc+g=",
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8",
|
"rev": "0c5a734cdeadc39d253018ad0f83fb77eac7ab08",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"ref": "nixpkgs-22.11-darwin",
|
"ref": "nixpkgs-22.05-darwin",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
26
flake.nix
26
flake.nix
|
@ -1,19 +1,23 @@
|
||||||
{
|
{
|
||||||
description = "Tyrel Nix";
|
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";
|
||||||
|
|
||||||
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin";
|
|
||||||
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";
|
||||||
darwin.url = "github:lnl7/nix-darwin";
|
# nix will normally use the nixpkgs defined in home-managers inputs, we only want one copy of nixpkgs though
|
||||||
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, darwin }: {
|
};
|
||||||
darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem {
|
|
||||||
system = "x86_64-darwin";
|
outputs = { self, nixpkgs, home-manager, darwin }: {
|
||||||
modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ];
|
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
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,7 +31,6 @@
|
||||||
casks = [
|
casks = [
|
||||||
"alfred"
|
"alfred"
|
||||||
"discord"
|
"discord"
|
||||||
"neovim"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user