diff options
author | lassulus <lassulus@lassul.us> | 2018-04-21 13:03:18 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2018-04-21 13:03:18 +0200 |
commit | d7320041b80fa7a429a65dab9ab6227e0c953da0 (patch) | |
tree | 5d10b2c16e667b90fa072da4d810d7f24d3c1ae6 /makefu/1systems/x/config.nix | |
parent | 92f7e3e12bdaee3265f583f72e43972269268b1e (diff) | |
parent | ee30fc920e0512d9d2359404051ba12efc3ee6f2 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x/config.nix')
-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 f72f2a15..93bb27ef 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; }]; |