summaryrefslogtreecommitdiff
path: root/machines/z
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--machines/x/configuration.nix (renamed from machines/z/configuration.nix)16
-rw-r--r--machines/x/hardware-configuration.nix (renamed from machines/z/hardware-configuration.nix)0
-rw-r--r--machines/z/home.nix20
3 files changed, 14 insertions, 22 deletions
diff --git a/machines/z/configuration.nix b/machines/x/configuration.nix
index 5af5c58..de93a4f 100644
--- a/machines/z/configuration.nix
+++ b/machines/x/configuration.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, ... }:
+{ lib, inputs, pkgs, ... }:
{
imports = [
@@ -7,6 +7,13 @@
] ++ (map (path: ../../modules/${path}) [
"global.nix"
"compromyse.nix"
+ "desktop.nix"
+ "login.nix"
+ "fonts.nix"
+ "bluetooth.nix"
+ "audio.nix"
+ # "virtualization.nix"
+ # "nvidia.nix"
]);
boot.loader.systemd-boot.enable = true;
@@ -15,12 +22,17 @@
boot.extraModprobeConfig = "options kvm_intel nested=1";
+ nixpkgs.config.allowUnfree = true;
+ nixpkgs.config.allowUnfreePredicate = _: true;
+
+ hardware.opengl.enable = true;
+
fileSystems."/data" = {
device = "/dev/sda";
fsType = "ext4";
};
- networking.hostName = "z";
+ networking.hostName = "x";
home-manager.users.compromyse = import ./home.nix;
}
diff --git a/machines/z/hardware-configuration.nix b/machines/x/hardware-configuration.nix
index aeb8272..aeb8272 100644
--- a/machines/z/hardware-configuration.nix
+++ b/machines/x/hardware-configuration.nix
diff --git a/machines/z/home.nix b/machines/z/home.nix
deleted file mode 100644
index 564d4d5..0000000
--- a/machines/z/home.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-
- home = {
- username = "compromyse";
- homeDirectory = "/home/compromyse";
- };
-
- imports = [
- ../../config/themes.nix
- ../../config/alacritty
- ];
-
- home.packages = with pkgs; [
- wget
- ];
-
- home.stateVersion = "23.11";
-}