dotfiles/nixos-config
1
0
Fork 0
mirror of https://github.com/srid/nixos-config.git synced 2026-02-22 21:05:22 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

home-manager follows global nixpkgs

Browse source 
and refmt
This commit is contained in:
Sridhar Ratnakumar 2021-09-05 20:07:09 -04:00
parent 7cc3dbce09
commit 558db1f03f
2 changed files with 64 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

28
flake.lock generated
View file

@ -391,7 +391,9 @@
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_4"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1630428740,
@ -434,7 +436,7 @@
"inputs": {
"flake-compat": "flake-compat_4",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1630570608,
@ -462,7 +464,7 @@
"explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils_5",
"nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_5",
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -567,20 +569,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1630633415,
"narHash": "sha256-QLhxPPAJnD1mLCo88rziWpjcmFw1vcqxT0gy0FKr/mU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "876fb5677c2623bcf7428072fa16e56c30a3ef40",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1630248577,
"narHash": "sha256-9d/yq96TTrnF7qjA6wPYk+rYjWAXwfUmwk3qewezSeg=",
@ -596,7 +584,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1626852498,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
@ -611,7 +599,7 @@
"type": "indirect"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1630761588,
"narHash": "sha256-7GXckvZy7DGh2KIyfdArqwnyeSc5Owy1fumEDQyd8eY=",
@ -764,7 +752,7 @@
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-doom-emacs": "nix-doom-emacs",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_6"
}
},
"rotate-text": {

109
flake.nix
View file

@ -10,6 +10,7 @@
nixos-hardware.url = github:NixOS/nixos-hardware/master;
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
himalaya.url = "github:soywod/himalaya";
emacs-overlay.url = "github:nix-community/emacs-overlay";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
@ -25,62 +26,64 @@
inherit system;
# Arguments to pass to all modules.
specialArgs = { inherit system inputs; };
modules = ([
# System configuration
configurationNix
modules = (
[
# System configuration
configurationNix
# Features common to all of my machines
./features/self-ide.nix
./features/caches
./features/current-location.nix
./features/passwordstore.nix
./features/syncthing.nix
./features/protonvpn.nix
./features/docker.nix
./features/monitor-brightness.nix
./features/ema/emanote.nix
# Features common to all of my machines
./features/self-ide.nix
./features/caches
./features/current-location.nix
./features/passwordstore.nix
./features/syncthing.nix
./features/protonvpn.nix
./features/docker.nix
./features/monitor-brightness.nix
./features/ema/emanote.nix
# home-manager configuration
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.srid = import ./home.nix {
inherit inputs system;
pkgs = import nixpkgs { inherit system; };
};
}
] ++ extraModules);
# home-manager configuration
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.srid = import ./home.nix {
inherit inputs system;
pkgs = import nixpkgs { inherit system; };
};
}
] ++ extraModules
);
};
in
{
# The "name" in nixosConfigurations.${name} should match the `hostname`
#
nixosConfigurations.p71 = mkHomeMachine
./hosts/p71.nix
[
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
./features/desktopish
#./features/gnome.nix
./features/desktopish/guiapps.nix
#./features/virtualbox.nix
#./features/server-mode.nix
# ./features/postgrest.nix
./features/devserver-mode.nix
];
nixosConfigurations.x1c7 = mkHomeMachine
./hosts/x1c7.nix
[
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
./features/distributed-build.nix
./features/gnome.nix
./features/desktopish/guiapps.nix
];
nixosConfigurations.ryzen9 = mkHomeMachine
./hosts/ryzen9.nix
[
./features/devserver-mode.nix
];
};
{
# The "name" in nixosConfigurations.${name} should match the `hostname`
#
nixosConfigurations.p71 = mkHomeMachine
./hosts/p71.nix
[
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
./features/desktopish
#./features/gnome.nix
./features/desktopish/guiapps.nix
#./features/virtualbox.nix
#./features/server-mode.nix
# ./features/postgrest.nix
./features/devserver-mode.nix
];
nixosConfigurations.x1c7 = mkHomeMachine
./hosts/x1c7.nix
[
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
./features/distributed-build.nix
./features/gnome.nix
./features/desktopish/guiapps.nix
];
nixosConfigurations.ryzen9 = mkHomeMachine
./hosts/ryzen9.nix
[
./features/devserver-mode.nix
];
};
}