diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-16 00:00:17 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-16 00:00:17 -0400 |
| commit | 27ee6b1aaf71715da579633f2f8e1a7baa0224c8 (patch) | |
| tree | 0738184d4776a307b606c4c247c6b68e7e196ca0 /nixos | |
| parent | c7dac4c7ddb106e13d98a28f311e2ff9561ff9f8 (diff) | |
Update nixos config for laptops.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/configuration.nix | 12 | ||||
| -rw-r--r-- | nixos/pincer.nix | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 9ff1f14..72c4fb0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -54,7 +54,7 @@ pavucontrol powertop kde4.digikam - emacs25pre + emacs25 sshfsFuse xorg.xbacklight rtorrent @@ -72,6 +72,7 @@ pass rxvt_unicode-with-plugins xsel + gnupg # fonts source-code-pro @@ -100,7 +101,7 @@ services.xserver.windowManager.xmonad.enableContribAndExtras = true; services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ haskellPackages.xmobar ]; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.xfce.enable = true; services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; @@ -120,6 +121,13 @@ extraGroups = ["wheel" "networkmanager" "dialout" "uucp"]; shell = "/run/current-system/sw/bin/fish"; }; + extraUsers.guest = { + isNormalUser = true; + home = "/home/guest"; + uid = 10001; + description = "Guest"; + extraGroups = ["networkmanager"]; + }; }; nix.maxJobs = 4; diff --git a/nixos/pincer.nix b/nixos/pincer.nix index cab2b15..ee5f7ee 100644 --- a/nixos/pincer.nix +++ b/nixos/pincer.nix @@ -5,6 +5,8 @@ ./configuration.nix ]; networking.hostName = "pincer"; + networking.firewall.allowedTCPPorts = [5201]; + networking.firewall.allowedUDPPorts = [5201]; hardware.opengl.driSupport32Bit = true; boot.loader.systemd-boot.enable = true; @@ -17,8 +19,10 @@ allowDiscards = true; } ]; - boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915"]; - boot.extraModulePackages = [config.boot.kernelPackages.tp_smapi]; + # boot.kernelPackages = pkgs.linuxPackages_4_7; + boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915" "acpi_call"]; + boot.extraModulePackages = with config.boot.kernelPackages; + [tp_smapi acpi_call]; boot.extraModprobeConfig = '' options iwlwifi swcrypto=1 ''; |