Refactor Nix configurations for improved readability and organization; update package declarations to use 'with pkgs;' syntax and remove unnecessary builtins.attrValues.

home/panotaka/common/core/default.nix

@@ -43,21 +43,18 @@ in {
     };
   };
 
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      # FIXME(starter): add/edit as desired
-      # Packages that don't have custom configs go here
-      curl
-      pciutils
-      pfetch # system info
-      pre-commit # git hooks
-      p7zip # compression & encryption
-      usbutils
-      unzip # zip extraction
-      unrar # rar extraction
-      ;
-  };
+  home.packages = with pkgs; [
+    # FIXME(starter): add/edit as desired
+    # Packages that don't have custom configs go here
+    curl
+    pciutils
+    pfetch # system info
+    pre-commit # git hooks
+    p7zip # compression & encryption
+    usbutils
+    unzip # zip extraction
+    unrar # rar extraction
+  ];
 
   nix = {
     package = lib.mkDefault pkgs.nix;

home/panotaka/common/core/shell/aider.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    aider-chat-full
-  ];
-}

home/panotaka/common/core/shell/common.nix

@@ -1,8 +1,5 @@
 {pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      oterm
-      ;
-  };
+  home.packages = with pkgs; [
+    oterm
+  ];
 }

home/panotaka/common/core/shell/default.nix

@@ -1,7 +1,6 @@
 # FIXME(starter): customize your bash preferences here
 {
   imports = [
-    ./aider.nix
     ./atuin.nix
     ./autojump.nix
     ./bash.nix

home/panotaka/common/core/shell/fish.nix

@@ -1,10 +1,7 @@
 {pkgs, ...}: {
-  home.packages = builtins.attrValues {
-    inherit
-      (pkgs)
-      grc
-      ;
-  };
+  home.packages = with pkgs; [
+    grc
+  ];
 
   programs.fish = {
     enable = true;