small tweaks for how to list packages to install

5 files changed, 19 insertions, 41 deletions

diff --git a/nix/users/fcuny/1password.nix b/nix/users/fcuny/1password.nix
index 56c0fad..63892c7 100644
--- a/nix/users/fcuny/1password.nix
+++ b/nix/users/fcuny/1password.nix
@@ -1,10 +1,14 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 let
   home = config.home.homeDirectory;
   darwinSockPath = "${home}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock";
   sockPath = ".1password/agent.sock";
 in
 {
+  home.packages = with pkgs; [
+    _1password-cli
+  ];
+
   home.sessionVariables = {
     SSH_AUTH_SOCK = "${home}/${sockPath}";
   };
diff --git a/nix/users/fcuny/desktop.nix b/nix/users/fcuny/desktop.nix
deleted file mode 100644
index 0bf6881..0000000
--- a/nix/users/fcuny/desktop.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    element-desktop
-  ];
-}
diff --git a/nix/users/fcuny/dev.nix b/nix/users/fcuny/dev.nix
index 0627ca4..9b2408b 100644
--- a/nix/users/fcuny/dev.nix
+++ b/nix/users/fcuny/dev.nix
@@ -5,33 +5,24 @@
 }:
 {
   home.packages = with pkgs; [
-    _1password-cli
     aider-chat
+    basedpyright
+    customPackages.llmPython.llm # llm and claude support
+    delve
+    dive # explore layers in docker images
     docker
-    iterm2
-    wireshark
-
-    # go
-    go-tools
+    go-tools # collection of tools, https://github.com/dominikh/go-tools
     golangci-lint
     gopls
-    delve
-
-    # python
-    basedpyright
-    customPackages.llmPython.llm
-    python3
-    ruff
-    ruff-lsp
-    uv
-
-    # nix
     nil # nix lsp
     nix-direnv # integration with direnv
     nixfmt-rfc-style # new formatter
-
-    # rust
+    python3
+    ruff
+    ruff-lsp
     rustup
+    uv
+    wireshark
   ];
 
   # https://wezterm.org/config/lua/general.html
diff --git a/nix/users/fcuny/k8s.nix b/nix/users/fcuny/k8s.nix
index 73c7f2f..ec59228 100644
--- a/nix/users/fcuny/k8s.nix
+++ b/nix/users/fcuny/k8s.nix
@@ -7,9 +7,6 @@
     kubernetes-helm # deploy applications
     kubie # kubeconfig browser https://github.com/sbstp/kubie
     kubelogin-oidc # OIDC plugin
-
-    # docker
-    dive # explore layers in docker images
   ];
 
   programs.k9s = {
diff --git a/nix/users/fcuny/work.nix b/nix/users/fcuny/work.nix
index 265074d..0549d9b 100644
--- a/nix/users/fcuny/work.nix
+++ b/nix/users/fcuny/work.nix
@@ -27,21 +27,13 @@ in
 
   home.packages = with pkgs; [
     awscli2
-
-    # hashicorp
-    boundary
+    boundary # for secure remote access
+    customPackages.hashi
+    customPackages.sapi
     nomad-pack
+    nomad-prod
     tfswitch
     vault
-
-    # for ssh
-    customPackages.sapi
-
-    # for tokens
-    customPackages.hashi
-
-    # for nomad
-    nomad-prod
   ];
 
   programs.fish = {