Merge branch 'master' of github.com:cyplo/dotfiles

This commit is contained in:
Cyryl Płotnicki 2019-08-16 16:39:53 +01:00
commit 48ef2773ab
2 changed files with 8 additions and 3 deletions

View file

@ -2,13 +2,14 @@
{ {
networking.hostName = "skinnyv"; networking.hostName = "skinnyv";
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ kernelParams = [
"i915.enable_rc6=7" "i915.enable_rc6=7"
]; ];
initrd.luks.devices = [ initrd.luks.devices = [
{ {
name = "root"; name = "root";
device = "/dev/disk/by-uuid/8c76bf01-59b3-4c60-b853-e9cb77f3ca14"; device = "/dev/disk/by-uuid/ef6e91d9-c477-4ab7-ae39-4a0ee413cebe";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
}]; }];
@ -25,6 +26,5 @@
../boot.nix ../boot.nix
../common.nix ../common.nix
../gfx-intel.nix ../gfx-intel.nix
../virtualbox.nix
]; ];
} }

View file

@ -11,9 +11,14 @@ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flat
curl https://nixos.org/nix/install | sh curl https://nixos.org/nix/install | sh
. /home/cyryl/.nix-profile/etc/profile.d/nix.sh source /home/cyryl/.nix-profile/etc/profile.d/nix.sh
export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH
nix-channel --add https://github.com/rycee/home-manager/archive/release-19.03.tar.gz home-manager
nix-channel --update
nix-shell '<home-manager>' -A install
ln -vfs $HOME/dev/dotfiles/nixos/home-other-os.nix $HOME/.config/nixpkgs/home.nix ln -vfs $HOME/dev/dotfiles/nixos/home-other-os.nix $HOME/.config/nixpkgs/home.nix
home-manager switch home-manager switch