summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configuration.nix2
-rw-r--r--host/asterix.nix2
-rw-r--r--host/athena.nix2
-rw-r--r--host/automatix.nix2
-rw-r--r--host/hardware/majestix.nix19
-rw-r--r--host/majestix.nix37
-rw-r--r--host/obelix.nix2
-rw-r--r--host/software/desktop/default.nix7
8 files changed, 37 insertions, 36 deletions
diff --git a/configuration.nix b/configuration.nix
index e9e20d6..cb0d387 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,8 +4,6 @@ let
mypkgs = import <mypkgs> { };
in {
- system.stateVersion = "18.09";
-
imports = [
./fish.nix
./host/current.nix
diff --git a/host/asterix.nix b/host/asterix.nix
index 75b23b0..6909832 100644
--- a/host/asterix.nix
+++ b/host/asterix.nix
@@ -52,4 +52,6 @@
};
powerManagement.powertop.enable = true;
+
+ system.stateVersion = "18.09";
}
diff --git a/host/athena.nix b/host/athena.nix
index a010a5b..ee8434d 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -98,4 +98,6 @@
font = "ter-132n";
packages = [ pkgs.terminus_font ];
};
+
+ system.stateVersion = "18.09";
}
diff --git a/host/automatix.nix b/host/automatix.nix
index 50d7f19..1999324 100644
--- a/host/automatix.nix
+++ b/host/automatix.nix
@@ -60,4 +60,6 @@
acceptTerms = true;
email = "key@kummerlaender.eu";
};
+
+ system.stateVersion = "18.09";
}
diff --git a/host/hardware/majestix.nix b/host/hardware/majestix.nix
index 5c78ed8..ff9d519 100644
--- a/host/hardware/majestix.nix
+++ b/host/hardware/majestix.nix
@@ -1,31 +1,30 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
{
imports =
- [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+ [ (modulesPath + "/installer/scan/not-detected.nix")
];
- boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ];
- boot.kernelModules = [ "kvm-intel" ];
+ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+ boot.initrd.kernelModules = [ "dm-snapshot" ];
+ boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
- { device = "/dev/disk/by-uuid/6eb9a8c7-0384-4c47-9e4e-24d2ed57fc2e";
+ { device = "/dev/disk/by-uuid/4587b5ba-be4d-453a-a95a-289be7612271";
fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/e8a055f9-4293-4a55-9974-9ca39bf209cd";
- fsType = "ext2";
+ { device = "/dev/disk/by-uuid/D7EA-FB64";
+ fsType = "vfat";
};
swapDevices =
- [ { device = "/dev/disk/by-uuid/b27d07d6-bc07-4e7c-bd14-2b67c89dbf20"; }
+ [ { device = "/dev/disk/by-uuid/7237cb82-4c5e-4997-856a-20194ac1521c"; }
];
- nix.maxJobs = lib.mkDefault 8;
- powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}
diff --git a/host/majestix.nix b/host/majestix.nix
index da855d6..3d33aca 100644
--- a/host/majestix.nix
+++ b/host/majestix.nix
@@ -7,17 +7,18 @@
];
boot = {
- loader.grub = {
- enable = true;
- version = 2;
- device = "/dev/sda";
+ loader = {
+ systemd-boot.enable = true;
+ efi.canTouchEfiVariables = true;
};
- initrd.luks.devices = [ {
- name = "encrypted";
- device = "/dev/sda2";
- preLVM = true;
- } ];
+ initrd.luks.devices = {
+ encrypted = {
+ device = "/dev/nvme0n1p2";
+ preLVM = true;
+ allowDiscards = true;
+ };
+ };
};
networking = {
@@ -32,22 +33,10 @@
acpid.enable = true;
xserver = {
- videoDrivers = [ "intel" ];
- };
-
- printing = {
- enable = true;
- drivers = [ pkgs.brgenml1cupswrapper ];
- };
-
- avahi = {
- enable = true;
- nssmdns = true;
+ videoDrivers = [ "nvidia" ];
};
};
- hardware.opengl.extraPackages = [ pkgs.intel-ocl ];
-
networking.wireguard.interfaces = {
wg0 = {
ips = [ "10.100.0.3/24" ];
@@ -64,4 +53,8 @@
];
};
};
+
+ nix.maxJobs = 32;
+
+ system.stateVersion = "20.09";
}
diff --git a/host/obelix.nix b/host/obelix.nix
index 583fbde..8a96eed 100644
--- a/host/obelix.nix
+++ b/host/obelix.nix
@@ -49,4 +49,6 @@
];
};
};
+
+ system.stateVersion = "18.09";
}
diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix
index f18d3fa..df59e62 100644
--- a/host/software/desktop/default.nix
+++ b/host/software/desktop/default.nix
@@ -30,13 +30,16 @@
layout = "de";
xkbOptions = "caps:escape";
- displayManager.lightdm = {
- enable = true;
+ displayManager = {
autoLogin = {
enable = true;
user = "common";
};
+
+ lightdm.enable = true;
};
+
+ desktopManager.xterm.enable = true;
};
};