From e0a4b9f9caac97ae5f73b72f95c31ed9d719b7bd Mon Sep 17 00:00:00 2001 From: Franck Cuny 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`. --- users/fcuny/default.nix | 6 ++---- users/fcuny/devel/default.nix | 6 ++++-- users/fcuny/devel/go.nix | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'users') 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