diff --git a/default.nix b/default.nix index ca3a7a12..93cb5a9b 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,8 @@ -{ config, pkgs, lib, home-manager, ...}: +{ config, pkgs, lib, inputs, outputs, ...}: { imports = [ # home manager - home-manager.nixosModules.default + inputs.home-manager.nixosModules.default # modules #i dont think this is right ./modules @@ -36,7 +36,7 @@ time.timeZone = "Africa/Cairo"; - il8n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = "en_US.UTF-8"; console = { font = "Lat2-Terminus16"; # keyMap = "us"; diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index 1f8b64f0..467777a1 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -6,9 +6,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - inputs.home-manager.nixosModules.home-manager - # TODO(sako):: make this better - ../../modules + ../../default.nix ]; # grub (mount efi partition to /boot/efi) @@ -16,44 +14,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 = { @@ -85,7 +83,8 @@ # we already sold our souls to corporations why # bother at this point - nixpkgs.config.allowUnfree = true; + # in default.nix + #nixpkgs.config.allowUnfree = true; # Bluetooth hardware.bluetooth = { diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix new file mode 100644 index 00000000..22e1f04a --- /dev/null +++ b/modules/hardware/bluetooth.nix @@ -0,0 +1,5 @@ +{ config, pkgs, lib, ...}: +{ + +} + diff --git a/modules/hardware/nvidia/default.nix b/modules/hardware/nvidia/default.nix index f8b0561b..238523c0 100644 --- a/modules/hardware/nvidia/default.nix +++ b/modules/hardware/nvidia/default.nix @@ -1,6 +1,12 @@ { config, pkgs, lib, ...}: { + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + # tell xserver i want this driver services.xserver.videoDrivers = ["nvidia"];