flake-modules/nvim.nix

@@ -17,10 +17,7 @@
         };
       };
       moduleDev = nvimModule { };
-      moduleHeadless = nvimModule {
+      moduleHeadless = nvimModule { jhome.nvim.dev.enable = false; };
-        jhome.nvim.dev.enable = false;
-        jhome.nvim.reduceSize = true;
-      };
       moduleNoLsp = nvimModule { jhome.nvim.dev.bundleLSPs = false; };
       moduleNoTSGrammars = nvimModule { jhome.nvim.dev.bundleGrammars = false; };
       moduleNoBundledBins = nvimModule {

flake.lock

@@ -281,11 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739624908,
+        "lastModified": 1739484910,
-        "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
+        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
+        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
         "type": "github"
       },
       "original": {
@@ -330,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739708385,
+        "lastModified": 1739632145,
-        "narHash": "sha256-H6qPfgE8P6rYMpwj9GsmcZEry52O3U82IqJJy6hx/88=",
+        "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "d636d254088a2fa49b585b79097a2766d4e3af80",
+        "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -37,9 +37,6 @@ in
       };
     })
     (lib.mkIf cfg.enable {
-      # Add gopass if pass is enabled
-      packages = lib.optional config.programs.password-store.enable pkgs.gopass;
-
       nix.settings.use-xdg-base-directories = fromOs [
         "nix"
         "settings"
@@ -72,10 +69,12 @@ in
           homedir = "${config.xdg.dataHome}/gnupg";
         };
         # Mail client
-        himalaya.enable = lib.mkDefault true;
+        himalaya.enable = true;
+        # Another shell
+        nushell.enable = true;
         # Password manager
         password-store = {
-          enable = lib.mkDefault true;
+          enable = true;
           package = pkgs.pass-nodmenu;
           settings.PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass";
         };
@@ -116,6 +115,11 @@ in
       home = {
         stateVersion = "22.11";
         # Extra packages
+        packages = [
+          pkgs.gopass
+          pkgs.sshfs
+          pkgs.unstable.gitoxide
+        ];
         # Extra variables
         sessionVariables = {
           CARGO_HOME = "${config.xdg.dataHome}/cargo";

home/gui/default.nix

@@ -71,8 +71,6 @@ in
         enable = true;
         scripts = builtins.attrValues { inherit (pkgs.mpvScripts) uosc thumbfast; };
       };
-      # Text editor
-      nixvim.clipboard.providers.wl-copy.enable = lib.mkDefault true;
       # Status bar
       waybar = {
         enable = true;

home/options.nix

@@ -199,7 +199,6 @@ in
                 [ "typos" ] # low false positive rate typo checker
                 [ "gcc" ] # GNU Compiler Collection
                 [ "git-absorb" ] # fixup! but automatic
-                [ "gitoxide" ] # git but RiiR
                 [ "man-pages" ] # gimme the man pages
                 [ "man-pages-posix" ] # I said gimme the man pages!!!
               ];

nvim/mappings.nix

@@ -7,6 +7,7 @@
 let
   inherit (helpers) mkRaw;
   cfg = config.jhome.nvim;
+  dev = cfg.dev.enable;
 in
 {
   config.keymaps =
@@ -201,9 +202,8 @@ in
             '';
         options.desc = "Find Quickfix";
       }
-    ]
       # Nvim Silicon
-    ++ lib.optional (!cfg.reduceSize) {
+      {
         mode = "v";
         key = "<leader>sc";
         action =
@@ -215,7 +215,8 @@ in
             '';
         options.desc = "Snap Code (to clipboard)";
       }
-    ++ lib.optional cfg.dev.enable {
+    ]
+    ++ lib.optional dev {
       mode = "n";
       key = "<leader>w";
       action =

nvim/options.nix

@@ -12,7 +12,6 @@ in
 {
   options.jhome.nvim = {
     enable = mkDisableOption "jalil's Neovim configuration";
-    reduceSize = mkEnableOption "reduce size by disabling big modules";
     dev = mkOption {
       type = types.submodule {
         options = {

nvim/standalone.nix

@@ -1,14 +1,4 @@
-{
+{ pkgs, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  cfg = config.jhome.nvim;
-  plugins = pkgs.vimPlugins;
-  extraPlugins = import ./extraPlugins { inherit pkgs; };
-in
 {
   imports = [
     ./options.nix
@@ -18,8 +8,7 @@ in
     ./augroups.nix
   ];
 
-  config = lib.mkMerge [
+  config = {
-    {
     withRuby = false;
     globals.mapleader = " ";
     # Appearance
@@ -31,6 +20,7 @@ in
         terminal_colors = true;
       };
     };
+    clipboard.providers.wl-copy.enable = true;
     opts = {
       number = true;
       relativenumber = true;
@@ -52,12 +42,22 @@ in
       # Enable local configuration :h 'exrc'
       exrc = true; # safe since nvim 0.9
     };
-      extraPlugins = [
+    extraPlugins =
+      let
+        plugins = pkgs.vimPlugins;
+        extraPlugins = import ./extraPlugins { inherit pkgs; };
+      in
+      [
         plugins.nui-nvim
         plugins.nvim-web-devicons
-        plugins.vim-jjdescription # FIXME: included since neovim nightly
+        plugins.vim-jjdescription
+        extraPlugins.nvim-silicon
+      ];
+    # Formatting & linters
+    extraPackages = [
+      pkgs.luajitPackages.jsregexp
+      pkgs.silicon
     ];
-      extraPackages = [ pkgs.luajitPackages.jsregexp ];
     extraConfigLuaPre =
       # lua
       ''
@@ -76,11 +76,6 @@ in
         end
         -- END: Lua Pre Config
       '';
-    }
-    # Big packages that are kinda unnecessary
-    (lib.mkIf (!cfg.reduceSize) {
-      extraPlugins = [ extraPlugins.nvim-silicon ];
-      extraPackages = [ pkgs.silicon ];
     extraConfigLua =
       # lua
       ''
@@ -99,6 +94,5 @@ in
         }
         -- END: Lua Config
       '';
-    })
+  };
-  ];
 }