From a186d6804161f86e3d39885cc608984272153996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 4 Feb 2024 22:05:44 +0200
Subject: [PATCH] hm: fullDesktop -> devTools

---
 flake.nix                       |  2 +-
 hosts/fwminex/configuration.nix |  2 +-
 hosts/vm/configuration.nix      | 37 ++++-----------------------------
 modules/base/users/default.nix  |  4 ++--
 shared/home/default.nix         | 14 +++++++------
 5 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/flake.nix b/flake.nix
index bd46c8a..5320611 100644
--- a/flake.nix
+++ b/flake.nix
@@ -310,7 +310,7 @@
         extraSpecialArgs = {
           stateVersion = "23.05";
           email = "motiejusja@wix.com";
-          fullDesktop = true;
+          devTools = true;
           hmOnly = true;
         };
       };
diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 2a1a156..37e67c5 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -64,7 +64,7 @@ in {
       zfs.enable = true;
       users = {
         enable = true;
-        fullDesktop = true;
+        devTools = true;
         passwd = {
           root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
           motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix
index f8be1af..ba102cc 100644
--- a/hosts/vm/configuration.nix
+++ b/hosts/vm/configuration.nix
@@ -2,6 +2,7 @@
   self,
   lib,
   pkgs,
+  config,
   modulesPath,
   ...
 }: {
@@ -12,19 +13,14 @@
   ];
 
   home-manager.useGlobalPkgs = true;
-  home-manager.users.nixos = {
-    #config,
-    pkgs,
-    ...
-  }:
+  home-manager.users.nixos = {pkgs, ...}:
     lib.mkMerge [
       (import ../../shared/home/default.nix {
         inherit lib;
         inherit pkgs;
-        #inherit (config.mj) stateVersion;
-        stateVersion = "23.11";
+        inherit (config.mj) stateVersion;
         username = "nixos";
-        fullDesktop = true;
+        devTools = true;
         hmOnly = false;
         email = "motiejus@jakstys.lt";
       })
@@ -62,7 +58,6 @@
 
   services = {
     pcscd.enable = true;
-    udev.packages = [pkgs.yubikey-personalization];
     getty.autologinUser = "nixos";
     xserver = {
       enable = true;
@@ -104,30 +99,6 @@
     };
   };
 
-  # from yubikey-guide
-  environment.systemPackages = with pkgs; [
-    paperkey
-    pgpdump
-    parted
-    cryptsetup
-
-    yubikey-manager
-    yubikey-manager-qt
-    yubikey-personalization
-    yubikey-personalization-gui
-    yubico-piv-tool
-    yubioath-flutter
-
-    ent
-    haskellPackages.hopenpgp-tools
-
-    diceware
-    pwgen
-
-    cfssl
-    pcsctools
-  ];
-
   networking = {
     hostName = "vm";
     domain = "example.org";
diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix
index 106c97d..e22aee7 100644
--- a/modules/base/users/default.nix
+++ b/modules/base/users/default.nix
@@ -8,7 +8,7 @@
 in {
   options.mj.base.users = with lib.types; {
     enable = lib.mkEnableOption "enable motiejus and root";
-    fullDesktop = lib.mkOption {
+    devTools = lib.mkOption {
       type = bool;
       default = false;
     };
@@ -66,7 +66,7 @@ in {
           inherit lib;
           inherit pkgs;
           inherit (config.mj) stateVersion;
-          inherit (config.mj.base.users) fullDesktop;
+          inherit (config.mj.base.users) devTools;
           hmOnly = false;
           email = "motiejus@jakstys.lt";
         })
diff --git a/shared/home/default.nix b/shared/home/default.nix
index eb88b97..e3dc73d 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -3,7 +3,7 @@
   pkgs,
   stateVersion,
   email,
-  fullDesktop,
+  devTools,
   hmOnly,
   username ? "motiejus",
   ...
@@ -61,7 +61,9 @@
             nativeBuildInputs = [pkgs.makeWrapper];
             postBuild = ''
               mv $out/bin/${execName} $out/bin/.${execName}-mkWrapped-original
-              makeWrapper ${wrap}/bin/${wrap.name} $out/bin/${execName} --add-flags $out/bin/.${execName}-mkWrapped-original
+              makeWrapper \
+                ${wrap}/bin/${wrap.name} $out/bin/${execName} \
+                --add-flags $out/bin/.${execName}-mkWrapped-original
             '';
           }
           // metaAttributes
@@ -79,7 +81,7 @@ in {
     lib.mkMerge [
       [pkgNicer]
 
-      (lib.mkIf fullDesktop [
+      (lib.mkIf devTools [
         go
         zig
       ])
@@ -103,7 +105,7 @@ in {
       generateCaches = true;
     };
 
-    firefox = lib.mkIf fullDesktop {
+    firefox = lib.mkIf devTools {
       enable = true;
       # firefox doesn't need the wrapper on the personal laptop
       package =
@@ -143,14 +145,14 @@ in {
         plugins = with pkgs.vimPlugins;
           lib.mkMerge [
             [fugitive]
-            (lib.mkIf fullDesktop [
+            (lib.mkIf devTools [
               vim-go
               zig-vim
             ])
           ];
         extraConfig = builtins.readFile ./vimrc;
       }
-      (lib.mkIf fullDesktop {
+      (lib.mkIf devTools {
         extraLuaConfig =
           builtins.readFile
           (pkgs.substituteAll {