From 593da5b9b0c8e4befa30aac3f2acc49b870b9bb9 Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Sun, 10 Aug 2025 17:15:12 +0530
Subject: Package changes + switch to neovim nightly

---
 config/nvim               |  2 +-
 home.nix                  | 20 ++++----------------
 overlays-system.nix       |  2 +-
 overlays/neovim.nix       |  9 ++++++---
 packages.nix              | 29 +++++++++++++++--------------
 packages/dwm/source       |  2 +-
 packages/dwmblocks/source |  2 +-
 packages/st/source        |  2 +-
 8 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/config/nvim b/config/nvim
index 3175f83..21c7453 160000
--- a/config/nvim
+++ b/config/nvim
@@ -1 +1 @@
-Subproject commit 3175f83b3c12ed36214798fe479e18d3f10f928b
+Subproject commit 21c7453e30c60a2b774b3ab374971a5ff45fc85d
diff --git a/home.nix b/home.nix
index 624614e..fcf135f 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, epkgs, lib, ... }:
+{ pkgs, lib, ... }:
 let
   localPkgs = import ./packages/default.nix { pkgs = pkgs; };
 in
@@ -9,9 +9,9 @@ in
     ./modules/mpv.home.nix
     ./modules/music/default.home.nix
     ./modules/xresources.home.nix
-    ./modules/newsboat.home/default.nix
-    ./modules/email.home/default.nix
-    ./modules/calendar.home/default.nix
+    # ./modules/newsboat.home
+    ./modules/email.home
+    ./modules/calendar.home
   ];
 
   home.packages = with pkgs; [
@@ -25,18 +25,6 @@ in
     };
   };
 
-  # programs.emacs = {
-  #   enable = true;
-  # };
-  # services.emacs = {
-  #   enable = true;
-  #   client.enable = true;
-  # };
-  # programs.direnv = {
-  #   enable = true;
-  #   enableNixDirenvIntegration = true;
-  # };
-
   # xdg.configFile."mimeapps.list".text = ''
   #   [Default Applications]
   #   text/html=browser-select.desktop
diff --git a/overlays-system.nix b/overlays-system.nix
index e87d212..8de97c5 100644
--- a/overlays-system.nix
+++ b/overlays-system.nix
@@ -7,6 +7,6 @@ in
     pass-with-dmenu
     qutebrowser
     j4-dmenu-desktop
-    # neovim-nightly
+    neovim-nightly
   ];
 }
diff --git a/overlays/neovim.nix b/overlays/neovim.nix
index 915c1e0..5e55257 100644
--- a/overlays/neovim.nix
+++ b/overlays/neovim.nix
@@ -1,3 +1,6 @@
-import (builtins.fetchTarball {
-  url = "https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz";
-})
+let
+  rev = "95727f7d4ebe43435c826ab618933198ab30effe"; # "master" (6th Aug 2025)
+in
+  import (builtins.fetchTarball {
+    url = "https://github.com/nix-community/neovim-nightly-overlay/archive/${rev}.tar.gz";
+  })
diff --git a/packages.nix b/packages.nix
index a397e64..12d71e3 100644
--- a/packages.nix
+++ b/packages.nix
@@ -44,6 +44,8 @@ let
 
     nixd
     lua-language-server
+    fennel-ls
+    fnlfmt
     efm-langserver
 
     nodePackages.typescript
@@ -51,28 +53,24 @@ let
     nodePackages.vscode-json-languageserver
     nodePackages.vscode-langservers-extracted
     nodePackages.prettier
-    biome
+    # biome
 
-    lua5_1
-    lua51Packages.luarocks
-    lua51Packages.lua-curl
+    # lua5_1
+    luajit
+    luajitPackages.luarocks
+    luajitPackages.lua-curl
     luajitPackages.magick # lua51Packages.magick
   ];
 
   apps = with pkgs; [
     # Browser
     qutebrowser
-    # nodePackages."@mozilla/readability"
-    # nodePackages.jsdom
-    # nodePackages.qutejs
-
-    # qutebrowser-qt5
     brave
     # firefox
     # ungoogled-chromium
 
     # Comm
-    slack
+    # slack
 
     # Media
     # spotify
@@ -83,16 +81,18 @@ let
     feh
     zathura
     inkscape
+    jellyfin-mpv-shim
     # obs-studio
     # krita
-    # blender
+    blender
 
+    minetest
+    xonotic
+    openarena
     # chiaki # PS remote play
 
-    tgpt
     remind
     dunst
-    newsboat
 
     # TUI stuff
     lf
@@ -100,12 +100,13 @@ let
     tremc
     wyrd
     dua
+    # newsboat
 
     (builtins.getFlake "github:phenax/chelleport/bf57e4968d059b207c036b57818a58ed8c54d141").packages.x86_64-linux.default
     # (builtins.getFlake "github:phenax/draw-stuff-on-your-screen/6e0e1f6ee603045cac5bb5d9d75d80c9ddef6c6e").packages.x86_64-linux.default
     (pkgs.writeShellScriptBin
       "null-browser"
-      ''exec /home/imsohexy/dev/projects/web-browser/result/bin/null-browser "$@"'')
+      ''exec /home/imsohexy/dev/projects/null-browser/result/bin/null-browser "$@"'')
   ];
 
   utils = with pkgs; [
diff --git a/packages/dwm/source b/packages/dwm/source
index 8441c72..25592e4 160000
--- a/packages/dwm/source
+++ b/packages/dwm/source
@@ -1 +1 @@
-Subproject commit 8441c72d3808524ecff8ce4c13a790a1932371f0
+Subproject commit 25592e4e56b5a2082b8af1269742afbb4a526503
diff --git a/packages/dwmblocks/source b/packages/dwmblocks/source
index 50bde28..2cea569 160000
--- a/packages/dwmblocks/source
+++ b/packages/dwmblocks/source
@@ -1 +1 @@
-Subproject commit 50bde2847bc07e317fe808423db9ceddbd07aa3a
+Subproject commit 2cea5699dbc949e66c7057049e1573c3ed690e5c
diff --git a/packages/st/source b/packages/st/source
index 63f1b2f..3f19e6b 160000
--- a/packages/st/source
+++ b/packages/st/source
@@ -1 +1 @@
-Subproject commit 63f1b2ff90c3b227304c0dfe0c98f99730c82b7b
+Subproject commit 3f19e6b7d142162ba9fe5b8c84fed38e196c9bac
-- 
cgit v1.3.1