Fix(system): Fully embrace the home packages

3 files changed, 41 insertions, 58 deletions

diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index 67e29879..b78441c7 100644
--- a/home-manager/packages/default.nix
+++ b/home-manager/packages/default.nix
@@ -13,14 +13,9 @@ with pkgs; let
   snap-sync-pkgs = pkgs.writeShellScriptBin "snap-sync" (builtins.readFile "${snap-sync}/bin/snap-sync");
 
   Gui = {
-    #    Terminals = [
-    #      alacritty # terminal emulator
-    #    ];
-
-    #    Browsers = [
-    #      firefox # web browser
-    #      ungoogled-chromium # web browser (only for web programming)
-    #    ];
+    Browsers = [
+      ungoogled-chromium # web browser (only for web programming)
+    ];
 
     ImageManipulation = [
       krita # new, and better (KDE)
@@ -29,7 +24,6 @@ with pkgs; let
 
     Social = [
       mumble # voice chat software (client)
-      #nheko # Matrix Desktop client
     ];
 
     Misc = [
@@ -51,7 +45,6 @@ with pkgs; let
 
       Misc = [
         lftp # FTP client
-        # DONE        openssh # SSH client
       ];
     };
 
@@ -63,15 +56,11 @@ with pkgs; let
 
     Backups = [
       rclone # Sync files to and from Google Drive, S3, Swift, Cloudfiles, Dropbox and Google Cloud Storage
-      # DONE      snapper # A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping.
-      # DONE      #snap-sync # Use snapper snapshots to backup to external drive
     ];
 
     Misc = [
       android-file-transfer # Android MTP client with minimalistic UI
-      #python39Packages.docx2txt # Recovers text from DOCX files, with good formatting.
-      # DONE btop # Interactive process viewer (maybe better than htop)
-      # DONE nerdfonts # Patched font Source Code Pro from nerd fonts library
+      python39Packages.docx2txt # Recovers text from DOCX files, with good formatting.
       xdg-ninja # A shell script which checks your $HOME for unwanted files and directories.
       yokadi # Command line oriented, sqlite powered, todo list
     ];
@@ -101,15 +90,9 @@ with pkgs; let
         wf-recorder # Screen recorder
       ];
 
-      Idle = [
-        # DONE        swayidle # Idle management daemon
-        # DONE        swaylock # Screen locker
-      ];
     };
 
     LF = {
-      #      lf = [lf]; # A terminal file manager inspired by ranger
-
       Functions = [
         # TODO        broot # Fuzzy Search + tree + cd
         xdragon # Simple drag-and-drop source/sink
diff --git a/system/default.nix b/system/default.nix
index 3aed0b37..14762c92 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -6,7 +6,7 @@
     ./font
     ./impermanence
     ./locale
-    ./packages
+#./packages
     ./sound
   ];
 }
diff --git a/system/packages/default.nix b/system/packages/default.nix
index 8f0271fe..ecbbf904 100644
--- a/system/packages/default.nix
+++ b/system/packages/default.nix
@@ -1,39 +1,39 @@
-{pkgs, ...}:
-with pkgs; let
-  mapFun = x:
-    if builtins.isAttrs x
-    then
-      if lib.isDerivation x
-      then [x]
-      else builtins.attrValues x
-    else [x];
-in {
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-original"
-    ];
-
-  environment.systemPackages = with builtins;
-    concatLists
-    (concatLists [
-      (concatMap mapFun
-        (concatMap mapFun
-          (concatMap mapFun
-            (concatMap mapFun
-              (concatMap mapFun
-                (concatMap mapFun
-                  (attrValues Gui)))))))
-
-      (concatMap mapFun
-        (concatMap mapFun
-          (concatMap mapFun
-            (concatMap mapFun
-              (concatMap mapFun
-                (concatMap mapFun
-                  (attrValues TuiCli)))))))
-    ]);
-}
+{pkgs, ...}: {}
+#with pkgs; let
+#  mapFun = x:
+#    if builtins.isAttrs x
+#    then
+#      if lib.isDerivation x
+#      then [x]
+#      else builtins.attrValues x
+#    else [x];
+#in {
+#  nixpkgs.config.allowUnfreePredicate = pkg:
+#    builtins.elem (lib.getName pkg) [
+#      "steam"
+#      "steam-original"
+#    ];
+#
+#  environment.systemPackages = with builtins;
+#    concatLists
+#    (concatLists [
+#      (concatMap mapFun
+#        (concatMap mapFun
+#          (concatMap mapFun
+#            (concatMap mapFun
+#              (concatMap mapFun
+#                (concatMap mapFun
+#                  (attrValues Gui)))))))
+#
+#      (concatMap mapFun
+#        (concatMap mapFun
+#          (concatMap mapFun
+#            (concatMap mapFun
+#              (concatMap mapFun
+#                (concatMap mapFun
+#                  (attrValues TuiCli)))))))
+#    ]);
+#}
 # QEMU
 # TEX
 # {{{