Merge branch 'master' of github.com:mrjones2014/dotfiles

mrjones2014 · Jun 29, 2024 · 139855e · 139855e
2 parents f3466ec + b0374df
commit 139855e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 26 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home-manager/modules/fzf.nix b/home-manager/modules/fzf.nix
@@ -51,6 +51,7 @@ in {
     '';
     functions = {
       fzf-history-widget-wrapped = ''
+        history merge # make FZF search history from all sessions
         fzf-history-widget
         _prompt_move_to_bottom
       '';

diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix
@@ -29,6 +29,10 @@
       options = [ "bind" ];
     };
     "/mnt/jellyfin" = {
+      device = "/dev/disk/by-label/media";
+      fsType = "ext4";
+    };
+    "/mnt/extra-storage" = {
       device = "/dev/disk/by-label/jellyfin";
       fsType = "ext4";
     };

diff --git a/nvim/lua/my/configure/autopairs.lua b/nvim/lua/my/configure/autopairs.lua
@@ -6,8 +6,9 @@ return {
     local npairs = require('nvim-autopairs')
     local cond = require('nvim-autopairs.conds')
     npairs.setup({})
-    -- <> pair for generics and stuff
-    npairs.add_rule(Rule('<', '>'):with_pair(cond.before_regex('%a+')):with_move(function(opts)
+    -- <> pair for generics and stuff,
+    -- complete <> if the preceding text is alphanumeric or :: for Rust
+    npairs.add_rule(Rule('<', '>'):with_pair(cond.before_regex('%a+:?:?', 3)):with_move(function(opts)
       return opts.char == '>'
     end))
   end,