nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make home-manager follow nixpkgs

This commit is contained in:
Nathan McCarty 2022-05-16 22:25:53 -04:00
parent bfab52c5d8
commit 103d563bb2
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
droid.nix
View File

@ -70,7 +70,7 @@
## devel-core ## devel-core
### ###
# Full version of git # Full version of git
gitFull git
# Git addons # Git addons
git-secret git-secret
git-lfs git-lfs

24
flake.lock
View File

@ -254,7 +254,9 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1652452047, "lastModified": 1652452047,
@ -451,20 +453,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1652692103,
"narHash": "sha256-ygRLh8g0F/WkVCSfQcxMoVaaD45i6Ky+f+b4wCOazag=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "556ce9a40abde33738e6c9eac65f965a8be3b623",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1652559422, "lastModified": 1652559422,
"narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=",
@ -480,7 +468,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1652541622, "lastModified": 1652541622,
"narHash": "sha256-Z9BuUCS0IocoRahFvFDJNU5Q+xM5/lS8Ng4JJFH3+UU=", "narHash": "sha256-Z9BuUCS0IocoRahFvFDJNU5Q+xM5/lS8Ng4JJFH3+UU=",
@ -656,7 +644,7 @@
"mozilla": "mozilla", "mozilla": "mozilla",
"nix-doom-emacs": "nix-doom-emacs", "nix-doom-emacs": "nix-doom-emacs",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"polymc": "polymc", "polymc": "polymc",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -697,7 +685,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-21_11": "nixpkgs-21_11" "nixpkgs-21_11": "nixpkgs-21_11"
}, },
"locked": { "locked": {

7
flake.nix
View File

@ -17,6 +17,7 @@
}; };
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
darwin = { darwin = {
url = "github:lnl7/nix-darwin/master"; url = "github:lnl7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -90,7 +91,11 @@
}; };
} }
({ pkgs, config, unstable, ... }: { ({ pkgs, config, unstable, ... }: {
home-manager.users.nathan.programs.starship.package = unstable.starship; home-manager.users.nathan.programs = {
starship.package = unstable.starship;
git.package = unstable.gitFull;
fish.package = unstable.fish;
};
}) })
./home.nix ./home.nix
]; ];