diff options
| author | sternenseemann <git@lukasepple.de> | 2017-01-13 16:06:11 +0100 |
|---|---|---|
| committer | sternenseemann <git@lukasepple.de> | 2017-01-13 16:06:20 +0100 |
| commit | e071649fc18181ffa0dd154c72d4cdbe69ccc37d (patch) | |
| tree | c59cb0e49be0e952cee7b0f4031d71131de8db01 /machines/sternenseemann | |
| parent | 50af3b64d5b10e2d111e0cddcf7c5538d79d5d57 (diff) | |
machines/schnurrkadse: use wpa_supplicant; add gobby
Diffstat (limited to 'machines/sternenseemann')
| -rw-r--r-- | machines/sternenseemann/schnurrkadse.nix | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix index 658fb045..56ccbc00 100644 --- a/machines/sternenseemann/schnurrkadse.nix +++ b/machines/sternenseemann/schnurrkadse.nix @@ -14,22 +14,17 @@ in { boot.initrd.luks.devices = [ { name = "schnurrkadse"; device = "/dev/disk/by-uuid/544529b8-81cb-4e8e-9b6b-44f828ea2a7b"; - preLVM = true; - } ]; + preLVM = true; } ]; fileSystems."/" = { device = "/dev/mapper/schnurrkadse-root"; - fsType = "btrfs"; - }; + fsType = "btrfs"; }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/e42bd75d-627d-4469-90cb-282dca7fdd4f"; - fsType = "ext4"; - }; + fsType = "ext4"; }; - swapDevices = - [ { device = "/dev/mapper/schnurrkadse-swap"; } - ]; + swapDevices = [ { device = "/dev/mapper/schnurrkadse-swap"; } ]; nix.maxJobs = 1; nix.binaryCaches = [ @@ -39,8 +34,6 @@ in { "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg=" ]; - networking.enableIntel2200BGFirmware = true; - hardware.pulseaudio.enable = true; hardware.trackpoint = { @@ -55,7 +48,18 @@ in { boot.loader.grub.device = "/dev/sda"; networking.hostName = "schnurrkadse"; - networking.networkmanager.enable = true; + networking.enableIntel2200BGFirmware = true; + networking.supplicant = { + wlp4s0 = { + configFile.path = "/etc/wpa_supplicant.conf"; + userControlled.enable = true; + userControlled.group = "users"; + driver = "wext"; + extraConf = '' + ap_scan=1 + ''; + }; + }; i18n = { consoleFont = "Lat2-Terminus16"; @@ -99,6 +103,7 @@ in { zathura youtube-dl pass + gobby5 mutt notmuch @@ -169,7 +174,6 @@ in { extraGroups = [ "audio" "wheel" "networkmanager" "uucp" ]; }; - environment.etc."vte.sh" = { source = "${pkgs.gnome3.vte}/etc/profile.d/vte.sh"; }; programs.ssh.startAgent = false; system.stateVersion = "unstable"; |