Fix the x1 disk and incompatible vga
This commit is contained in:
parent
d53cd1b0d8
commit
290fd372ab
|
@ -13,7 +13,7 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
{ lib, pkgs, inputs, ... }@params:
|
{ lib, config, pkgs, inputs, ... }@params:
|
||||||
let
|
let
|
||||||
modules = import ../../modules params;
|
modules = import ../../modules params;
|
||||||
in
|
in
|
||||||
|
@ -248,7 +248,7 @@ in
|
||||||
f = "fd";
|
f = "fd";
|
||||||
_ = "sudo";
|
_ = "sudo";
|
||||||
rebuild =
|
rebuild =
|
||||||
"sudo nixos-rebuild switch --flake '/home/lxsameer/src/Universe#majin'";
|
"sudo nixos-rebuild switch --flake \"/home/lxsameer/src/Universe#$(hostname)\"";
|
||||||
sus = "systemctl suspend";
|
sus = "systemctl suspend";
|
||||||
|
|
||||||
"..." = "../..";
|
"..." = "../..";
|
||||||
|
|
|
@ -45,7 +45,8 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
fileSystems."/".neededForBoot = true;
|
fileSystems."/".neededForBoot = true;
|
||||||
fileSystems."/boot/efi".neededForBoot = true;
|
fileSystems."/boot".neededForBoot = true;
|
||||||
|
fileSystems."/efi".neededForBoot = true;
|
||||||
|
|
||||||
services.gvfs.enable = true;
|
services.gvfs.enable = true;
|
||||||
|
|
||||||
|
@ -67,9 +68,46 @@ let
|
||||||
};
|
};
|
||||||
boot.loader.efi = {
|
boot.loader.efi = {
|
||||||
canTouchEfiVariables = true;
|
canTouchEfiVariables = true;
|
||||||
efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
|
efiSysMountPoint = "/efi";
|
||||||
};
|
};
|
||||||
boot.loader.grub.efiInstallAsRemovable = lib.mkForce false;
|
boot.loader.grub.efiInstallAsRemovable = lib.mkForce false;
|
||||||
|
|
||||||
|
|
||||||
|
environment.noXlibs = lib.mkForce false;
|
||||||
|
|
||||||
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
autorun = lib.mkDefault false;
|
||||||
|
xkb.layout = "us";
|
||||||
|
xkb.options = "eurosign:e";
|
||||||
|
|
||||||
|
displayManager = lib.mkDefault {
|
||||||
|
defaultSession = "fg42";
|
||||||
|
startx.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
libinput.enable = true; # for touchpad support
|
||||||
|
libinput.mouse.accelProfile = "adaptive";
|
||||||
|
libinput.mouse.accelSpeed = "-0.5";
|
||||||
|
|
||||||
|
videoDrivers = [
|
||||||
|
"i915"
|
||||||
|
];
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
sound.enable = true;
|
||||||
|
# Enable sound in virtualbox appliances.
|
||||||
|
hardware.pulseaudio.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.glxinfo
|
||||||
|
pkgs.xorg.xhost # not included by the x11 nixos module bydefault
|
||||||
|
];
|
||||||
|
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
lxsameer = pkgs.callPackage ../users/lxsameer/default.nix { };
|
lxsameer = pkgs.callPackage ../users/lxsameer/default.nix { };
|
||||||
|
|
|
@ -14,9 +14,18 @@
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "vfat";
|
format = "vfat";
|
||||||
mountpoint = "/boot/efi";
|
mountpoint = "/efi";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
boot = {
|
||||||
|
size = "1G";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "ext2";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
swap = {
|
swap = {
|
||||||
size = "20G";
|
size = "20G";
|
||||||
content = {
|
content = {
|
||||||
|
|
Loading…
Reference in New Issue