Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

This commit is contained in:
Andreas Zweili 2021-11-23 20:36:21 +01:00
commit 5e3a20a6e4
2 changed files with 5 additions and 4 deletions

View File

@ -12,6 +12,10 @@
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.kernelParams = [
"mem_sleep_default=deep"
]
boot.initrd.luks.devices."cryptlvm".device = "/dev/sda2";
fileSystems."/" =
{ device = "/dev/disk/by-label/nixos";

View File

@ -6,14 +6,11 @@
];
programs.git.userEmail = "zweili@contria.com";
home.shellAliases = {
management-server = "mosh --ssh=\"ssh -p 22\" localadmin@10.40.0.53 tmux a";
};
programs.bash = {
enable = true;
bashrcExtra = ''
. ~/git_repos/nixos/home-manager/work_config/bashrc
. /home/andreas/.nix-profile/etc/profile.d/nix.sh
'';
};
}