config/nix/curacao.nix

@@ -6,4 +6,5 @@
   ];
 
   networking.hostName = "curacao.geoffrey.frogeye.fr";
+  frogeye.extra = true;
 }

config/nix/curacao_test.nix

@@ -0,0 +1,12 @@
+{ ... }:
+{
+  imports = [
+    ./hm/loader.nix
+  ];
+
+  home.username = "gnix";
+  home.homeDirectory = "/home/gnix";
+
+  frogeye.extra = true;
+  frogeye.desktop.nixGLIntel = true;
+}

config/nix/hm/desktop.nix

@@ -506,12 +506,13 @@
               rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5";
             })
             { };
+          nixGLIntelPrefix = "${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ";
+          wmPrefix = "${lib.optionalString config.frogeye.desktop.nixGLIntel nixGLIntelPrefix}";
         in
         {
-          # TODO Configurable
           source = pkgs.writeShellScript "xinitrc" ''
             ${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path}
-            ${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ${config.xsession.windowManager.command}
+            ${wmPrefix}${config.xsession.windowManager.command}
           '';
         };
       "rofimoji.rc" = {
@@ -629,5 +630,4 @@
       MPD_PORT = "${toString config.services.mpd.network.port}";
     };
   };
-
 }

config/nix/hm/extra.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; lib.mkIf config.frogeye.extra [
     # android tools
     android-tools
 

config/nix/hm/loader.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ../options.nix
     ./common.nix
     ./desktop.nix
     ./dev.nix

config/nix/hm/style.nix

@@ -23,15 +23,17 @@ in
         terminal = 10;
       };
       monospace = {
-        package = pkgs.nerdfonts;
+        package = pkgs.nerdfonts.override {
+          fonts = [ "DejaVuSansMono" ]; # Choose from https://github.com/NixOS/nixpkgs/blob/6ba3207643fd27ffa25a172911e3d6825814d155/pkgs/data/fonts/nerdfonts/shas.nix
+        };
         name = "DejaVuSansM Nerd Font";
       };
     };
 
     targets = {
-        vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR)
-        i3.enable = false; # I prefer my own styles
-        tmux.enable = false; # Using another theme
+      vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR)
+      i3.enable = false; # I prefer my own styles
+      tmux.enable = false; # Using another theme
     };
   };
 

config/nix/options.nix

@@ -0,0 +1,7 @@
+{ lib, ... }:
+{
+  options.frogeye = {
+    extra = lib.mkEnableOption "Big software";
+    desktop.nixGLIntel = lib.mkEnableOption "Enable nixGLIntel/nixVulkanIntel for windows manager";
+  };
+}

config/nix/os/desktop.nix

@@ -5,7 +5,6 @@
 
   services.xserver = {
     windowManager.i3.enable = true;
-    desktopManager.gnome.enable = true;
     displayManager.defaultSession = "none+i3";
 
     # Keyboard layout

config/nix/os/geoffrey.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   imports = [
     <home-manager/nixos>
@@ -23,6 +23,7 @@
       imports = [
         ../hm/loader.nix
       ];
+      frogeye = config.frogeye;
     };
     # Makes VMs able to re-run
     useUserPackages = true;

config/nix/os/loader.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ../options.nix
     ./battery.nix
     ./geoffrey.nix
     ./common.nix

config/nix/testvm.nix

@@ -5,4 +5,5 @@
   ];
 
   networking.hostName = "nixos";
+  frogeye.extra = true;
 }