Moved some things to nix shell flakes

6 files changed, 43 insertions, 78 deletions

diff --git a/configuration.nix b/configuration.nix
index 1629862..8530dad 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -54,7 +54,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    udev
     unzip
     zip
     vim
@@ -79,11 +78,6 @@
     xfce.thunar-volman
     xfce.thunar-archive-plugin
     xfce.thunar-media-tags-plugin
-    python315
-    rustc
-    cargo
-    clippy
-    rustfmt
     brillo
     gnome.gvfs
     wlr-randr
@@ -105,12 +99,7 @@
     hyprlock
     hyprshot
     trashy
-    php
-    phpPackages.composer
-    nodejs_25
-    go
     lazygit
-    gcc
   ];
 
   fonts.packages = with pkgs; [
@@ -129,6 +118,8 @@
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
 
+  programs.nix-ld.enable = true;
+
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
diff --git a/flake.nix b/flake.nix
index eef56bf..fec7550 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,6 @@
           ./configuration.nix
           ./modules/home-manager.nix
           # ./modules/mango.nix
-          ./modules/android.nix
           ./modules/lsp.nix
           auto-cpufreq.nixosModules.default
         ];
diff --git a/home.nix b/home.nix
index 85e2a5c..e566f43 100755
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   dotfiles = "${config.home.homeDirectory}/dots/";
   create_symlink = path: config.lib.file.mkOutOfStoreSymlink path;
@@ -67,29 +72,28 @@ in
   home.homeDirectory = "/home/anand";
   home.stateVersion = "25.11"; # NEVER CHANGE THIS
   home.packages = [
-      pkgs.mpv
-      pkgs.dunst
-      pkgs.fzf
-      pkgs.nb
-      pkgs.eza
-      pkgs.yt-dlp
-      pkgs.mpv
-      pkgs.cmake
-      pkgs.copyq
-      pkgs.fastfetch
-      pkgs.scrcpy
-      pkgs.watch
-      pkgs.progress
-      pkgs.dysk
-      pkgs.glow
-      pkgs.termdown
-      pkgs.hugo
-      pkgs.pfetch
-      pkgs.flameshot
-      pkgs.grim
-      pkgs.slurp
-      pkgs.dmenu-wayland
-      pkgs.javaPackages.compiler.temurin-bin.jdk-25
+    pkgs.mpv
+    pkgs.dunst
+    pkgs.fzf
+    pkgs.nb
+    pkgs.eza
+    pkgs.yt-dlp
+    pkgs.mpv
+    pkgs.cmake
+    pkgs.copyq
+    pkgs.fastfetch
+    pkgs.scrcpy
+    pkgs.watch
+    pkgs.progress
+    pkgs.dysk
+    pkgs.glow
+    pkgs.termdown
+    pkgs.hugo
+    pkgs.pfetch
+    pkgs.flameshot
+    pkgs.grim
+    pkgs.slurp
+    pkgs.dmenu-wayland
   ];
 
   home.activation.dotfiles = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
diff --git a/modules/android.nix b/modules/android.nix
deleted file mode 100644
index ff745e2..0000000
--- a/modules/android.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, pkgs, ... }:
-{
-  #### SYSTEM (NixOS) ####
-
-  programs.adb.enable = true;
-
-  nixpkgs.config.android_sdk.accept_license = true;
-
-  users.users.anand.extraGroups = [ "adbusers" ];
-
-  environment.variables = {
-    ANDROID_SDK_ROOT = "/home/anand/.android-sdk/libexec/android-sdk";
-    ANDROID_HOME = "/home/anand/.android-sdk/libexec/android-sdk";
-  };
-
-  home-manager.users.anand =
-    { pkgs, ... }:
-    {
-      home.packages = [
-        pkgs.flutter
-        pkgs.android-tools
-      ];
-    };
-}
diff --git a/modules/lsp.nix b/modules/lsp.nix
index 1db6d9e..3823367 100644
--- a/modules/lsp.nix
+++ b/modules/lsp.nix
@@ -1,20 +1,17 @@
 { config, pkgs, ... }:
 
 {
-  home-manager.users.anand = { pkgs, ... }:
-  
-  {
-    home.packages = [
-      pkgs.nil
-      pkgs.tinymist
-      pkgs.lua-language-server
-      pkgs.clang-tools
-      pkgs.jdt-language-server
-      pkgs.rust-analyzer
-      pkgs.emmet-ls
-      pkgs.cmake-language-server
-      pkgs.phpactor
-      pkgs.intelephense
-    ];
-  };
+  home-manager.users.anand =
+    { pkgs, ... }:
+
+    {
+      home.packages = [
+        pkgs.nil
+        pkgs.tinymist
+        pkgs.lua-language-server
+        pkgs.clang-tools
+        pkgs.emmet-ls
+        pkgs.cmake-language-server
+      ];
+    };
 }
diff --git a/nvim/init.lua b/nvim/init.lua
index 7ec606c..f6d5082 100755
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -95,8 +95,6 @@ add({
   }
 })
 
-vim.lsp.enable({ 'jdtls', 'tinymist', 'clangd', 'emmet_language_server', 'lua_ls', 'neocmake', 'rust_analyzer', 'gopls' })
-
 -- Plugin Setup
 require('mason').setup()
 require('flutter-tools').setup {}