From e0a4b9f9caac97ae5f73b72f95c31ed9d719b7bd Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sun, 3 Apr 2022 14:21:56 -0700
Subject: rename `desktop` to `isDesktop`

The variable is used to define the kind of machine we're managing.
`isDesktop` is a bit more descriptive.

We import `devel` for all machines, and we fine tune which packages we
want to install based on the value of `isDesktop`.
---
 flake.nix                     | 4 ++--
 lib/default.nix               | 4 ++--
 users/fcuny/default.nix       | 6 ++----
 users/fcuny/devel/default.nix | 6 ++++--
 users/fcuny/devel/go.nix      | 1 +
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8630b4c..bfa867a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,13 +50,13 @@
           username = "fcuny";
           system = "x86_64-linux";
           hostname = "carmel";
-          desktop = true;
+          isDesktop = true;
         };
         "fcuny@aptos" = lib.mkHome {
           username = "fcuny";
           system = "x86_64-linux";
           hostname = "aptos";
-          desktop = true;
+          isDesktop = true;
         };
         "fcuny@tahoe" = lib.mkHome {
           username = "fcuny";
diff --git a/lib/default.nix b/lib/default.nix
index 89aff0a..aa55942 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -33,12 +33,12 @@
     { username
     , system
     , hostname
-    , desktop ? false
+    , isDesktop ? false
     }:
     inputs.home-manager.lib.homeManagerConfiguration {
       inherit username system;
       extraSpecialArgs = {
-        inherit system hostname desktop;
+        inherit system hostname isDesktop;
       };
       homeDirectory = "/home/${username}";
       configuration = ../users/${username};
diff --git a/users/fcuny/default.nix b/users/fcuny/default.nix
index 3e55cba..32145dd 100644
--- a/users/fcuny/default.nix
+++ b/users/fcuny/default.nix
@@ -1,9 +1,7 @@
-{ config, lib, pkgs, desktop, ... }:
+{ config, lib, pkgs, isDesktop, ... }:
 
 {
-  imports =
-    [./cli ]
-    ++ (if desktop then [./desktop ./devel] else [ ]);
+  imports = [ ./cli ./devel ] ++ (if isDesktop then [ ./desktop ] else [ ]);
 
   programs.home-manager.enable = true;
 
diff --git a/users/fcuny/devel/default.nix b/users/fcuny/devel/default.nix
index 2c03c74..b4ff02e 100644
--- a/users/fcuny/devel/default.nix
+++ b/users/fcuny/devel/default.nix
@@ -1,7 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, isDesktop, ... }:
+with lib;
 
 {
   imports = [ ./go.nix ./python.nix ];
 
-  home.packages = with pkgs; [ flyctl hugo rnix-lsp nixfmt util-linux ];
+  home.packages = with pkgs;
+    [ util-linux ] ++ (optionals isDesktop [ flyctl hugo rnix-lsp nixfmt ]);
 }
diff --git a/users/fcuny/devel/go.nix b/users/fcuny/devel/go.nix
index d4f1e7b..e688ac7 100644
--- a/users/fcuny/devel/go.nix
+++ b/users/fcuny/devel/go.nix
@@ -1,4 +1,5 @@
 { config, ... }: {
+
   programs.go = {
     enable = true;
     goPath = ".local/share/pkg.go";
-- 
cgit 1.4.1