diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index d17925f..dcd0660 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -5,11 +5,10 @@ { config, pkgs, ... }: { - imports = - [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; # BOOT boot = { @@ -36,6 +35,8 @@ interfaces.enp42s0.useDHCP = true; }; + services.xserver.videoDrivers = [ "nvidia" ]; + # Powersaving services.tlp.enable = true; powerManagement.enable = true; diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix index 917f244..0983104 100644 --- a/modules/desktop/bspwm/default.nix +++ b/modules/desktop/bspwm/default.nix @@ -6,8 +6,6 @@ enable = true; layout = "de"; - videoDrivers = [ "nvidia" ]; - displayManager = { defaultSession = "none+bspwm"; @@ -15,15 +13,13 @@ enable = true; user = "moritz"; }; - lightdm = { - enable = true; - }; + lightdm = { enable = true; }; }; windowManager.bspwm.enable = true; }; }; - - console.keyMap = "de"; + + console.keyMap = "de"; home-manager.users.moritz = { xsession.windowManager.bspwm.enable = true; @@ -39,16 +35,9 @@ source = ./sxhkdrc; onChange = "pkill -USR1 -x sxhkd"; }; - "wallpaper/dracula.png" = { - source = ./dracula.png; - }; + "wallpaper/dracula.png" = { source = ./dracula.png; }; }; }; - home.packages = with pkgs; [ - feh - playerctl - pamixer - brightnessctl - ]; + home.packages = with pkgs; [ feh playerctl pamixer brightnessctl ]; }; }