nnn -> yazi, nix -> lix, android-studio to full

cleanup
JohnRTitor · Jun 28, 2024 · 74e8000 · 74e8000
1 parent c866787
commit 74e8000
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 89 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake/hosts.nix b/flake/hosts.nix
@@ -14,6 +14,7 @@
     config = {
       allowUnfree = true;
       allowUnfreePredicate = _: true;
+      android_sdk.accept_license = true;
     };
   };
 in {

diff --git a/home-manager/cli-tools.nix b/home-manager/cli-tools.nix
@@ -27,16 +27,8 @@ And scripts may not work the high customised setup
   # fzf, a command-line fuzzy finder
   programs.fzf.enable = true;
 
-  # nnn, the terminal file manager
-  programs.nnn = {
-    enable = true;
-    package = pkgs.nnn.override {withNerdIcons = true;};
-    extraPackages = with pkgs; [
-      ffmpegthumbnailer
-      mediainfo
-      sxiv
-    ];
-  };
+  # Fast terminal file manager written in Rust
+  programs.yazi.enable = true;
 
   # zoxide, A smarter cd command which learns your habits as you go
   programs.zoxide = {
@@ -52,4 +44,17 @@ And scripts may not work the high customised setup
   home.packages = with pkgs; [
     tree # List directory recursively in tree structure
   ];
+
+  /*
+  # nnn, the terminal file manager
+  programs.nnn = {
+    enable = true;
+    package = pkgs.nnn.override {withNerdIcons = true;};
+    extraPackages = with pkgs; [
+      ffmpegthumbnailer
+      mediainfo
+      sxiv
+    ];
+  };
+  */
 }
diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix
@@ -84,28 +84,29 @@
       # Editors #
       # emacs
 
+      # IDEs #
+      (jetbrains.plugins.addPlugins jetbrains.phpstorm [
+        "github-copilot"
+        "nixidea"
+      ])
+      (jetbrains.plugins.addPlugins jetbrains.rust-rover [
+        "github-copilot"
+        "nixidea"
+      ])
+
       # whatsapp-for-linux
       libreoffice-fresh
       deluge # Torrent client
       shotwell # GNOME image editor
-      # jetbrains.phpstorm
-      # jetbrains.rust-rover
-      androidStudioPackages.beta
       gnome.gnome-logs # GNOME log viewer
       warp # file transfer, also install android app
+      clapper
     ])
     ++ (with pkgs-edge; [
       # list of latest packages from nixpkgs master
       # Can be used to install latest version of some packages
       # Some packages may not be cached so.. it may take some time to build
-      (jetbrains.plugins.addPlugins jetbrains.phpstorm [
-        "github-copilot"
-        "nixidea"
-      ])
-      (jetbrains.plugins.addPlugins jetbrains.rust-rover [
-        "github-copilot"
-        "nixidea"
-      ])
+      android-studio-full
     ]);
 
   services.flatpak.packages = [