diff options
| author | jeschli <jeschli@gmail.com> | 2018-05-04 16:57:21 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-05-04 16:57:21 +0200 |
| commit | 74cab14502ce3f482d96759eed4c7e648204e78e (patch) | |
| tree | 1f82d99cc0dafdf87d33fcc3e3a9a865f95f3384 /makefu/1systems/x | |
| parent | 4f2bf83ff906b9ee0421dabba4ff7e9dab5b7802 (diff) | |
| parent | b81fe57e3e137a2449fb8cc5e627e484d84bb00e (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'makefu/1systems/x')
| -rw-r--r-- | makefu/1systems/x/config.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index f72f2a15b..93bb27efe 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -141,15 +141,6 @@ with import <stockholm/lib>; # connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio hardware.bluetooth.enable = true; } - { # auto-mounting - services.udisks2.enable = true; - services.devmon.enable = true; - # services.gnome3.gvfs.enable = true; - users.users.makefu.packages = with pkgs;[ - gvfs pcmanfm lxmenu-data - ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; - } ]; @@ -170,6 +161,7 @@ with import <stockholm/lib>; networking.extraHosts = '' 192.168.1.11 omo.local + 80.92.65.53 www.wifionice.de wifionice.de ''; # hard dependency because otherwise the device will not be unlocked boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; |