From 0168bba1207deb5db19df717bf930750714f5b50 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Mon, 17 Jun 2024 08:28:42 -0400 Subject: [PATCH 1/5] fix(nvim): Fix <> autopairs for Rust generics --- nvim/lua/my/configure/autopairs.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nvim/lua/my/configure/autopairs.lua b/nvim/lua/my/configure/autopairs.lua index 0b279f9a..b75c5db4 100644 --- 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, From 01f8a02083635cb53e547c7e66cebca62b3c54d9 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Thu, 20 Jun 2024 11:14:36 -0400 Subject: [PATCH 2/5] feat(fzf): Merge history file from all sessions before searching with fzf --- home-manager/modules/fzf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/modules/fzf.nix b/home-manager/modules/fzf.nix index a9c62b9b..6d6ef139 100644 --- 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 ''; From f786d957f11ac1b9a2fd091df6074ebff5a70771 Mon Sep 17 00:00:00 2001 From: mrjones2014 <8648891+mrjones2014@users.noreply.github.com> Date: Fri, 21 Jun 2024 16:01:47 +0000 Subject: [PATCH 3/5] flake: update dependencies --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 7811fb47..2c716c08 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "pre-commit": "pre-commit" }, "locked": { - "lastModified": 1718013593, - "narHash": "sha256-671qqVhQk5olD01x/BMt6sr2sI/mBsObWiQDaKGeoZA=", + "lastModified": 1718613978, + "narHash": "sha256-iXzxAcovEZHHYUYIWtIJYMpQf96MwasMirMxMKJL5Aw=", "owner": "dwarfmaster", "repo": "arkenfox-nixos", - "rev": "69e312a746b9b76be2cb6c9fe2352fdf1752e2c7", + "rev": "35e803fa44abfd438c65b64ff2691f3f608cd2d3", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -392,11 +392,11 @@ ] }, "locked": { - "lastModified": 1718298978, - "narHash": "sha256-7jIX4cUdn6LYP4l38S38nsSNbGMF5eXP9qKe69SR02k=", + "lastModified": 1718935491, + "narHash": "sha256-Dk+ZTVu3CuVv4UPbif3GmR7eT3zAE/mQ+3UUvFHknKE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "84299e229226207721e142246ff8343f8a8c6e5d", + "rev": "cc2d148e283e05cce751c5cc50ce38bbc0589f61", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718209811, - "narHash": "sha256-hZYLBealuoS3bL3eXFeQVAoasThqf7DDwg8kW0ASTOE=", + "lastModified": 1718890629, + "narHash": "sha256-TLJ8xTHKgnbsMnlmfQ7eF5+aafjo5PlFQFF3mkrIsBs=", "owner": "neovim", "repo": "neovim", - "rev": "53afdf360cf195c02c22865f4e63b273d1ef152e", + "rev": "0e3e1e6b6d8370f1fcc9887d5cb931b131450a1c", "type": "github" }, "original": { @@ -455,11 +455,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { From 0619e8065787ca7942c64978aaa891ce17bc3d53 Mon Sep 17 00:00:00 2001 From: mrjones2014 <8648891+mrjones2014@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:01:58 +0000 Subject: [PATCH 4/5] flake: update dependencies --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 2c716c08..61f94d79 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1718339789, - "narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=", + "lastModified": 1719589849, + "narHash": "sha256-TNjpBp1ct065GnexxSdflKcYE4DmRyiy+CGQfw15mPU=", "owner": "catppuccin", "repo": "nix", - "rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a", + "rev": "eaab21cb0b3e59e95a856b69013b70fdc1d99a7f", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1718018037, - "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", + "lastModified": 1719226092, + "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", + "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { @@ -392,11 +392,11 @@ ] }, "locked": { - "lastModified": 1718935491, - "narHash": "sha256-Dk+ZTVu3CuVv4UPbif3GmR7eT3zAE/mQ+3UUvFHknKE=", + "lastModified": 1719467057, + "narHash": "sha256-8gQ0txwuLoBpBeIhTAkl+/7Hi/AD4KE5m4YhOn1OA3E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "cc2d148e283e05cce751c5cc50ce38bbc0589f61", + "rev": "bb6bea003dc464a4248a173e71a007d368691092", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718890629, - "narHash": "sha256-TLJ8xTHKgnbsMnlmfQ7eF5+aafjo5PlFQFF3mkrIsBs=", + "lastModified": 1719414226, + "narHash": "sha256-h/qJ+1R+BtY+mX02UsqYW82hEl78mrHTGAs9yjpFEzU=", "owner": "neovim", "repo": "neovim", - "rev": "0e3e1e6b6d8370f1fcc9887d5cb931b131450a1c", + "rev": "fc9b70826ec88ca2e6c0624c522b872e87aa7ac1", "type": "github" }, "original": { @@ -455,11 +455,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { From b0374df5e61b64940f4bb76df32ae438b49f96f1 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Sat, 29 Jun 2024 15:46:20 -0400 Subject: [PATCH 5/5] feat(nixos): Add a huge hard drive to my media server --- hosts/server/hardware-configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix index c37876ae..a6f9bbf6 100644 --- 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"; };