BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved thinkpad to bspwm

Browse Source
This commit is contained in:
Alexander Szczepanski
2021-08-04 14:21:38 +02:00
parent f360421b33
commit 023ee2ed50
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configs/desktop.nix
View File

@ -299,6 +299,10 @@
''; '';
}; };
networking.networkmanager = {
enable = true;
};
services = { services = {
udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;

18
machine/thinkpad.nix
View File

@ -14,7 +14,7 @@ let
in in
{ {
imports = imports =
[ # Include the results of the hardware scan. [
<nixos-hardware/lenovo/thinkpad/x1-extreme> <nixos-hardware/lenovo/thinkpad/x1-extreme>
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
../configs/gui.nix ../configs/gui.nix
@ -23,6 +23,7 @@ in
../configs/common.nix ../configs/common.nix
../configs/user.nix ../configs/user.nix
../configs/user-gui.nix ../configs/user-gui.nix
../configs/desktop.nix
]; ];
# boot.initrd.luks.devices = { # boot.initrd.luks.devices = {
@ -55,8 +56,6 @@ in
# Per-interface useDHCP will be mandatory in the future, so this generated config # Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour. # replicates the default behaviour.
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.enp0s31f6.useDHCP = true;
networking.interfaces.wlp0s20f3.useDHCP = true;
# Select internationalisation properties. # Select internationalisation properties.
# i18n.defaultLocale = "en_US.UTF-8"; # i18n.defaultLocale = "en_US.UTF-8";
@ -65,11 +64,6 @@ in
keyMap = "us"; keyMap = "us";
}; };
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
services.xserver = { services.xserver = {
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
# deviceSection = ''BusID "PCI:0:2:0"''; # deviceSection = ''BusID "PCI:0:2:0"'';
@ -155,10 +149,10 @@ in
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;
services.tlp = { services.tlp = {
enable = true; enable = true;
extraConfig = '' settings = {
START_CHARGE_THRESH_BAT0=80 START_CHARGE_THRESH_BAT0 = 80;
STOP_CHARGE_THRESH_BAT0=90 STOP_CHARGE_THRESH_BAT0 = 90;
''; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [