fixed
This commit is contained in:
parent
ff60f0d25c
commit
932002fb86
2 changed files with 16 additions and 18 deletions
|
@ -21,13 +21,10 @@
|
||||||
work-ntb = nixpkgs.lib.nixosSystem {
|
work-ntb = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
./nixosModules # TODO: move to base
|
|
||||||
./hosts/work-ntb
|
./hosts/work-ntb
|
||||||
./hosts/base
|
./hosts/base
|
||||||
];
|
];
|
||||||
};
|
specialArgs = { inherit inputs; };
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit (inputs) home-manager nix-flatpak;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
|
||||||
|
|
|
@ -5,26 +5,25 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base
|
|
||||||
inputs.home-manager.nixosModules.home-manager # TODO: move to base
|
inputs.home-manager.nixosModules.home-manager # TODO: move to base
|
||||||
|
inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base
|
||||||
|
../../nixosModules
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader = {
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
systemd-boot.enable = true;
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. Not needed if using GNOME
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. Not needed if using GNOME
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
@ -47,11 +46,13 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
# Enable the GNOME Desktop Environment.
|
# Enable the GNOME Desktop Environment.
|
||||||
services.xserver.displayManager.gdm.enable = true;
|
displayManager.gdm.enable = true;
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
desktopManager.gnome.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
services.gnome.gnome-browser-connector.enable = true;
|
services.gnome.gnome-browser-connector.enable = true;
|
||||||
|
|
||||||
environment.gnome.excludePackages = with pkgs; [
|
environment.gnome.excludePackages = with pkgs; [
|
||||||
|
|
Loading…
Reference in a new issue