Commit 83acf3c6dcf6

Vincent Demeester <vincent@sbr.pm>
2017-10-24 21:45:47
Re-use networkmanager on desktop
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 91e4770
Changed files (3)
machine/shikoku.nix
@@ -36,30 +36,6 @@ xrandr --output DP-2 --auto --left-of DP-4 --output DP-4 --auto &
 		};
 	};
 
-systemd.network = {
-  enable = true;
-  netdevs.br0.netdevConfig = {
-    Name = "br0";
-    Kind = "bridge";
-  };
-  networks = {
-    br0.extraConfig = ''
-      [Match]
-      Name = br0
-
-      [Network]
-      DHCP = both
-    '';
-   enp0s31f6.extraConfig = ''
-     [Match]
-     Name=enp0s31f6
-
-     [Network]
-     Bridge=br0
-   '';
-  };
-};
-
 	hardware.bluetooth.enable = true;
 
 	environment.etc."synergy-server.conf" = { text = ''
profiles/desktop.nix
@@ -48,8 +48,10 @@
 		ledger
 		unzip
 		peco
+		networkmanagerapplet
 	];
 	hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
+	networking.networkmanager.enable = true;
 	services = {
 		xserver = {
 			enable = true;
@@ -101,6 +103,7 @@ Option          "XkbVariant"    "bepo"
 					defaultUser = "vincent";
 				};
 				sessionCommands = ''
+${pkg.networkmanagerapplet}/bin/nm-applet &
 ${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
 ${pkgs.pythonPackages.udiskie}/bin/udiskie -a -t -n -F &
 ${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.background-lock --tiling &
profiles/laptop.nix
@@ -11,13 +11,6 @@
 	environment.systemPackages = with pkgs; [
 		acpi
 		lm_sensors
-		networkmanagerapplet
 		powertop
 	];
-
-	services.xserver.displayManager.sessionCommands = ''
-${pkgs.networkmanagerapplet}/bin/nm-applet &
-	'';
-
-	networking.networkmanager.enable = true;
 }