Revert "we are getting somewhere oh my god"
This reverts commit aa1ca2fd26
.
This commit is contained in:
parent
324c9f3ed6
commit
7a07d169f4
4 changed files with 27 additions and 37 deletions
|
@ -1,8 +1,8 @@
|
|||
{ config, pkgs, lib, inputs, outputs, ...}:
|
||||
{ config, pkgs, lib, home-manager, ...}:
|
||||
{
|
||||
imports = [
|
||||
# home manager
|
||||
inputs.home-manager.nixosModules.default
|
||||
home-manager.nixosModules.default
|
||||
# modules
|
||||
#i dont think this is right
|
||||
./modules
|
||||
|
@ -36,7 +36,7 @@
|
|||
|
||||
time.timeZone = "Africa/Cairo";
|
||||
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
il8n.defaultLocale = "en_US.UTF-8";
|
||||
console = {
|
||||
font = "Lat2-Terminus16";
|
||||
# keyMap = "us";
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../default.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
# TODO(sako):: make this better
|
||||
../../modules
|
||||
];
|
||||
|
||||
# grub (mount efi partition to /boot/efi)
|
||||
|
@ -14,44 +16,44 @@
|
|||
# 1. when dualbooting, windows makes the efi partition 100mb instead of 512mb+ (we need this for generations
|
||||
# and intel microcode)
|
||||
# 2. nixos does not like /efi :(
|
||||
#boot.loader = {
|
||||
# efi = {
|
||||
# canTouchEfiVariables = true;
|
||||
# efiSysMountPoint = "/boot/efi";
|
||||
# };
|
||||
# grub = {
|
||||
# devices = [ "nodev" ];
|
||||
# efiSupport = true;
|
||||
# enable = true;
|
||||
# useOSProber = true;
|
||||
# };
|
||||
#};
|
||||
boot.loader = {
|
||||
efi = {
|
||||
canTouchEfiVariables = true;
|
||||
efiSysMountPoint = "/boot/efi";
|
||||
};
|
||||
grub = {
|
||||
devices = [ "nodev" ];
|
||||
efiSupport = true;
|
||||
enable = true;
|
||||
useOSProber = true;
|
||||
};
|
||||
};
|
||||
|
||||
# TODO(sako):: figure out plymouth and why my system is too fast
|
||||
#boot.plymouth.enable = true;
|
||||
|
||||
# for later when i setup flakes
|
||||
#nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
networking.hostName = "sakotop"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
#networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
|
||||
# Set your time zone.
|
||||
#time.timeZone = "Africa/Cairo";
|
||||
time.timeZone = "Africa/Cairo";
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Select internationalisation properties.
|
||||
#i18n.defaultLocale = "en_US.UTF-8";
|
||||
#console = {
|
||||
# font = "Lat2-Terminus16";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
console = {
|
||||
font = "Lat2-Terminus16";
|
||||
# keyMap = "us";
|
||||
# useXkbConfig = true; # use xkbOptions in tty.
|
||||
#};
|
||||
useXkbConfig = true; # use xkbOptions in tty.
|
||||
};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver = {
|
||||
|
@ -83,8 +85,7 @@
|
|||
|
||||
# we already sold our souls to corporations why
|
||||
# bother at this point
|
||||
# in default.nix
|
||||
#nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Bluetooth
|
||||
hardware.bluetooth = {
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
{ config, pkgs, lib, ...}:
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -1,12 +1,6 @@
|
|||
{ config, pkgs, lib, ...}:
|
||||
{
|
||||
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
|
||||
# tell xserver i want this driver
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
|
|
Loading…
Reference in a new issue