Commit 87f9bd4263d4

Vincent Demeester <vincent@sbr.pm>
2018-04-29 21:04:38
Update envs (desktop, server, ..)
… and add honshu too. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 205b76b
envs/desktop.nix
@@ -1,7 +1,7 @@
 { pkgs, prefix, ... }:
 
 {
-  imports = [ ./fish.nix ];
+  imports = [ ./fish.nix ./base.nix ];
   programs.firefox = {
     enable = true;
   };
envs/hokkaido.nix
@@ -1,4 +1,4 @@
-{ pkgs, prefix, ...}:
+{ pkgs, prefix, ... }:
 
 {
   programs.bash = {
envs/honshu.nix
@@ -0,0 +1,4 @@
+{ pkgs, prefix, ... }:
+
+{
+}
envs/laptop.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./base.nix
     ./desktop.nix
   ];
 }
envs/server.nix
@@ -0,0 +1,5 @@
+{ pkgs, prefix, ... }:
+
+{
+  imports = [ ./fish.nix ./base.nix ];
+}
machine/hokkaido.nix
@@ -22,7 +22,7 @@
 	networking.firewall.allowedTCPPorts = [ 80 443 2375 8384 ];
 
   home-manager.users.vincent = {...}: {
-    imports = [ ../envs/hokkaido.nix ../envs/base.nix ];
+    imports = [ ../envs/hokkaido.nix ../envs/server.nix ];
   };
 
 	virtualisation.docker = {
machine/honshu.nix
@@ -16,13 +16,10 @@
 	time.timeZone = "Europe/Paris";
 	boot.loader.systemd-boot.enable = true;
 
-	security.pam.loginLimits = [
-    		{ domain = "@audio"; item = "memlock"; type = "-"; value = "unlimited"; }
-		{ domain = "@audio"; item = "rtprio";  type = "-"; value = "99"; }
-		{ domain = "@audio"; item = "nofile";  type = "-"; value = "99999"; }
-	];
-	
-	hardware.bluetooth.enable = true;
+  home-manager.users.vincent = {...}: {
+    imports = [ ../envs/honshu.nix ../envs/server.nix ];
+  };
+
 	services = {
 		openssh = {
 			enable = true;