chore(deps): lock file maintenance

| datasource | package | from   | to     |
| ---------- | ------- | ------ | ------ |
| crate      | log     | 0.4.25 | 0.4.26 |

flake-modules/nvim.nix

@@ -17,7 +17,10 @@
         };
       };
       moduleDev = nvimModule { };
-      moduleHeadless = nvimModule { jhome.nvim.dev.enable = false; };
+      moduleHeadless = nvimModule {
+        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

@@ -69,11 +69,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1734969791,
+        "lastModified": 1739223196,
-        "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
+        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
+        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1739757849,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739357830,
+        "lastModified": 1739923778,
-        "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
+        "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
+        "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
         "type": "github"
       },
       "original": {
@@ -330,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739469954,
+        "lastModified": 1739902813,
-        "narHash": "sha256-faUXxkM3yYm++fpEw02tbAgPJprVB0xOtrU87BEQkuI=",
+        "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7f29e4b2ae34c1ba5fe650d74c8f28b0d1fa21ee",
+        "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50",
         "type": "github"
       },
       "original": {
@@ -387,11 +387,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1739392863,
+        "lastModified": 1739882598,
-        "narHash": "sha256-mU+aYnob+7Ycu/tU9oFoweIJwdjLj0uxcp+I1czH4DM=",
+        "narHash": "sha256-LlUFkinhMlvK5uIx6tTg1UYcreYF4iLVNRL8mqiSyjQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "dfa4128b453d424c9fe3ef919776e722c0b766cb",
+        "rev": "248860c767c67881a7491bcd522a8571560af089",
         "type": "github"
       },
       "original": {
@@ -473,11 +473,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738953846,
+        "lastModified": 1739829690,
-        "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
+        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
+        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -37,6 +37,9 @@ in
       };
     })
     (lib.mkIf cfg.enable {
+      # Add gopass if pass is enabled
+      home.packages = lib.optional config.programs.password-store.enable pkgs.gopass;
+
       nix.settings.use-xdg-base-directories = fromOs [
         "nix"
         "settings"
@@ -69,12 +72,10 @@ in
           homedir = "${config.xdg.dataHome}/gnupg";
         };
         # Mail client
-        himalaya.enable = true;
+        himalaya.enable = lib.mkDefault true;
-        # Another shell
-        nushell.enable = true;
         # Password manager
         password-store = {
-          enable = true;
+          enable = lib.mkDefault true;
           package = pkgs.pass-nodmenu;
           settings.PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass";
         };
@@ -115,11 +116,6 @@ 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,6 +71,8 @@ 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,6 +199,7 @@ 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,7 +7,6 @@
 let
   inherit (helpers) mkRaw;
   cfg = config.jhome.nvim;
-  dev = cfg.dev.enable;
 in
 {
   config.keymaps =
@@ -202,21 +201,21 @@ in
             '';
         options.desc = "Find Quickfix";
       }
-      # Nvim Silicon
-      {
-        mode = "v";
-        key = "<leader>sc";
-        action =
-          mkRaw
-            # lua
-            ''
-              require('nvim-silicon').clip
-
-            '';
-        options.desc = "Snap Code (to clipboard)";
-      }
     ]
-    ++ lib.optional dev {
+    # Nvim Silicon
+    ++ lib.optional (!cfg.reduceSize) {
+      mode = "v";
+      key = "<leader>sc";
+      action =
+        mkRaw
+          # lua
+          ''
+            require('nvim-silicon').clip
+
+          '';
+      options.desc = "Snap Code (to clipboard)";
+    }
+    ++ lib.optional cfg.dev.enable {
       mode = "n";
       key = "<leader>w";
       action =

nvim/options.nix

@@ -12,6 +12,7 @@ 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,4 +1,14 @@
-{ pkgs, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  cfg = config.jhome.nvim;
+  plugins = pkgs.vimPlugins;
+  extraPlugins = import ./extraPlugins { inherit pkgs; };
+in
 {
   imports = [
     ./options.nix
@@ -8,91 +18,87 @@
     ./augroups.nix
   ];
 
-  config = {
+  config = lib.mkMerge [
-    withRuby = false;
+    {
-    globals.mapleader = " ";
+      withRuby = false;
-    # Appearance
+      globals.mapleader = " ";
-    colorschemes.gruvbox = {
+      # Appearance
-      enable = true;
+      colorschemes.gruvbox = {
-      settings = {
+        enable = true;
-        bold = true;
+        settings = {
-        transparent_mode = true;
+          bold = true;
-        terminal_colors = true;
+          transparent_mode = true;
+          terminal_colors = true;
+        };
       };
-    };
+      opts = {
-    clipboard.providers.wl-copy.enable = true;
+        number = true;
-    opts = {
+        relativenumber = true;
-      number = true;
+        colorcolumn = "+1";
-      relativenumber = true;
+        cursorline = true;
-      colorcolumn = "+1";
+        wrap = false;
-      cursorline = true;
+        splitright = true;
-      wrap = false;
+        # Tabs & indentation
-      splitright = true;
+        smarttab = true;
-      # Tabs & indentation
+        autoindent = true;
-      smarttab = true;
+        smartindent = true;
-      autoindent = true;
+        # Search path
-      smartindent = true;
+        path = ".,/usr/include,**";
-      # Search path
+        wildmenu = true;
-      path = ".,/usr/include,**";
+        hlsearch = true;
-      wildmenu = true;
+        incsearch = true;
-      hlsearch = true;
+        ignorecase = true; # Search ignores cases
-      incsearch = true;
+        smartcase = true; # Unless it has a capital letter
-      ignorecase = true; # Search ignores cases
+        # Enable local configuration :h 'exrc'
-      smartcase = true; # Unless it has a capital letter
+        exrc = true; # safe since nvim 0.9
-      # 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
+        plugins.vim-jjdescription # FIXME: included since neovim nightly
-        extraPlugins.nvim-silicon
       ];
-    # Formatting & linters
+      extraPackages = [ pkgs.luajitPackages.jsregexp ];
-    extraPackages = [
+      extraConfigLuaPre =
-      pkgs.luajitPackages.jsregexp
+        # lua
-      pkgs.silicon
+        ''
-    ];
+          -- Lua Pre Config
-    extraConfigLuaPre =
+          if vim.fn.has 'termguicolors' then
-      # lua
+            -- Enable RGB colors
-      ''
+            vim.g.termguicolors = true
-        -- Lua Pre Config
+          end
-        if vim.fn.has 'termguicolors' then
-          -- Enable RGB colors
-          vim.g.termguicolors = true
-        end
 
-        -- Useful function
+          -- Useful function
-        local has_words_before = function()
+          local has_words_before = function()
-          -- unpack = unpack or table.unpack
+            -- unpack = unpack or table.unpack
-          local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+            local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-          return col ~= 0
+            return col ~= 0
-            and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
+              and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil
-        end
+          end
-        -- END: Lua Pre Config
+          -- END: Lua Pre Config
-      '';
+        '';
-    extraConfigLua =
+    }
-      # lua
+    # Big packages that are kinda unnecessary
-      ''
+    (lib.mkIf (!cfg.reduceSize) {
-        -- Lua Config
+      extraPlugins = [ extraPlugins.nvim-silicon ];
-        require("nvim-silicon").setup {
+      extraPackages = [ pkgs.silicon ];
-          theme = "gruvbox-dark",
+      extraConfigLua =
-          pad_horiz = 16,
+        # lua
-         pad_vert = 16,
+        ''
-          -- Current buffer name
+          -- Lua Config
-          window_title = function()
+          require("nvim-silicon").setup {
-              return vim.fn.fnamemodify(
+            theme = "gruvbox-dark",
-                  vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf()),
+            pad_horiz = 16,
-                  ":t"
+            pad_vert = 16,
-              )
+            -- Current buffer name
-          end,
+            window_title = function()
-        }
+                return vim.fn.fnamemodify(
-        -- END: Lua Config
+                    vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf()),
-      '';
+                    ":t"
-  };
+                )
+            end,
+          }
+          -- END: Lua Config
+        '';
+    })
+  ];
 }

scripts/audiomenu/Cargo.lock

@@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.29"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -126,9 +126,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.29"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
 dependencies = [
  "anstream",
  "anstyle",
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -346,18 +346,18 @@ checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -366,9 +366,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",
@@ -466,9 +466,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
 [[package]]
 name = "unicode-linebreak"

scripts/jpassmenu/Cargo.lock

@@ -124,9 +124,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.29"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -134,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.29"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
 dependencies = [
  "anstream",
  "anstyle",
@@ -323,9 +323,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "memchr"
@@ -366,9 +366,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -481,18 +481,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -589,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
 [[package]]
 name = "unicode-linebreak"