diff options
Diffstat (limited to 'machines')
-rwxr-xr-x | machines/base.nix | 4 | ||||
-rw-r--r-- | machines/x220/configuration.nix | 52 |
2 files changed, 34 insertions, 22 deletions
diff --git a/machines/base.nix b/machines/base.nix index 52a32b5..d71292e 100755 --- a/machines/base.nix +++ b/machines/base.nix @@ -26,6 +26,10 @@ ga = "git add"; gl = "git log"; gd = "git diff"; + ls = "ls --color=auto -hN --group-directories-first"; + rm = "rm -vI"; + cp = "cp -iv"; + mv = "mv -iv"; }; ## === XDG === diff --git a/machines/x220/configuration.nix b/machines/x220/configuration.nix index 9cea847..12c1bba 100644 --- a/machines/x220/configuration.nix +++ b/machines/x220/configuration.nix @@ -11,32 +11,32 @@ let ''; }; in -{ - imports = [ - ../base.nix - ../pl.nix - ../../modules/larbs.nix - ../../modules/internet.nix - ../../modules/dockd.nix - ../../modules/trackpad.nix - ../../modules/agetty.nix - ]; - - boot.plymouth.enable = true; - - networking = { - hostName = "x220"; - - networkmanager = { - enable = true; - wifi.backend = "iwd"; + { + imports = [ + ../base.nix + ../pl.nix + ../../modules/larbs.nix + ../../modules/internet.nix + ../../modules/dockd.nix + ../../modules/trackpad.nix + ../../modules/agetty.nix + ]; + + boot.plymouth.enable = true; + + networking = { + hostName = "x220"; + + networkmanager = { + enable = true; + wifi.backend = "iwd"; + }; }; - }; - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; [ # Basic tools groff file ssh-ident busybox_utils @@ -107,6 +107,14 @@ in # Battery services.tlp.enable = true; + services.xserver = { + videoDrivers = [ "intel" ]; + deviceSection = '' + Option "DIR" "2" + Option "TearFree" "true" + ''; + }; + services.xserver.wacom = { enable = true; }; |