mirror of
https://github.com/nmasur/dotfiles
synced 2024-10-18 17:19:03 +00:00
Compare commits
No commits in common. "595a02383e7be0118807354f34eaa030ff975192" and "30fe7c2d1837a3a286f5965b3eb2622308616714" have entirely different histories.
595a02383e
...
30fe7c2d18
@ -19,7 +19,6 @@ nixpkgs.lib.nixosSystem {
|
||||
disko.nixosModules.disko
|
||||
{
|
||||
server = true;
|
||||
zfs.enable = true;
|
||||
gui.enable = false;
|
||||
theme = { colors = (import ../../colorscheme/gruvbox).dark; };
|
||||
nixpkgs.overlays = overlays;
|
||||
@ -37,9 +36,9 @@ nixpkgs.lib.nixosSystem {
|
||||
|
||||
neovim.enable = true;
|
||||
|
||||
# boot.zfs.enabled = true;
|
||||
# boot.kernelPackages =
|
||||
# config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
boot.zfs.enabled = true;
|
||||
boot.kernelPackages =
|
||||
config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
# boot.zfs.extraPools = [ "mypool" ];
|
||||
# services.zfs.autoScrub.enable = true;
|
||||
# services.zfs.autoScrub.interval = "daily";
|
||||
|
@ -12,16 +12,6 @@
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/boot";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
@ -14,13 +14,7 @@
|
||||
[ "writeBoundary" ] ''
|
||||
if [ ! -d "${config.dotfilesPath}" ]; then
|
||||
$DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
|
||||
|
||||
# Force HTTPS because anonymous SSH doesn't work
|
||||
GIT_CONFIG_COUNT=1 \
|
||||
GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" \
|
||||
GIT_CONFIG_VALUE_0="git@github.com:" \
|
||||
$DRY_RUN_CMD \
|
||||
${pkgs.git}/bin/git clone ${config.dotfilesRepo} "${config.dotfilesPath}"
|
||||
$DRY_RUN_CMD ${pkgs.git}/bin/git clone ${config.dotfilesRepo} "${config.dotfilesPath}"
|
||||
fi
|
||||
'';
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
./server.nix
|
||||
./sleep.nix
|
||||
./wifi.nix
|
||||
./zfs.nix
|
||||
];
|
||||
|
||||
options = {
|
||||
|
@ -1,14 +0,0 @@
|
||||
{ config, pkgs, lib, ... }: {
|
||||
|
||||
options = { zfs.enable = lib.mkEnableOption "ZFS file system."; };
|
||||
|
||||
config =
|
||||
lib.mkIf (pkgs.stdenv.isLinux && config.server && config.zfs.enable) {
|
||||
|
||||
# Only use compatible Linux kernel, since ZFS can be behind
|
||||
boot.kernelPackages =
|
||||
config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
|
||||
};
|
||||
|
||||
}
|
@ -17,13 +17,11 @@
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
ports = [ 22 ];
|
||||
passwordAuthentication = false;
|
||||
gatewayPorts = "no";
|
||||
forwardX11 = false;
|
||||
allowSFTP = true;
|
||||
settings = {
|
||||
GatewayPorts = "no";
|
||||
X11Forwarding = false;
|
||||
PasswordAuthentication = false;
|
||||
PermitRootLogin = config.permitRootLogin;
|
||||
};
|
||||
permitRootLogin = config.permitRootLogin;
|
||||
};
|
||||
|
||||
users.users.${config.user}.openssh.authorizedKeys.keys =
|
||||
|
Loading…
Reference in New Issue
Block a user