diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix index 9be81fe..4f4e1f7 100644 --- a/hosts/Dimaga/default.nix +++ b/hosts/Dimaga/default.nix @@ -28,17 +28,17 @@ in apps = { development.enable = true; - media.enable = true; - office.enable = true; - recording.enable = true; - social.enable = true; - writing.enable = true; + #media.enable = true; + #office.enable = true; + #recording.enable = true; + #social.enable = true; + #writing.enable = true; }; # Enable Secure Boot support. bootloader = { enable = true; - secureboot.enable = true; + #secureboot.enable = true; tpm2.enable = true; }; @@ -49,11 +49,11 @@ in gpu = { intel.enable = true; nvidia = { - enable = false; + enable = true; hybrid = { - enable = false; - busIDs.nvidia = ""; - busIDs.intel = ""; + enable = true; + busIDs.nvidia = "PCI:3:0:0"; + busIDs.intel = "PCI:0:2:0"; }; }; }; diff --git a/hosts/Dimaga/hardware-configuration.nix b/hosts/Dimaga/hardware-configuration.nix index c07cc5a..5019f83 100644 --- a/hosts/Dimaga/hardware-configuration.nix +++ b/hosts/Dimaga/hardware-configuration.nix @@ -7,8 +7,8 @@ }: let - primaryDisk = "/dev/disk/by-id/"; - luksDevice = ""; + luksPartition = "/dev/disk/by-uuid/dfb4fc8f-e82b-43a1-91c1-a77acb6337cb"; + luksDevice = "9fdc521b-a037-4070-af47-f54da03675e4"; standardMountOpts = [ "compress=zstd" "noatime" @@ -37,27 +37,27 @@ in fileSystems = { "/" = { - device = primaryDisk; + device = luksPartition; fsType = "btrfs"; options = [ "subvol=@" ] ++ standardMountOpts; }; "/home" = { - device = primaryDisk; + device = luksPartition; fsType = "btrfs"; options = [ "subvol=@home" ] ++ standardMountOpts; }; "/nix" = { - device = primaryDisk; + device = luksPartition; fsType = "btrfs"; options = [ "subvol=@nix" ] ++ standardMountOpts; }; "/swap" = { - device = primaryDisk; + device = luksPartition; fsType = "btrfs"; options = [ "subvol=@swap" ]; }; "/boot" = { - device = "/dev/disk/by-uuid/AFCB-D880"; + device = "/dev/disk/by-uuid/FC20-D155"; fsType = "vfat"; }; };